Merge pull request #113 from adberger/master

[common]: Add ability to set defaultMode for all configFiles
bedag · Aug 21, 2023 · 5b11e56 · 5b11e56
2 parents 21161bf + acd8da1
commit 5b11e56
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: common
 description: "Bedag's common Helm chart to use for creating other Helm charts"
-version: 10.5.0
+version: 10.6.0
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives

diff --git a/charts/common/README.md b/charts/common/README.md
@@ -1,6 +1,6 @@
 # common
 
-![Version: 10.5.0](https://img.shields.io/badge/Version-10.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 10.6.0](https://img.shields.io/badge/Version-10.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Bedag's common Helm chart to use for creating other Helm charts
 

diff --git a/charts/common/templates/_pod.yaml b/charts/common/templates/_pod.yaml
@@ -110,11 +110,17 @@ volumes:
   - name: {{ $containerName }}-configfiles
     configMap:
       name: {{ template "library.name" $root }}-{{ $name }}-{{ $containerName }}-configfiles
+      {{- if $containerValues.configFilesDefaultMode }}
+      defaultMode: {{ $containerValues.configFilesDefaultMode }}
+      {{- end }}
   {{- end }}
   {{- if $secretConfigs }}
   - name: {{ $containerName }}-secret-configfiles
     secret:
       secretName: {{ template "library.name" $root }}-{{ $name }}-{{ $containerName }}-secret-configfiles
+      {{- if $containerValues.configFilesDefaultMode }}
+      defaultMode: {{ $containerValues.configFilesDefaultMode }}
+      {{- end }}
   {{- end }}
   {{- end }}
   {{- $binaryFiles := $containerValues.binaryFiles }}

diff --git a/charts/common/values.schema.json b/charts/common/values.schema.json
@@ -90,6 +90,9 @@
         "envConfigMap": {
           "type": "object"
         },
+        "configFilesDefaultMode": {
+          "type": "integer"
+        },
         "configFiles": {
           "type": "object",
           "patternProperties": {

diff --git a/charts/common/values.yaml b/charts/common/values.yaml
@@ -511,6 +511,11 @@ components:
           # envConfigMap is a dictionary of environment variables set for the current container, key: value
           # envConfigMap: {}
 
+          # configFilesDefaultMode sets permissions for all configFiles mounted.
+          # See  'pod.spec.volumes.configMap.defaultMode' or 'pod.spec.volumes.secret.defaultMode' for more information
+          # Comment out for using default (0644)
+          # configFilesDefaultMode: 0644
+
           # configFiles is a dictionary of arbitrary config files in the structure below
           # format has to be "key=value", "yaml" or "simple". Default: "key=value"
           # secret is optional for specifying if file should be created as a Secret (= true) or ConfigMap (= false or not specified)