Merge pull request #72 from vladimir-babichev/main

[common] Added support for 'envFrom' values section as defined in values.yaml
nicholaswilde · Mar 1, 2022 · becc076 · becc076
2 parents 6a69568 + 90b4513
commit becc076
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: common
 description: Function library for nicholaswilde's helm charts
 type: library
-version: 0.1.13
+version: 0.1.14
 keywords:
   - nicholaswilde
   - common

diff --git a/charts/common/templates/lib/controller/_container.tpl b/charts/common/templates/lib/controller/_container.tpl
@@ -15,8 +15,11 @@ The main container included in the controller.
   securityContext:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- if or .Values.env .Values.secret }}
+  {{- if or .Values.env .Values.secret .Values.envFrom }}
   envFrom:
+  {{- with .Values.envFrom }}
+      {{- toYaml . | nindent 4 }}
+  {{- end }}
   {{- if .Values.env }}
     - configMapRef:
         name: {{ include "common.names.fullname" . }}