Merge branch 'main' into CCIE-2745-update-helm-chart-to-include-exter…

…nal-secret-cr-ds-for-env-level-and-stack-level
chanzuckerberg · May 21, 2024 · 972fc47 · 972fc47
2 parents c5635b3 + 151503c
commit 972fc47
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/stack/templates/_helpers.tpl b/stack/templates/_helpers.tpl
@@ -84,6 +84,15 @@ Create the name of the service account to use
 {{- end }}
 
 {{- define "service.configuration" -}}
+
+{{- if .Values.env }}
+env:
+{{- range $i, $value := .Values.env }}
+- name: {{ $value.name }}
+  value: {{ $value.value }}
+{{- end }}
+{{- end }}
+
 {{- if or (or (or (ne (trim .Values.appSecrets.envSecret.secretName) "") (ne (trim .Values.appSecrets.envSecret.secretName) "")) (ne (trim .Values.appContext.envContextConfigMapName) "")) (ne (trim .Values.appContext.stackContextConfigMapName) "") -}}
 envFrom:
 {{- if ne (trim .Values.appSecrets.envSecret.secretName) "" }}

diff --git a/stack/values.yaml b/stack/values.yaml
@@ -152,6 +152,8 @@ global:
 
   topologySpreadConstraints: []
 
+  env: []
+
 # Service overrides
 services: {}
   # service1: