Merge pull request #134 from gimlet-io/existing-secret-as-volume

Support existing secret as volume
gimlet-io · Jun 21, 2024 · dd997da · dd997da
2 parents 3c6f666 + bf8c6b8
commit dd997da
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 11 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -15,4 +15,4 @@ type: library
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.1
+version: 0.6.0
diff --git a/charts/common/templates/_volumesRef.yaml b/charts/common/templates/_volumesRef.yaml
@@ -8,6 +8,9 @@ volumes:
     {{- else if .existingConfigMap }}
     configMap:
       name: {{ .existingConfigMap }}
+    {{- else if .existingSecret }}
+    secret:
+      secretName: {{ .existingSecret }}
     {{- else if .fileName }}
     configMap:
       name: {{ template "common.robustName" (printf "%s-%s" $.Release.Name .name) }}

diff --git a/charts/cron-job/Chart.lock b/charts/cron-job/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.5.1
-digest: sha256:ca23e74d63ca4339e8720d1af3709107d1d5831c5f9e78d9ae88107a2590c826
-generated: "2024-02-01T13:22:33.441381+01:00"
+  version: 0.6.0
+digest: sha256:b3a62bdb9852049c98123eeb95e79ceb12aaab1aab1a0e2f2d8437aa6d1a9e90
+generated: "2024-06-21T08:14:31.489421+02:00"
diff --git a/charts/cron-job/Chart.yaml b/charts/cron-job/Chart.yaml
@@ -19,5 +19,5 @@ version: 0.69.0
 
 dependencies:
   - name: common
-    version: 0.5.1
+    version: 0.6.0
     repository: file://../common
diff --git a/charts/cron-job/charts/common-0.5.1.tgz b/charts/cron-job/charts/common-0.5.1.tgz
diff --git a/charts/cron-job/charts/common-0.6.0.tgz b/charts/cron-job/charts/common-0.6.0.tgz
diff --git a/charts/onechart/Chart.lock b/charts/onechart/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.5.1
-digest: sha256:ca23e74d63ca4339e8720d1af3709107d1d5831c5f9e78d9ae88107a2590c826
-generated: "2024-02-01T13:22:32.899733+01:00"
+  version: 0.6.0
+digest: sha256:b3a62bdb9852049c98123eeb95e79ceb12aaab1aab1a0e2f2d8437aa6d1a9e90
+generated: "2024-06-21T08:03:57.319388+02:00"
diff --git a/charts/onechart/Chart.yaml b/charts/onechart/Chart.yaml
@@ -19,5 +19,5 @@ version: 0.69.0
 
 dependencies:
   - name: common
-    version: 0.5.1
+    version: 0.6.0
     repository: file://../common
diff --git a/charts/onechart/charts/common-0.5.1.tgz b/charts/onechart/charts/common-0.5.1.tgz
diff --git a/charts/onechart/charts/common-0.6.0.tgz b/charts/onechart/charts/common-0.6.0.tgz
diff --git a/charts/onechart/tests/deployment_volumes_test.yaml b/charts/onechart/tests/deployment_volumes_test.yaml
@@ -171,14 +171,30 @@ tests:
             - name: volume-name
               configMap:
                 name: my-configmap
+  - it: Should use an existing secret as volume
+    set:
+      volumes:
+        - existingSecret: my-secret
+          name: volume-name
+          path: /randomPath/app.creds
+          subPath: app.creds
+    asserts:
+      - template: deployment.yaml
+        documentIndex: 0
+        equal:
+          path: spec.template.spec.volumes
+          value:
+            - name: volume-name
+              secret:
+                secretName: my-secret
       - template: deployment.yaml
         documentIndex: 0
         equal:
           path: spec.template.spec.containers[0].volumeMounts
           value:
             - name: volume-name
-              mountPath: /randomPath/app.conf
-              subPath: app.conf
+              mountPath: /randomPath/app.creds
+              subPath: app.creds
   - it: Should use a configmap with custom value
     set:
       volumes:

diff --git a/charts/onechart/values.schema.json b/charts/onechart/values.schema.json
@@ -1106,6 +1106,35 @@
               "fileContent",
               "path"
             ]
+          },
+          {
+            "id": "#/properties/volumes/oneOf/6",
+            "title": "Mount an existing secret as a file",
+            "type": "object",
+            "properties": {
+              "existingSecret": {
+                "type": "string",
+                "title": "Name",
+                "description": "The name of the secret to mount",
+                "default": "data"
+              },
+              "path": {
+                "type": "string",
+                "title": "Path",
+                "description": "The mount path inside the container",
+                "default": "/data/dummy.conf"
+              },
+              "subPath": {
+                "type": "string",
+                "title": "subPath",
+                "description": "Mount single file",
+                "default": "dummy.conf"
+              }
+            },
+            "required": [
+              "existingSecret",
+              "path"
+            ]
           }
         ]
       }

diff --git a/common-0.6.0.tgz b/common-0.6.0.tgz
diff --git a/values.yaml b/values.yaml
@@ -14,6 +14,10 @@ volumes:
   - name: empty
     path: /deleteme2
     emptyDir: true
+  - existingSecret: my-secret
+    name: volume-name
+    path: /randomPath/app.creds
+    subPath: app.creds
 
 vars:
   var1: value1