diff --git a/charts/rucio-webui/Chart.yaml b/charts/rucio-webui/Chart.yaml index ba034da5..c7b3154f 100644 --- a/charts/rucio-webui/Chart.yaml +++ b/charts/rucio-webui/Chart.yaml @@ -1,5 +1,5 @@ name: rucio-webui -version: 36.0.1 +version: 36.0.2 apiVersion: v1 description: A Helm chart to deploy the new Rucio Webui keywords: diff --git a/charts/rucio-webui/templates/deployment.yaml b/charts/rucio-webui/templates/deployment.yaml index 95a39d9a..29d2bd30 100644 --- a/charts/rucio-webui/templates/deployment.yaml +++ b/charts/rucio-webui/templates/deployment.yaml @@ -160,10 +160,16 @@ spec: - name: RUCIO_HTTPD_{{ $key | snakecase | upper }} value: {{ $val | quote }} {{- end }} + {{- $explicitEnvMap := dict }} + {{- range .Values.additionalEnvs }} + {{- $explicitEnvMap = merge $explicitEnvMap (dict (index . "name") (index . "valueFrom")) }} + {{- end }} {{- range $key, $val := .Values.config.webui }} + {{- if not (hasKey $explicitEnvMap (printf "RUCIO_WEBUI_%s" $key | upper)) }} - name: RUCIO_WEBUI_{{ $key | snakecase | upper }} value: {{ $val | quote }} {{- end }} + {{- end }} {{ range $provider, $data := .Values.config.oidc_providers }} {{- range $key, $val := $data }} - name: RUCIO_WEBUI_OIDC_PROVIDER_{{ $provider | snakecase | upper }}_{{ $key | snakecase | upper}}