use list of secrets/configmaps for envFrom

temporalio · Jul 3, 2023 · 2fb237b · 2fb237b
1 parent e144372
commit 2fb237b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 18 deletions.
diff --git a/templates/server-deployment.yaml b/templates/server-deployment.yaml
@@ -121,15 +121,33 @@ spec:
  {{- if or $.Values.server.additionalEnv $serviceValues.additionalEnv }}
  {{- toYaml (default $.Values.server.additionalEnv $serviceValues.additionalEnv) | nindent 12 }}
  {{- end }}
- {{- if or $serviceValues.additionalEnvCM $serviceValues.additionalEnvSecret }}
+ {{- if or $.Values.server.additionalEnvCM $.Values.server.additionalEnvSecret }}
+ envFrom:
+ {{- if $.Values.server.additionalEnvCM }}
+ {{- range $.Values.server.additionalEnvCM }}
+ - configMapRef:
+ name: {{ . }}
+ {{- end }}
+ {{- end }}
+ {{- if $.Values.server.additionalEnvSecret }}
+ {{- range $.Values.server.additionalEnvSecret }}
+ - secretRef:
+ name: {{ . }}
+ {{- end }}
+ {{- end }}
+ {{- else if or $serviceValues.additionalEnvCM $serviceValues.additionalEnvSecret }}
  envFrom:
  {{- if $serviceValues.additionalEnvCM }}
+ {{- range $serviceValues.additionalEnvCM }}
  - configMapRef:
- name: {{ $serviceValues.additionalEnvCM }}
+ name: {{ . }}
+ {{- end }}
  {{- end }}
  {{- if $serviceValues.additionalEnvSecret }}
+ {{- range $serviceValues.additionalEnvSecret }}
  - secretRef:
- name: {{ $serviceValues.additionalEnvSecret }}
+ name: {{ . }}
+ {{- end }}
  {{- end }}
  {{- end }}
  ports:

diff --git a/templates/web-deployment.yaml b/templates/web-deployment.yaml
@@ -54,12 +54,16 @@ spec:
  {{- if or .Values.web.additionalEnvCM .Values.web.additionalEnvSecret }}
  envFrom:
  {{- if .Values.web.additionalEnvCM }}
+ {{- range .Values.web.additionalEnvCM }}
  - configMapRef:
- name: {{ .Values.web.additionalEnvCM }}
+ name: {{ . }}
+ {{- end }}
  {{- end }}
  {{- if .Values.web.additionalEnvSecret }}
+ {{- range .Values.web.additionalEnvSecret }}
  - secretRef:
- name: {{ .Values.web.additionalEnvSecret }}
+ name: {{ . }}
+ {{- end }}
  {{- end }}
  {{- end }}
  ports:

diff --git a/values.yaml b/values.yaml
@@ -84,8 +84,8 @@ server:
  additionalVolumes: []
  additionalVolumeMounts: []
  additionalEnv: []
- additionalEnvCM: ""
- additionalEnvSecret: ""
+ additionalEnvCM: []
+ additionalEnvSecret: []
  securityContext:
  fsGroup: 1000
  runAsUser: 1000
@@ -185,8 +185,8 @@ server:
  tolerations: []
  affinity: {}
  additionalEnv: []
- additionalEnvCM: ""
- additionalEnvSecret: ""
+ additionalEnvCM: []
+ additionalEnvSecret: []
  containerSecurityContext: {}
  topologySpreadConstraints: {}
  podDisruptionBudget: {}
@@ -209,8 +209,8 @@ server:
  tolerations: []
  affinity: {}
  additionalEnv: []
- additionalEnvCM: ""
- additionalEnvSecret: ""
+ additionalEnvCM: []
+ additionalEnvSecret: []
  containerSecurityContext: {}
  topologySpreadConstraints: {}
  podDisruptionBudget: {}
@@ -233,8 +233,8 @@ server:
  tolerations: []
  affinity: {}
  additionalEnv: []
- additionalEnvCM: ""
- additionalEnvSecret: ""
+ additionalEnvCM: []
+ additionalEnvSecret: []
  containerSecurityContext: {}
  topologySpreadConstraints: {}
  podDisruptionBudget: {}
@@ -257,8 +257,8 @@ server:
  tolerations: []
  affinity: {}
  additionalEnv: []
- additionalEnvCM: ""
- additionalEnvSecret: ""
+ additionalEnvCM: []
+ additionalEnvSecret: []
  containerSecurityContext: {}
  topologySpreadConstraints: {}
  podDisruptionBudget: {}
@@ -280,8 +280,8 @@ admintools:
  tolerations: []
  affinity: {}
  additionalEnv: []
- additionalEnvCM: ""
- additionalEnvSecret: ""
+ additionalEnvCM: []
+ additionalEnvSecret: []
  resources: {}
  containerSecurityContext: {}
  securityContext: {}
@@ -350,9 +350,11 @@ web:
  affinity: {}
 
  additionalEnv: []
+ additionalEnvCM: []
+ additionalEnvSecret: []
 
  containerSecurityContext: {}
- 
+
  securityContext: {}
 
 schema: