Fixed the configFiles rendering

Author: technicalguru

examples/helm-charts/amavis/templates/configFiles.yaml

@@ -1,4 +1,3 @@
-{{- $files := .Files -}}
 {{ range .Values.configFiles }}
 ---
 apiVersion: v1
@@ -7,6 +6,6 @@ metadata:
   name: {{ include "amavis.fullname" $ }}-{{ .name }}
   namespace: {{ $.Release.Namespace }}
 data:
-  {{ base .path }}: |-
-    {{- tpl ($files.Get .path) $ | nindent 4 -}}
+  {{ base .mountPath }}: |-
+    {{- .content | nindent 4 -}}
 {{- end -}}

examples/helm-charts/amavis/templates/deployment.yaml

@@ -55,7 +55,7 @@ spec:
 {{- range .Values.configFiles }}
         - name: {{ .name }}
           mountPath: {{ .mountPath }}
-          subPath: {{ base .path }}
+          subPath: {{ base .mountPath }}
 {{- end }}
         {{- if .Values.additionalContainerSpec -}}
           {{- toYaml .Values.additionalContainerSpec | nindent 8 }}

examples/helm-charts/amavis/values.yaml

@@ -51,14 +51,16 @@ virusAdminEmail: ""
 # $configfiles - list of config file definitions
 # $configfiles[].name - unique name for config definition
 # $configfiles[].mountPath - path of file in pod to mount at
-# $configfiles[].path - the config file (must be accessible within HELM chart)
-configFiles: {}
+# $configfiles[].content - the config file content
+# ATTENTION: You better pass the content with command line arguments to HELM:
+#       --set-file "configFiles[0].content=/path/to/file" (quotes required)
+configFiles: []
 #- name: example1
 #  mountPath: /etc/spamassassin/x10-example.cf
-#  path: example1.cf
+#  content: "content of file"
 #- name: example2
 #  mountPath: /etc/spamassassin/x20-example.cf
-#  path: example2.cf
+#  content: "content of file"
 
 # $additionalTemplateSpec  - Add more deployment template specification at this value
 # $additionalPodSpec       - Add more pod specification at this value

examples/helm-charts/postfix/templates/configFiles.yaml

@@ -7,6 +7,6 @@ metadata:
   name: {{ include "postfix.fullname" $ }}-{{ .name }}
   namespace: {{ $.Release.Namespace }}
 data:
-  {{ base .path }}: |-
-    {{- tpl ($files.Get .path) $ | nindent 4 -}}
+  {{ base .mountPath }}: |-
+    {{- .content | nindent 4 -}}
 {{- end -}}

examples/helm-charts/postfix/templates/deployment.yaml

@@ -97,7 +97,7 @@ spec:
 {{- range .Values.configFiles }}
         - name: {{ .name }}
           mountPath: {{ .mountPath }}
-          subPath: {{ base .path }}
+          subPath: {{ base .mountPath }}
 {{- end }}
         {{- if .Values.additionalContainerSpec -}}
           {{- toYaml .Values.additionalContainerSpec | nindent 8 }}

examples/helm-charts/postfix/values.yaml

@@ -96,14 +96,16 @@ tlsKey: ""
 # $configfiles - list of config file definitions
 # $configfiles[].name - unique name for config definition
 # $configfiles[].mountPath - path of file in pod to mount at
-# $configfiles[].path - the config file (must be accessible within HELM chart)
-configFiles: {}
+# $configfiles[].content - the config file content
+# ATTENTION: You better pass the content with command line arguments to HELM:
+#       --set-file "configFiles[0].content=/path/to/file" (quotes required)
+configFiles: []
 #- name: example1
 #  mountPath: /etc/postfix/x10-example.cf
-#  path: example1.cf
+#  content: "content of file"
 #- name: example2
 #  mountPath: /etc/postfix/x20-example.cf
-#  path: example2.cf
+#  content: "content of file"
 
 # $additionalTemplateSpec  - Add more deployment template specification at this value
 # $additionalPodSpec       - Add more pod specification at this value