From cecf6f2b45aff0168b31380cf6df8bfaa96a3ba7 Mon Sep 17 00:00:00 2001 From: kk3 Date: Mon, 17 Jan 2022 23:55:35 +0530 Subject: [PATCH 1/3] k8s version change --- Dockerfile.podman | 2 +- go.mod | 2 +- helm/csi-unity/Chart.yaml | 6 +++--- helm/csi-unity/templates/_helpers.tpl | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile.podman b/Dockerfile.podman index db545e66..f69e42bf 100644 --- a/Dockerfile.podman +++ b/Dockerfile.podman @@ -1,5 +1,5 @@ # Stage to build the driver -FROM golang:1.16 as builder +FROM golang:1.17 as builder RUN mkdir -p /go/src COPY csi-unity/ /go/src/csi-unity diff --git a/go.mod b/go.mod index cd786942..4cd75a2f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/dell/csi-unity -go 1.16 +go 1.17 require ( github.com/container-storage-interface/spec v1.5.0 diff --git a/helm/csi-unity/Chart.yaml b/helm/csi-unity/Chart.yaml index e3147cd0..fb1c91e8 100644 --- a/helm/csi-unity/Chart.yaml +++ b/helm/csi-unity/Chart.yaml @@ -1,7 +1,7 @@ name: csi-unity -version: 2.1.0 -appVersion: 2.1.0 -kubeVersion: ">= 1.20.0 <= 1.23.0" +version: 2.2.0 +appVersion: 2.2.0 +kubeVersion: ">= 1.20 <= 1.23" description: | Unity CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as diff --git a/helm/csi-unity/templates/_helpers.tpl b/helm/csi-unity/templates/_helpers.tpl index ee92e9ae..31f72b83 100644 --- a/helm/csi-unity/templates/_helpers.tpl +++ b/helm/csi-unity/templates/_helpers.tpl @@ -7,7 +7,7 @@ Return the appropriate sidecar images based on k8s version {{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.1.0" -}} {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} {{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.2.1" -}} - {{- else if ge (trimSuffix "+" .Capabilities.KubeVersion.Minor ) "22" -}} + {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.3.0" -}} {{- else -}} {{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.1.0" -}} @@ -21,7 +21,7 @@ Return the appropriate sidecar images based on k8s version {{- print "k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0" -}} {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} {{- print "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.1" -}} - {{- else if ge (trimSuffix "+" .Capabilities.KubeVersion.Minor ) "22" -}} + {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0" -}} {{- else -}} {{- print "k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0" -}} @@ -35,7 +35,7 @@ Return the appropriate sidecar images based on k8s version {{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3" -}} {{- else if or (eq (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (eq (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} {{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.0" -}} - {{- else if ge (trimSuffix "+" .Capabilities.KubeVersion.Minor ) "22" -}} + {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1" -}} {{- else -}} {{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3" -}} @@ -49,7 +49,7 @@ Return the appropriate sidecar images based on k8s version {{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.1.0" -}} {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "19") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} {{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.2.0" -}} - {{- else if ge (trimSuffix "+" .Capabilities.KubeVersion.Minor ) "22" -}} + {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.3.0" -}} {{- else -}} {{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.1.0" -}} @@ -63,7 +63,7 @@ Return the appropriate sidecar images based on k8s version {{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0" -}} {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} {{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0" -}} - {{- else if ge (trimSuffix "+" .Capabilities.KubeVersion.Minor ) "22" -}} + {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0" -}} {{- else -}} {{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0" -}} @@ -77,7 +77,7 @@ Return the appropriate sidecar images based on k8s version {{- print "gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.4.0" -}} {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} {{- print "gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.4.0" -}} - {{- else if ge (trimSuffix "+" .Capabilities.KubeVersion.Minor ) "22" -}} + {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.4.0" -}} {{- else -}} {{- print "gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.4.0" -}} From d7111ce7d528a7c75e93874c19abe46dee169da0 Mon Sep 17 00:00:00 2001 From: kk3 Date: Tue, 18 Jan 2022 11:50:54 +0530 Subject: [PATCH 2/3] added changes on k8s minumum version --- helm/csi-unity/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/csi-unity/Chart.yaml b/helm/csi-unity/Chart.yaml index fb1c91e8..2888a291 100644 --- a/helm/csi-unity/Chart.yaml +++ b/helm/csi-unity/Chart.yaml @@ -1,7 +1,7 @@ name: csi-unity version: 2.2.0 appVersion: 2.2.0 -kubeVersion: ">= 1.20 <= 1.23" +kubeVersion: ">= 1.21 <= 1.23" description: | Unity CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as From 1a00b89b89338f639ab2e113ed4fd9d9a4df8cc1 Mon Sep 17 00:00:00 2001 From: kk3 Date: Tue, 18 Jan 2022 16:19:20 +0530 Subject: [PATCH 3/3] removed k8s 1.19 version support --- helm/csi-unity/templates/_helpers.tpl | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/helm/csi-unity/templates/_helpers.tpl b/helm/csi-unity/templates/_helpers.tpl index 31f72b83..afb2e56d 100644 --- a/helm/csi-unity/templates/_helpers.tpl +++ b/helm/csi-unity/templates/_helpers.tpl @@ -3,9 +3,7 @@ Return the appropriate sidecar images based on k8s version */}} {{- define "csi-unity.attacherImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "19" }} - {{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.1.0" -}} - {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} + {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "21" }} {{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.2.1" -}} {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.3.0" -}} @@ -17,9 +15,7 @@ Return the appropriate sidecar images based on k8s version {{- define "csi-unity.provisionerImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "19" }} - {{- print "k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0" -}} - {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} + {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "21" }} {{- print "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.1" -}} {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0" -}} @@ -31,9 +27,7 @@ Return the appropriate sidecar images based on k8s version {{- define "csi-unity.snapshotterImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "19" }} - {{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3" -}} - {{- else if or (eq (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (eq (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} + {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "21" }} {{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.0" -}} {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1" -}} @@ -45,9 +39,7 @@ Return the appropriate sidecar images based on k8s version {{- define "csi-unity.resizerImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "19" }} - {{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.1.0" -}} - {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "19") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} + {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "21" }} {{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.2.0" -}} {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.3.0" -}} @@ -59,9 +51,7 @@ Return the appropriate sidecar images based on k8s version {{- define "csi-unity.registrarImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "19" }} - {{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0" -}} - {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} + {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "21" }} {{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0" -}} {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0" -}} @@ -73,9 +63,7 @@ Return the appropriate sidecar images based on k8s version {{- define "csi-unity.healthmonitorImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "19" }} - {{- print "gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.4.0" -}} - {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "20") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") -}} + {{- if eq ( trimSuffix "+" .Capabilities.KubeVersion.Minor ) "21" }} {{- print "gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.4.0" -}} {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}} {{- print "gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.4.0" -}}