Allow config of http URLs in upload-connect-backend

RADAR-base · Jul 23, 2024 · 638161e · 638161e
1 parent 74d723a
commit 638161e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/charts/radar-upload-connect-backend/Chart.yaml b/charts/radar-upload-connect-backend/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.5.10"
 description: A Helm chart for RADAR-base upload connector backend application. This application is an upload system that stores uploaded data and its metadata in PostgreSQL for later processing.
 name: radar-upload-connect-backend
-version: 0.3.2
+version: 0.3.3
 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-backend

diff --git a/charts/radar-upload-connect-backend/README.md b/charts/radar-upload-connect-backend/README.md
@@ -3,7 +3,7 @@
 # radar-upload-connect-backend
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-upload-connect-backend)](https://artifacthub.io/packages/helm/radar-base/radar-upload-connect-backend)
 
-![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)
+![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-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 backend application. This application is an upload system that stores uploaded data and its metadata in PostgreSQL for later processing.
 
@@ -76,3 +76,4 @@ A Helm chart for RADAR-base upload connector backend application. This applicati
 | postgres.password | string | `"password"` | Database password |
 | managementportal_url | string | `"http://management-portal:8080/managementportal"` | URL of the Management Portal |
 | serverName | string | `"localhost"` | Server name or domain name |
+| advertised_baseuri | string | `nil` | Advertised base URI; needed when deviating from https://serverName/upload/api/ |
diff --git a/charts/radar-upload-connect-backend/templates/configmap.yaml b/charts/radar-upload-connect-backend/templates/configmap.yaml
@@ -7,7 +7,7 @@ metadata:
 data:
   upload.yml: |
     baseUri: "http://0.0.0.0:8085/upload/api/"
-    advertisedBaseUri: https://{{ .Values.serverName }}/upload/api/
+    advertisedBaseUri: {{ default (printf "https://%s/upload/api" .Values.serverName) .Values.advertised_baseuri }}
     enableCors: yes
     clientId: {{ .Values.client_id }}
     clientSecret: {{ .Values.client_secret }}

diff --git a/charts/radar-upload-connect-backend/values.yaml b/charts/radar-upload-connect-backend/values.yaml
@@ -189,3 +189,5 @@ postgres:
 managementportal_url: http://management-portal:8080/managementportal
 # -- Server name or domain name
 serverName: localhost
+# -- Advertised base URI; needed when deviating from https://serverName/upload/api/
+advertised_baseuri: