From 2231eb17b8d987805107b1c9f4c90c13587ebe5a Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 31 Jul 2020 01:00:23 +0200 Subject: [PATCH 1/2] [kubernetes-zfs-provisioner] Fix wrong Node parameter --- kubernetes-zfs-provisioner/Chart.yaml | 2 +- kubernetes-zfs-provisioner/README.md | 2 +- .../templates/storageclass.yaml | 2 +- .../test/storageclass_test.go | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/kubernetes-zfs-provisioner/Chart.yaml b/kubernetes-zfs-provisioner/Chart.yaml index cc11038..2092617 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.6 +version: 0.2.7 # 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 47fa1cb..af7c24d 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.6` +Current chart version is `0.2.7` diff --git a/kubernetes-zfs-provisioner/templates/storageclass.yaml b/kubernetes-zfs-provisioner/templates/storageclass.yaml index 492d608..f069c07 100644 --- a/kubernetes-zfs-provisioner/templates/storageclass.yaml +++ b/kubernetes-zfs-provisioner/templates/storageclass.yaml @@ -13,7 +13,7 @@ parameters: parentDataset: {{ .parentDataset }} hostname: {{ .hostName }} type: {{ .type | default "nfs" }} - node: {{ .nodeName | default "''" }} + node: {{ .node | 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 71a93b5..5d9727a 100644 --- a/kubernetes-zfs-provisioner/test/storageclass_test.go +++ b/kubernetes-zfs-provisioner/test/storageclass_test.go @@ -43,6 +43,24 @@ func Test_StorageClass_GivenClassesEnabled_WhenNoTypeDefined_ThenRenderDefault(t assert.Equal(t, "nfs", class.Parameters["type"]) } +func Test_StorageClass_GivenClassesEnabled_WhenNodeDefined_ThenRenderNodeName(t *testing.T) { + options := &helm.Options{ + SetValues: map[string]string{ + "storageClass.create": "true", + "storageClass.classes[0].node": "host", + "storageClass.classes[0].type": "hostpath", + }, + } + + output := helm.RenderTemplate(t, options, helmChartPath, releaseName, tplStorageclass) + + var class v1.StorageClass + helm.UnmarshalK8SYaml(t, output, &class) + + assert.Equal(t, "host", class.Parameters["node"]) + assert.Equal(t, "hostpath", class.Parameters["type"]) +} + func Test_StorageClass_GivenClassesEnabled_WhenAdditionalParametersUndefined_ThenRenderEmptyValues(t *testing.T) { options := &helm.Options{ SetValues: map[string]string{ From 43dee822764a862507ed5e5816958e985f32b206 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 31 Jul 2020 01:01:03 +0200 Subject: [PATCH 2/2] Remove Git commit from Workflow It creates possibly a double-bump if the user already bumped the Chart version --- .github/workflows/release.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c9f1238..46bfbe7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,20 +19,6 @@ jobs: git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - - name: Update chart versions - if: "!contains(github.event.head_commit.message, 'skip bump')" - run: make bump-docs - - - name: Commit changes - if: "!contains(github.event.head_commit.message, 'skip bump')" - uses: EndBug/add-and-commit@v4 - with: - author_name: "${{ github.actor }}" - author_email: "${{ github.actor }}@users.noreply.github.com" - message: "Update chart versions" - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - - name: Run chart-releaser uses: helm/chart-releaser-action@master env: