From 2dcd0944af1b6b72e57c32de483511245660a8a8 Mon Sep 17 00:00:00 2001 From: Pascal Sthamer Date: Mon, 1 Dec 2025 16:51:22 +0100 Subject: [PATCH] fix backend env Signed-off-by: Pascal Sthamer --- .../charts/shuffle/templates/backend/_helpers.tpl | 8 ++++---- .../charts/shuffle/templates/backend/backend-dpl.yaml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/functions/kubernetes/charts/shuffle/templates/backend/_helpers.tpl b/functions/kubernetes/charts/shuffle/templates/backend/_helpers.tpl index 07a8516f..48bd6543 100644 --- a/functions/kubernetes/charts/shuffle/templates/backend/_helpers.tpl +++ b/functions/kubernetes/charts/shuffle/templates/backend/_helpers.tpl @@ -78,9 +78,9 @@ imagePullSecrets: {{- end }} {{- end -}} -{{- define "shuffle.backend.baseUrl -}} +{{- define "shuffle.backend.baseUrl" -}} http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.backend.containerPorts.http }} -{{- end - }} +{{- end -}} {{/* Return the environment variables of shuffle-backend in the format @@ -96,7 +96,7 @@ BACKEND_PORT: "{{ .Values.backend.containerPorts.http }}" BASE_URL: "{{ .Values.shuffle.baseUrl }}" SSO_REDIRECT_URL: "{{ .Values.shuffle.baseUrl }}" {{- else }} -BASE_URL: "{{ include "shuffle.backend.baseUrl .}}" +BASE_URL: "{{ include "shuffle.backend.baseUrl" . }}" {{- end }} ORG_ID: "{{ .Values.shuffle.org }}" SHUFFLE_APP_DOWNLOAD_LOCATION: "{{ .Values.backend.apps.downloadLocation }}" @@ -104,7 +104,7 @@ SHUFFLE_DOWNLOAD_AUTH_BRANCH: "{{ .Values.backend.apps.downloadBranch }}" SHUFFLE_APP_FORCE_UPDATE: "{{ .Values.backend.apps.forceUpdate }}" SHUFFLE_CHAT_DISABLED: "true" # Sets backend_url parameter for workflow execution to the cluster-internal shuffle-backend address -SHUFFLE_CLOUDRUN_URL: "{{ include "shuffle.backend.baseUrl .}}" +SHUFFLE_CLOUDRUN_URL: "{{ include "shuffle.backend.baseUrl" .}}" SHUFFLE_OPENSEARCH_URL: {{ include "common.tplvalues.render" (dict "value" .Values.backend.openSearch.url "context" $) }} SHUFFLE_OPENSEARCH_USERNAME: "{{ .Values.backend.openSearch.username }}" SHUFFLE_OPENSEARCH_CERTIFICATE_FILE: "{{ .Values.backend.openSearch.certificateFile }}" diff --git a/functions/kubernetes/charts/shuffle/templates/backend/backend-dpl.yaml b/functions/kubernetes/charts/shuffle/templates/backend/backend-dpl.yaml index 046f55c6..85650134 100644 --- a/functions/kubernetes/charts/shuffle/templates/backend/backend-dpl.yaml +++ b/functions/kubernetes/charts/shuffle/templates/backend/backend-dpl.yaml @@ -116,9 +116,10 @@ spec: {{- end }} env: {{- $env := include "shuffle.backend.env" . | fromYaml }} - {{- range $key, $val := range $env }} + {{- range $key, $val := $env }} - name: {{ $key | quote }} value: {{ $val | quote }} + {{- end }} {{- if .Values.backend.extraEnvVars }} {{- include "common.tplvalues.render" (dict "value" .Values.backend.extraEnvVars "context" $) | nindent 12 }} {{- end }}