Merge pull request #70 from ndustrialio/support-complex-extra-env

fix: support complex extra env var map

examples/deployment/cert-manager.yml

@@ -68,3 +68,11 @@ externalSecrets:
 tenant: test-tenant
 updateStrategy:
   type: Recreate
+
+extraEnvVarsMap:
+  TEST: value
+  TEST_SECRET:
+    valueFrom:
+      secretKeyRef:
+        name: my-custom-secret-name
+        key: test

ndustrial/cronjob/Chart.yaml

@@ -14,5 +14,5 @@ maintainers:
   - email: [email protected]
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 0.1.29
-appVersion: 0.1.29
+version: 0.1.30
+appVersion: 0.1.30

ndustrial/cronjob/templates/cronjob.yaml

@@ -125,9 +125,13 @@ spec:
                 {{- if .Values.extraEnvVarsMap }}
                 {{- range $key, $val := .Values.extraEnvVarsMap }}
                 - name: {{ $key }}
+                {{- if (kindIs "map" $val ) }}
+                {{- include "nio-common.tplvalues.render" (dict "value" $val "context" $) | nindent 18 }}
+                {{- else }}
                   value: {{ include "nio-common.tplvalues.render" (dict "value" $val "context" $) | quote }}
                 {{- end }}
                 {{- end }}
+                {{- end }}
                 {{- if .Values.datadog }}
                 {{- include "nio-common.datadog.envs" (dict "value" .Values.datadog "context" $) | nindent 16 }}
                 {{- end }}

ndustrial/cronjob/values.yaml

@@ -162,10 +162,15 @@ shareProcessNamespace: false
 ##
 extraEnvVars: []
 
-## @param extraEnvVarsMap Add extra environment variables to the Deployment container
+## @param extraEnvVarsMap Add extra environment variables to the Deployment container. Can be a single string or a valid environment mapping
 ## E.g:
 ## extraEnvVarsMap:
 ##   FOO: "bar"
+##   FOO_SECRET:
+##     valueFrom:
+##       secretKeyRef:
+##         name: secret
+##         key: test
 ##
 extraEnvVarsMap: {}
 

ndustrial/daemonset/Chart.yaml

@@ -13,5 +13,5 @@ maintainers:
   - email: [email protected]
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 0.1.7
-appVersion: 0.1.7
+version: 0.1.8
+appVersion: 0.1.8

ndustrial/daemonset/templates/daemonset.yaml

@@ -90,9 +90,13 @@ spec:
             {{- if .Values.extraEnvVarsMap }}
             {{- range $key, $val := .Values.extraEnvVarsMap }}
             - name: {{ $key }}
+            {{- if (kindIs "map" $val ) }}
+            {{- include "nio-common.tplvalues.render" (dict "value" $val "context" $) | nindent 14 }}
+            {{- else }}
               value: {{ include "nio-common.tplvalues.render" (dict "value" $val "context" $) | quote }}
             {{- end }}
             {{- end }}
+            {{- end }}
             - name: POD_NAMESPACE
               valueFrom:
                 fieldRef:

ndustrial/daemonset/values.yaml

@@ -340,6 +340,11 @@ extraEnvVars: []
 ## E.g:
 ## extraEnvVarsMap:
 ##   FOO: "bar"
+##   FOO_SECRET:
+##     valueFrom:
+##       secretKeyRef:
+##         name: secret
+##         key: test
 ##
 extraEnvVarsMap: {}
 

ndustrial/deployment/Chart.yaml

@@ -13,5 +13,5 @@ maintainers:
   - email: [email protected]
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 0.1.63
-appVersion: 0.1.63
+version: 0.1.64
+appVersion: 0.1.64

ndustrial/deployment/templates/deployment.yaml

@@ -104,9 +104,13 @@ spec:
             {{- if .Values.extraEnvVarsMap }}
             {{- range $key, $val := .Values.extraEnvVarsMap }}
             - name: {{ $key }}
+            {{- if (kindIs "map" $val ) }}
+            {{- include "nio-common.tplvalues.render" (dict "value" $val "context" $) | nindent 14 }}
+            {{- else }}
               value: {{ include "nio-common.tplvalues.render" (dict "value" $val "context" $) | quote }}
             {{- end }}
             {{- end }}
+            {{- end }}
             - name: POD_NAMESPACE
               valueFrom:
                 fieldRef:

ndustrial/deployment/values.yaml

@@ -389,6 +389,11 @@ extraEnvVars: []
 ## E.g:
 ## extraEnvVarsMap:
 ##   FOO: "bar"
+##   FOO_SECRET:
+##     valueFrom:
+##       secretKeyRef:
+##         name: secret
+##         key: test
 ##
 extraEnvVarsMap: {}
 

ndustrial/nio-api/Chart.yaml

@@ -13,5 +13,5 @@ maintainers:
   - email: [email protected]
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 1.0.11
-appVersion: 1.0.11
+version: 1.0.12
+appVersion: 1.0.12

ndustrial/nio-api/values.yaml

@@ -365,6 +365,11 @@ extraEnvVars: []
 ## E.g:
 ## extraEnvVarsMap:
 ##   FOO: "bar"
+##   FOO_SECRET:
+##     valueFrom:
+##       secretKeyRef:
+##         name: secret
+##         key: test
 ##
 extraEnvVarsMap: {}
 ## @param extraEnvVarsCM Name of existing ConfigMap containing extra env vars

ndustrial/statefulset/Chart.yaml

@@ -12,5 +12,5 @@ maintainers:
   - email: [email protected]
     name: DevOps
 # Please make sure that version and appVersion are always the same.
-version: 0.1.39
-appVersion: 0.1.39
+version: 0.1.40
+appVersion: 0.1.40

ndustrial/statefulset/templates/statefuleset.yaml

@@ -105,9 +105,13 @@ spec:
             {{- if .Values.extraEnvVarsMap }}
             {{- range $key, $val := .Values.extraEnvVarsMap }}
             - name: {{ $key }}
+            {{- if (kindIs "map" $val ) }}
+            {{- include "nio-common.tplvalues.render" (dict "value" $val "context" $) | nindent 14 }}
+            {{- else }}
               value: {{ include "nio-common.tplvalues.render" (dict "value" $val "context" $) | quote }}
             {{- end }}
             {{- end }}
+            {{- end }}
             {{- if .Values.datadog }}
             {{- include "nio-common.datadog.envs" (dict "value" .Values.datadog "context" $) | nindent 12 }}
             {{- end }}

ndustrial/statefulset/values.yaml

@@ -363,6 +363,11 @@ extraEnvVars: []
 ## E.g:
 ## extraEnvVarsMap:
 ##   FOO: "bar"
+##   FOO_SECRET:
+##     valueFrom:
+##       secretKeyRef:
+##         name: secret
+##         key: test
 ##
 extraEnvVarsMap: {}