From 09b57a25ed04b43c9f33f29abdaefef4e10ad25b Mon Sep 17 00:00:00 2001 From: Pim van Nierop Date: Fri, 19 Jul 2024 13:52:52 +0200 Subject: [PATCH] Allow config of http URLs in upload-connect-frontend --- charts/radar-upload-connect-frontend/Chart.yaml | 2 +- charts/radar-upload-connect-frontend/README.md | 4 +++- .../radar-upload-connect-frontend/templates/deployment.yaml | 4 ++-- charts/radar-upload-connect-frontend/values.yaml | 4 ++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/charts/radar-upload-connect-frontend/Chart.yaml b/charts/radar-upload-connect-frontend/Chart.yaml index 8e832a5a..15772ef7 100644 --- a/charts/radar-upload-connect-frontend/Chart.yaml +++ b/charts/radar-upload-connect-frontend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.5.10" description: A Helm chart for RADAR-base upload connector frontend application that provides a UI for uploading files and sending them to the upload-backend. name: radar-upload-connect-frontend -version: 0.3.1 +version: 0.3.2 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-upload-connect-frontend diff --git a/charts/radar-upload-connect-frontend/README.md b/charts/radar-upload-connect-frontend/README.md index ecffca8e..cf8cd6d8 100644 --- a/charts/radar-upload-connect-frontend/README.md +++ b/charts/radar-upload-connect-frontend/README.md @@ -3,7 +3,7 @@ # radar-upload-connect-frontend [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-upload-connect-frontend)](https://artifacthub.io/packages/helm/radar-base/radar-upload-connect-frontend) -![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.10](https://img.shields.io/badge/AppVersion-0.5.10-informational?style=flat-square) +![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.10](https://img.shields.io/badge/AppVersion-0.5.10-informational?style=flat-square) A Helm chart for RADAR-base upload connector frontend application that provides a UI for uploading files and sending them to the upload-backend. @@ -70,4 +70,6 @@ A Helm chart for RADAR-base upload connector frontend application that provides | readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | networkpolicy | object | check `values.yaml` | Network policy defines who can access this application and who this applications has access to | | server_name | string | `"localhost"` | Server name or domain name | +| vue_app_api_base_url | string | `nil` | Vue app base URL; needed when deviating from https://server_name/upload/api/ | +| vue_app_auth_api | string | `nil` | Vue IDP URL; needed when deviating from https://server_name/managementportal/oauth | | vue_app_client_id | string | `"radar_upload_frontend"` | OAuth2 client id of the upload connect frontend application | diff --git a/charts/radar-upload-connect-frontend/templates/deployment.yaml b/charts/radar-upload-connect-frontend/templates/deployment.yaml index f936b091..3785c190 100644 --- a/charts/radar-upload-connect-frontend/templates/deployment.yaml +++ b/charts/radar-upload-connect-frontend/templates/deployment.yaml @@ -48,9 +48,9 @@ spec: - name: VUE_APP_BASE_URL value: "/upload" - name: VUE_APP_API_BASE_URL - value: "https://{{ .Values.server_name }}/upload/api/" + value: {{ default (printf "https://%s/upload/api" .Values.server_name) .Values.vue_app_api_base_url }} - name: VUE_APP_AUTH_API - value: "https://{{ .Values.server_name }}/managementportal/oauth" + value: {{ default (printf "https://%s/managementportal/oauth" .Values.server_name) .Values.vue_app_auth_api }} - name: VUE_APP_AUTH_CALLBACK value: "{{ .Values.server_name }}/upload/login" - name: VUE_APP_CLIENT_ID diff --git a/charts/radar-upload-connect-frontend/values.yaml b/charts/radar-upload-connect-frontend/values.yaml index 8e24bc91..e159acb7 100644 --- a/charts/radar-upload-connect-frontend/values.yaml +++ b/charts/radar-upload-connect-frontend/values.yaml @@ -154,5 +154,9 @@ networkpolicy: # -- Server name or domain name server_name: localhost +# -- Vue app base URL; needed when deviating from https://server_name/upload/api/ +vue_app_api_base_url: +# -- Vue IDP URL; needed when deviating from https://server_name/managementportal/oauth +vue_app_auth_api: # -- OAuth2 client id of the upload connect frontend application vue_app_client_id: radar_upload_frontend