remove shuffle-backend configmap

Signed-off-by: Pascal Sthamer <pascal+github@sthamer.xyz>

functions/kubernetes/charts/shuffle/templates/backend/_helpers.tpl

@@ -0,0 +1,32 @@
+{{/*
+Return the environment variables of shuffle-backend in the format
+KEY: VALUE
+*/}}
+{{- define "shuffle.backend.env" -}}
+RUNNING_MODE: kubernetes
+IS_KUBERNETES: "true"
+SHUFFLE_APP_HOTLOAD_FOLDER: /shuffle-apps
+SHUFFLE_FILE_LOCATION: /shuffle-files
+BACKEND_PORT: "{{ .Values.backend.containerPorts.http }}"
+{{- if .Values.shuffle.baseUrl }}
+BASE_URL: "{{ .Values.shuffle.baseUrl }}"
+SSO_REDIRECT_URL: "{{ .Values.shuffle.baseUrl }}"
+{{- else }}
+BASE_URL: "http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.backend.containerPorts.http }}"
+{{- end }}
+ORG_ID: "{{ .Values.shuffle.org }}"
+SHUFFLE_APP_DOWNLOAD_LOCATION: "{{ .Values.backend.apps.downloadLocation }}"
+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: "http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.backend.containerPorts.http }}"
+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 }}"
+SHUFFLE_OPENSEARCH_SKIPSSL_VERIFY: "{{ .Values.backend.openSearch.skipSSLVerify }}"
+SHUFFLE_OPENSEARCH_INDEX_PREFIX: "{{ .Values.backend.openSearch.indexPrefix }}"
+SHUFFLE_RERUN_SCHEDULE: "{{ .Values.backend.cleanupSchedule }}"
+TZ: "{{ .Values.shuffle.timezone }}"
+REGISTRY_URL: "{{ .Values.shuffle.appRegistry }}" # Used by app builder
+{{- end -}}

functions/kubernetes/charts/shuffle/templates/backend/backend-cm-env.yaml

@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "shuffle.backend.name" . }}-env
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "shuffle.backend.labels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  BACKEND_PORT: "{{ .Values.backend.containerPorts.http }}"
-  {{- if .Values.shuffle.baseUrl }}
-  BASE_URL: "{{ .Values.shuffle.baseUrl }}"
-  SSO_REDIRECT_URL: "{{ .Values.shuffle.baseUrl }}"
-  {{- else }}
-  BASE_URL: "http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.backend.containerPorts.http }}"
-  {{- end }}
-  ORG_ID: "{{ .Values.shuffle.org }}"
-  SHUFFLE_APP_DOWNLOAD_LOCATION: "{{ .Values.backend.apps.downloadLocation }}"
-  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: "http://{{ include "shuffle.backend.name" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.backend.containerPorts.http }}"
-  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 }}"
-  SHUFFLE_OPENSEARCH_SKIPSSL_VERIFY: "{{ .Values.backend.openSearch.skipSSLVerify }}"
-  SHUFFLE_OPENSEARCH_INDEX_PREFIX: "{{ .Values.backend.openSearch.indexPrefix }}"
-  SHUFFLE_RERUN_SCHEDULE: "{{ .Values.backend.cleanupSchedule }}"
-  TZ: "{{ .Values.shuffle.timezone }}"
-  REGISTRY_URL: "{{ .Values.shuffle.appRegistry }}"

functions/kubernetes/charts/shuffle/templates/backend/backend-dpl.yaml

@@ -115,20 +115,14 @@ spec:
           args: {{- include "common.tplvalues.render" (dict "value" .Values.backend.args "context" $) | nindent 12 }}
           {{- end }}
           env:
-            - name: RUNNING_MODE
+            {{- $env := include "shuffle.backend.env" . | fromYaml }}
-              value: kubernetes
+            {{- range $key, $val := range $env }}
-            - name: IS_KUBERNETES
+            - name: {{ $key | quote }}
-              value: "true"
+              value: {{ $val | quote }}
-            - name: SHUFFLE_APP_HOTLOAD_FOLDER
-              value: /shuffle-apps
-            - name: SHUFFLE_FILE_LOCATION
-              value: /shuffle-files
             {{- if .Values.backend.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.backend.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
           envFrom:
-            - configMapRef:
-                name: {{ include "shuffle.backend.name" . }}-env
             {{- if .Values.backend.extraEnvVarsCM }}
             - configMapRef:
                 name: {{ include "common.tplvalues.render" (dict "value" .Values.backend.extraEnvVarsCM "context" $) }}