Merge pull request #147 from bedag/feat/common-enable-mounting-of-exi…

…sting-cm [common]: Enable mounting of existing cm
bedag · Jan 6, 2025 · edfcf47 · edfcf47
2 parents 68c1c42 + b58864c
commit edfcf47
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 3 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: 12.1.0
+version: 12.2.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: 12.1.0](https://img.shields.io/badge/Version-12.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 12.2.0](https://img.shields.io/badge/Version-12.2.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
@@ -65,10 +65,19 @@ volumes:
       {{- end }}
   {{- else if eq .type "configMap" }}
     configMap:
+      {{- if .items }}
+      name: {{ .name }}
+      items:
+      {{- range .items }}
+        - key: {{ .key }}
+          path: {{ .path }}
+      {{- end }}
+      {{- else }}
       name: {{ template "library.name" $root }}-{{ .name }}
       {{- if .defaultMode }}
       defaultMode: {{ .defaultMode }}
       {{- end }}
+      {{- end }}
   {{- else if eq .type "persistentVolumeClaim" }}
     persistentVolumeClaim:
       claimName: {{ template "library.name" $root }}-{{ .claimNameSuffix }}

diff --git a/charts/common/values.schema.json b/charts/common/values.schema.json
@@ -1090,6 +1090,25 @@
                   "type": "array",
                   "items": {
                     "type": "object",
+                    "properties": {
+                      "name": {
+                        "type": "string"
+                      },
+                      "type": {
+                        "type": "string"
+                      },
+                      "items": {
+                        "type": "array",
+                        "properties": {
+                          "key": {
+                            "type": "string"
+                          },
+                          "path": {
+                            "type": "string"
+                          }
+                        }
+                      }
+                    },
                     "required": [
                       "name",
                       "type"

diff --git a/charts/common/values.yaml b/charts/common/values.yaml
@@ -465,9 +465,14 @@ components:
       # volumes is a list of volumes to be created as secret or configMap
       volumes: []
       #   -- name of the volume
-      # - name: generic-name
+      # - name: generic-name or existing-cm-name
       #   -- type can either be "secret", "configMap", "persistentVolumeClaim", "emptyDir", "external" or "csi"
       #    type: "secret"
+      #   START ONLY FOR CONFIGMAP
+      #    items:
+      #      - key: foo.txt
+      #        path: opt/foo.txt
+      #   END ONLY FOR CONFIGMAP
       #   START ONLY FOR SECRET or CONFIGMAP
       #   filePath is optional for specifying a filePath in the helm chart where the file is located.
       #    filePath: "files/xy.yml"