[common] allow the use of tpl's for envFrom (#822)

* allow the use of tpl's for envFrom

* actuall this is a feature increase

charts/library/common/Chart.yaml

@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 6.9.2
+version: 6.10.0

charts/library/common/templates/lib/controller/_container.tpl

@@ -40,6 +40,10 @@
         secretKeyRef:
           name: {{ tpl $value.secretKeyRef.name $ | quote }}
           key: {{ tpl $value.secretKeyRef.key $ | quote }}
+        {{- else if $value.configMapRef }}
+        configMapRef:
+          name: {{ tpl $value.configMapRef.name $ | quote }}
+          key: {{ tpl $value.configMapRef.key $ | quote }}
         {{- else }}
         {{- $value | toYaml | nindent 8 }}
         {{- end }}
@@ -79,14 +83,22 @@
   {{- end }}
   {{- if or .Values.envFrom .Values.secret }}
   envFrom:
-    {{- with .Values.envFrom }}
+  {{- range $key, $value := .Values.envFrom }}
-      {{- toYaml . | nindent 4 }}
+    {{- if  $value.secretKeyRef }}
-    {{- end }}
+    - secretKeyRef:
-    {{- if .Values.secret }}
+      name: {{ tpl $value.secretKeyRef.name $ | quote }}
-    - secretRef:
+    {{- else if  $value.configMapRef }}
-        name: {{ include "common.names.fullname" . }}
+    - configMapRef:
+      name: {{ tpl $value.configMapRef.name $ | quote }}
+    {- else }}
+      {{- toYaml $value | nindent 4 }}
     {{- end }}
   {{- end }}
+  {{- if .Values.secret }}
+  - secretRef:
+      name: {{ include "common.names.fullname" . }}
+  {{- end }}
+  {{- end }}
   {{- include "common.controller.ports" . | trim | nindent 2 }}
   {{- with (include "common.controller.volumeMounts" . | trim) }}
   volumeMounts: