From d353cdebc4d823f7db6467612fa3931e756aaf09 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 30 Jul 2020 23:16:48 +0200 Subject: [PATCH] [kubernetes-zfs-provisioner] Render string if no parameter is given Otherwise Kubernetes fails at validating if the value is empty, since it would be rendered as nil --- kubernetes-zfs-provisioner/Chart.yaml | 2 +- kubernetes-zfs-provisioner/README.md | 2 +- kubernetes-zfs-provisioner/templates/storageclass.yaml | 2 +- kubernetes-zfs-provisioner/test/storageclass_test.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kubernetes-zfs-provisioner/Chart.yaml b/kubernetes-zfs-provisioner/Chart.yaml index 7ee3516..d9ab46c 100644 --- a/kubernetes-zfs-provisioner/Chart.yaml +++ b/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: 0.2.4 +version: 0.2.5 # 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/kubernetes-zfs-provisioner/README.md b/kubernetes-zfs-provisioner/README.md index 665aadd..4e33fdf 100644 --- a/kubernetes-zfs-provisioner/README.md +++ b/kubernetes-zfs-provisioner/README.md @@ -2,7 +2,7 @@ kubernetes-zfs-provisioner ========================== Dynamic ZFS persistent volume provisioner for Kubernetes -Current chart version is `0.2.4` +Current chart version is `0.2.5` diff --git a/kubernetes-zfs-provisioner/templates/storageclass.yaml b/kubernetes-zfs-provisioner/templates/storageclass.yaml index aa98ec4..492d608 100644 --- a/kubernetes-zfs-provisioner/templates/storageclass.yaml +++ b/kubernetes-zfs-provisioner/templates/storageclass.yaml @@ -14,6 +14,6 @@ parameters: hostname: {{ .hostName }} type: {{ .type | default "nfs" }} node: {{ .nodeName | default "''" }} - shareProperties: {{ .shareProperties | default "" }} + shareProperties: {{ .shareProperties | default "''" }} {{- end }} {{- end }} diff --git a/kubernetes-zfs-provisioner/test/storageclass_test.go b/kubernetes-zfs-provisioner/test/storageclass_test.go index 1b0ff20..71a93b5 100644 --- a/kubernetes-zfs-provisioner/test/storageclass_test.go +++ b/kubernetes-zfs-provisioner/test/storageclass_test.go @@ -27,7 +27,7 @@ func Test_Storageclass_GivenClassesEnabled_WhenNoPolicyDefined_ThenRenderDefault assert.Equal(t, &expectedPolicy, class.ReclaimPolicy) } -func Test_Secret_GivenClassesEnabled_WhenNoTypeDefined_ThenRenderDefault(t *testing.T) { +func Test_StorageClass_GivenClassesEnabled_WhenNoTypeDefined_ThenRenderDefault(t *testing.T) { options := &helm.Options{ SetValues: map[string]string{ "storageClass.create": "true", @@ -43,7 +43,7 @@ func Test_Secret_GivenClassesEnabled_WhenNoTypeDefined_ThenRenderDefault(t *test assert.Equal(t, "nfs", class.Parameters["type"]) } -func Test_Secret_GivenClassesEnabled_WhenAdditionalParametersUndefined_ThenRenderEmptyValues(t *testing.T) { +func Test_StorageClass_GivenClassesEnabled_WhenAdditionalParametersUndefined_ThenRenderEmptyValues(t *testing.T) { options := &helm.Options{ SetValues: map[string]string{ "storageClass.create": "true",