Merge pull request #155 from MediaMarktSaturn/fix-mount-defaultmode

[Application] Fix secret and configmap volume mount defaultMode
MediaMarktSaturn · Oct 29, 2024 · 45a6748 · 45a6748
2 parents 36567c4 + 98ac7c5
commit 45a6748
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/charts/application/Chart.yaml b/charts/application/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
   - name: MediaMarktSaturn
     url: https://github.com/MediaMarktSaturn
 appVersion: 1.0.0
-version: 1.26.0
+version: 1.26.1
diff --git a/charts/application/templates/_podTemplate.tpl b/charts/application/templates/_podTemplate.tpl
@@ -303,17 +303,11 @@ spec:
         {{- range .Values.secretVolumes }}
         - name: {{ .secretName }}
           mountPath: {{ .mountPath }}
-          {{- if .defaultMode }}
-          defaultMode: {{ .defaultMode }}
-          {{- end }}
           readOnly: true
         {{- end }}
         {{- range .Values.configVolumes }}
         - name: {{ .configMapName }}
           mountPath: {{ .mountPath }}
-          {{- if .defaultMode }}
-          defaultMode: {{ .defaultMode }}
-          {{- end }}
           readOnly: true
         {{- end }}
         {{- if .Values.serviceAccount.secretName }}
@@ -350,11 +344,17 @@ spec:
     - name: {{ .secretName }}
       secret:
         secretName: {{ .secretName }}
+        {{- if .defaultMode }}
+        defaultMode: {{ .defaultMode }}
+        {{- end }}
     {{- end }}
     {{- range .Values.configVolumes }}
     - name: {{ .configMapName }}
       configMap:
         name: {{ .configMapName }}
+        {{- if .defaultMode }}
+        defaultMode: {{ .defaultMode }}
+        {{- end }}
     {{- end }}
     {{- if .Values.serviceAccount.secretName }}
     - name: service-account

diff --git a/charts/application/values.yaml b/charts/application/values.yaml
@@ -128,13 +128,13 @@ disruptionBudget:
 secretVolumes: []
 #  - secretName: mysecret
 #    mountPath: /mypath
-#    defaultMode: 420
+#    defaultMode: 0420
 
 # list of configmaps to be mounted to app pod
 configVolumes: []
 #  - configMapName: myconfigmap
 #    mountPath: /mypath
-#    defaultMode: 420
+#    defaultMode: 0420
 
 # list of secret names to be used as envFrom entries
 secretEnvFrom: []