tpl statekey & extra env vars

Author: yairsimantov20

charts/port-k8s-exporter/templates/configmap.yaml

@@ -1,5 +1,5 @@
 {{- if eq .Values.configMap.create true -}}
-{{- $stateKey := lower (default (uuidv4 | replace "-" "") .Values.stateKey) -}}
+{{- $stateKey := lower (default (uuidv4 | replace "-" "") (tpl .Values.stateKey $)) -}}
 {{- $config_lookup := (lookup "v1" "ConfigMap" .Release.Namespace (include "port-k8s-exporter.configMapName" .)) -}}
 {{- if (($config_lookup).data).state_key -}}
   {{- $stateKey = $config_lookup.data.state_key -}}

charts/port-k8s-exporter/templates/deployment.yaml

@@ -78,8 +78,8 @@ spec:
           volumeMounts:
             - name: config-volume
               mountPath: "/config"
-            {{- with .Values.extraVolumeMounts }}
-              {{- toYaml . | nindent 12 }}
+            {{- if .Values.extraVolumeMounts }}
+              {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end }}
       volumes:
         - name: config-volume