Merge pull request #1758 from neogopher/bugfix-helmtemplate-storagecl…

…assname
loft-sh · May 10, 2024 · 964f962 · 964f962
2 parents 1926e1d + 68accba
commit 964f962
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/chart/templates/etcd-statefulset.yaml b/chart/templates/etcd-statefulset.yaml
@@ -43,8 +43,8 @@ spec:
         name: data
       spec:
         accessModes: {{ $externalEtcd.persistence.volumeClaim.accessModes }}
-        {{- if $externalEtcd.persistence.volumeClaim.className }}
-        storageClassName: {{ $externalEtcd.persistence.volumeClaim.className }}
+        {{- if $externalEtcd.persistence.volumeClaim.storageClass }}
+        storageClassName: {{ $externalEtcd.persistence.volumeClaim.storageClass }}
         {{- end }}
         resources:
           requests:

diff --git a/chart/tests/etcd-statefulset_test.yaml b/chart/tests/etcd-statefulset_test.yaml
@@ -58,6 +58,24 @@ tests:
           path: spec.template.spec.containers[0].image
           value: fabi.com/etcd:123
 
+  - it: check specified storage class is used
+    set:
+      controlPlane:
+        backingStore:
+          etcd:
+            deploy:
+              enabled: true
+              statefulSet:
+                persistence:
+                  volumeClaim:
+                    storageClass: test-sc
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: spec.volumeClaimTemplates[0].spec.storageClassName
+          value: test-sc
+
   - it: enabled for k3s & non persistent
     set:
       controlPlane: