marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix backend env

Browse Source 
Signed-off-by: Pascal Sthamer <pascal+github@sthamer.xyz>
This commit is contained in:
Pascal Sthamer
2025-12-01 16:51:22 +01:00
parent 1aa375b280
commit 2dcd0944af
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/kubernetes/charts/shuffle/templates/backend/_helpers.tpl
+3 -3
View File
@@ -78,7 +78,7 @@ imagePullSecrets:
{{- end }} {{- end }}
{{- end -}} {{- end -}}
{{- define "shuffle.backend.baseUrl -}} {{- define "shuffle.backend.baseUrl" -}}
http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.backend.containerPorts.http }} http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.backend.containerPorts.http }}
{{- end -}} {{- end -}}
@@ -96,7 +96,7 @@ BACKEND_PORT: "{{ .Values.backend.containerPorts.http }}"
BASE_URL: "{{ .Values.shuffle.baseUrl }}" BASE_URL: "{{ .Values.shuffle.baseUrl }}"
SSO_REDIRECT_URL: "{{ .Values.shuffle.baseUrl }}" SSO_REDIRECT_URL: "{{ .Values.shuffle.baseUrl }}"
{{- else }} {{- else }}
BASE_URL: "{{ include "shuffle.backend.baseUrl .}}" BASE_URL: "{{ include "shuffle.backend.baseUrl" . }}"
{{- end }} {{- end }}
ORG_ID: "{{ .Values.shuffle.org }}" ORG_ID: "{{ .Values.shuffle.org }}"
SHUFFLE_APP_DOWNLOAD_LOCATION: "{{ .Values.backend.apps.downloadLocation }}" 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_APP_FORCE_UPDATE: "{{ .Values.backend.apps.forceUpdate }}"
SHUFFLE_CHAT_DISABLED: "true" SHUFFLE_CHAT_DISABLED: "true"
# Sets backend_url parameter for workflow execution to the cluster-internal shuffle-backend address # 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_URL: {{ include "common.tplvalues.render" (dict "value" .Values.backend.openSearch.url "context" $) }}
SHUFFLE_OPENSEARCH_USERNAME: "{{ .Values.backend.openSearch.username }}" SHUFFLE_OPENSEARCH_USERNAME: "{{ .Values.backend.openSearch.username }}"
SHUFFLE_OPENSEARCH_CERTIFICATE_FILE: "{{ .Values.backend.openSearch.certificateFile }}" SHUFFLE_OPENSEARCH_CERTIFICATE_FILE: "{{ .Values.backend.openSearch.certificateFile }}"
functions/kubernetes/charts/shuffle/templates/backend/backend-dpl.yaml
+2 -1
View File
@@ -116,9 +116,10 @@ spec:
{{- end }} {{- end }}
env: env:
{{- $env := include "shuffle.backend.env" . | fromYaml }} {{- $env := include "shuffle.backend.env" . | fromYaml }}
{{- range $key, $val := range $env }} {{- range $key, $val := $env }}
- name: {{ $key | quote }} - name: {{ $key | quote }}
value: {{ $val | quote }} value: {{ $val | quote }}
{{- end }}
{{- if .Values.backend.extraEnvVars }} {{- if .Values.backend.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.backend.extraEnvVars "context" $) | nindent 12 }} {{- include "common.tplvalues.render" (dict "value" .Values.backend.extraEnvVars "context" $) | nindent 12 }}
{{- end }} {{- end }}