From ad51260be260eea19a1198d5934d76d665b6ccb1 Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Fri, 21 Jun 2024 08:09:43 +0200 Subject: [PATCH 1/2] Support existing secret as volume --- charts/common/Chart.yaml | 2 +- charts/common/templates/_volumesRef.yaml | 3 ++ charts/cron-job/charts/common-0.5.1.tgz | Bin 3075 -> 3075 bytes charts/onechart/Chart.lock | 6 ++-- charts/onechart/Chart.yaml | 2 +- charts/onechart/charts/common-0.5.1.tgz | Bin 3075 -> 0 bytes charts/onechart/charts/common-0.6.0.tgz | Bin 0 -> 3086 bytes .../tests/deployment_volumes_test.yaml | 20 ++++++++++-- charts/onechart/values.schema.json | 29 ++++++++++++++++++ values.yaml | 4 +++ 10 files changed, 59 insertions(+), 7 deletions(-) delete mode 100644 charts/onechart/charts/common-0.5.1.tgz create mode 100644 charts/onechart/charts/common-0.6.0.tgz diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml index b6cfd621..c9bf3c77 100644 --- 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 index c8b21828..37a580a7 100644 --- 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/charts/common-0.5.1.tgz b/charts/cron-job/charts/common-0.5.1.tgz index b906a3031b6f5de0ac4468c193a19ee3dbbddab3..2133d73baf2e4368c4a05806532ec13591c82565 100644 GIT binary patch delta 2984 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 literal 0 HcmV?d00001 diff --git a/charts/onechart/tests/deployment_volumes_test.yaml b/charts/onechart/tests/deployment_volumes_test.yaml index d95543b2..bd367933 100644 --- 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 index 32dad5e6..8ca33fd7 100644 --- 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/values.yaml b/values.yaml index cf54bd06..db1ff20c 100644 --- 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 From bf8c6b83f40009df1029b87d598e4bc7df163c0c Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Fri, 21 Jun 2024 08:14:54 +0200 Subject: [PATCH 2/2] Support existing secret as volume --- charts/cron-job/Chart.lock | 6 +++--- charts/cron-job/Chart.yaml | 2 +- charts/cron-job/charts/common-0.5.1.tgz | Bin 3075 -> 0 bytes charts/cron-job/charts/common-0.6.0.tgz | Bin 0 -> 3086 bytes charts/onechart/charts/common-0.6.0.tgz | Bin 3086 -> 3086 bytes common-0.6.0.tgz | Bin 0 -> 3086 bytes 6 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 charts/cron-job/charts/common-0.5.1.tgz create mode 100644 charts/cron-job/charts/common-0.6.0.tgz create mode 100644 common-0.6.0.tgz diff --git a/charts/cron-job/Chart.lock b/charts/cron-job/Chart.lock index f953ee9b..f5b6d619 100644 --- 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 index af7eec47..4799b8b8 100644 --- 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 deleted file mode 100644 index 2133d73baf2e4368c4a05806532ec13591c82565..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3075 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≻%u zB(5@r@zd(wS>*v6n+T;=neq*PQMw(ic7VNc$@CCzx{g<2ZyXlEmKFzsEwcaEEg$Mt zli|;(=5>v>ZmnylPR{^W=|D@;N{~nwi?tcGaE7XGjt+A5@m%u%zQ0@M=cQSD9fID{wn>V`M!-Vd& z9xYzmAGIh9+z9T~4A3Q^;mR|TkItRs;0liESvnHY9$< zlB*$TRkr-X`S_dTxNYBkt(-R>KUa$`!v76Hzo8ZQe{giz^Y4G1^mqRMt zAb$n?3$9hwzB*hasiinpL5Cu}d>_KKBZY}XTiOpy%&$fi3C%A@7S^e??0yxwyunR< z`{*%HMP!Q1^1bYT{@r+)p$hIoU#3RLn9J>$TRcpiwquz@-hn^ha>VKcpR!! zKXXAR!Q+1h58*8ll;;wjKYb>HFcbU_j8qWP7|FgZF8CioIFk{NasU4YM0T{J9etDZ R-v9sr|Np!p{w4re004ea4oCn1 diff --git a/charts/cron-job/charts/common-0.6.0.tgz b/charts/cron-job/charts/common-0.6.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..e21114ce2c9306dcf2ea496c49509d96693a35fa GIT binary patch literal 3086 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 literal 0 HcmV?d00001 diff --git a/charts/onechart/charts/common-0.6.0.tgz b/charts/onechart/charts/common-0.6.0.tgz index d15af4cc6931dbbaacd4319f87e377c0e3297d53..bf9139c556f1a7339961d896946c682aa0fc1402 100644 GIT binary patch delta 2882 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 delta 2882 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 literal 0 HcmV?d00001