Merge pull request #122 from janlauber/add-csi-volumes

[common]: fix rendering of csi volume
bedag · Oct 31, 2023 · 6197547 · 6197547
2 parents 532ed46 + 74650be
commit 6197547
Show file tree

Hide file tree

Showing 4 changed files with 9 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: 10.10.0
+version: 10.10.1
 # 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.10.0](https://img.shields.io/badge/Version-10.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 10.10.1](https://img.shields.io/badge/Version-10.10.1-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/ci/values.test.yaml b/charts/common/ci/values.test.yaml
@@ -195,6 +195,12 @@ components:
         - name: emptydir-volume
           type: "emptyDir"
           sizeLimit: 100Mi
+        - name: secret-store
+          type: "csi"
+          driver: secrets-store.csi.k8s.io
+          readOnly: true
+          volumeAttributes:
+            secretProviderClass: "azure-kvname"
 
       containers:
         container-1:

diff --git a/charts/common/templates/_pod.yaml b/charts/common/templates/_pod.yaml
@@ -88,7 +88,6 @@ volumes:
       readOnly: {{ .readOnly }}
       {{- end }}
     {{- end }}
-  {{- end }}
   {{- else if eq .type "csi" }}
     {{- if .driver }}
     csi:
@@ -105,6 +104,7 @@ volumes:
     {{- end }}
   {{- end }}
   {{- end }}
+  {{- end }}
   {{- if or $controllerValues.containers $controllerValues.initContainers }}
   {{- $containers := merge ($controllerValues.containers | default dict) ($controllerValues.initContainers | default dict) }}
   {{- range $containerName, $containerValues := $containers }}