Merge pull request #106 from ccremer/fix-storage-class

Only render reserveSpace parameter if explicitly set
ccremer · Aug 13, 2023 · 452afc2 · 452afc2
2 parents 3efc732 + c6c486e
commit 452afc2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/charts/kubernetes-zfs-provisioner/Chart.yaml b/charts/kubernetes-zfs-provisioner/Chart.yaml
@@ -14,7 +14,7 @@ description: Dynamic ZFS persistent volume provisioner for Kubernetes
 
 # 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.
-version: 2.2.0
+version: 2.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/charts/kubernetes-zfs-provisioner/README.md b/charts/kubernetes-zfs-provisioner/README.md
@@ -1,6 +1,6 @@
 # kubernetes-zfs-provisioner
 
-![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square)
+![Version: 2.2.1](https://img.shields.io/badge/Version-2.2.1-informational?style=flat-square)
 
 Dynamic ZFS persistent volume provisioner for Kubernetes
 
@@ -76,4 +76,3 @@ No 1.x or 0.x chart releases will be migrated from the `ccremer/charts` Helm rep
 * The `image.registry` has changed from `quay.io` to `ghcr.io`.
 * The `image.tag` has changed from to `v1.1.0` to `v1`.
 * The `image.pullPolicy` has changed from `IfNotPresent` to `Always`.
-
diff --git a/charts/kubernetes-zfs-provisioner/templates/storageclass.yaml b/charts/kubernetes-zfs-provisioner/templates/storageclass.yaml
@@ -19,6 +19,8 @@ parameters:
   type: {{ .type | default "nfs" }}
   node: {{ .node | default "''" }}
   shareProperties: {{ .shareProperties | default "''" }}
-  reserveSpace: {{ coalesce (quote .reserveSpace) (quote true) }}
+  {{- if kindIs "bool" .reserveSpace }}
+  reserveSpace: {{ quote .reserveSpace }}
+  {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/kubernetes-zfs-provisioner/test/storageclass_test.go b/charts/kubernetes-zfs-provisioner/test/storageclass_test.go
@@ -69,7 +69,9 @@ func Test_StorageClass_GivenClassesEnabled_WhenReserveSpaceUndefined_ThenRenderD
 	var class v1.StorageClass
 	helm.UnmarshalK8SYaml(t, output, &class)
 
-	assert.Equal(t, "true", class.Parameters["reserveSpace"])
+	value, exists := class.Parameters["reserveSpace"]
+	assert.False(t, exists)
+	assert.Empty(t, value)
 }
 
 func Test_StorageClass_GivenClassesEnabled_WhenReserveSpaceFalse_ThenRenderReserveSpace(t *testing.T) {

diff --git a/charts/kubernetes-zfs-provisioner/values.yaml b/charts/kubernetes-zfs-provisioner/values.yaml
@@ -43,7 +43,7 @@ storageClass:
     #   # `HostPath` node affinity
     #   node: ""
     #   # -- Reserve space for created datasets. Default is true. Use false to enable thin provisioning
-    #   reserveSpace: true
+    #   reserveSpace: false
     #   # -- Annotations for the storage class
     #   # annotations:
     #   #   storageclass.kubernetes.io/is-default-class: "true"