support 1.24 k8s (#91)

* support 1.24 k8s * address comments
dell · May 19, 2022 · 3bf9292 · 3bf9292
1 parent 6c88f19
commit 3bf9292
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/dell-csi-helm-installer/verify-csi-vxflexos.sh b/dell-csi-helm-installer/verify-csi-vxflexos.sh
@@ -11,8 +11,8 @@
 #
 # verify-csi-vxflexos method
 function verify-csi-vxflexos() {
-  verify_k8s_versions "1.20" "1.22"
-  verify_openshift_versions "4.6" "4.8"
+  verify_k8s_versions "1.21" "1.24"
+  verify_openshift_versions "4.9" "4.10"
   verify_namespace "${NS}"
   verify_helm_values_version "${DRIVER_VERSION}"
   verify_required_secrets "${RELEASE}-config"

diff --git a/helm/csi-vxflexos/Chart.yaml b/helm/csi-vxflexos/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
 appVersion: "2.2.0"
-kubeVersion: ">= 1.21.0 < 1.24.0"
+kubeVersion: ">= 1.21.0 < 1.25.0"
 # If you are using a complex K8s version like "v1.21.3-mirantis-1", use this kubeVersion check instead
 # WARNING: this version of the check will allow the use of alpha and beta versions, which is NOT SUPPORTED
-# kubeVersion: ">= 1.21.0-0 < 1.24.0-0"
+# kubeVersion: ">= 1.21.0-0 < 1.25.0-0"
 description: |
   VxFlex OS CSI (Container Storage Interface) driver Kubernetes
   integration. This chart includes everything required to provision via CSI as

diff --git a/helm/csi-vxflexos/templates/_helpers.tpl b/helm/csi-vxflexos/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 and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}}
+    {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") -}}
       {{- print "k8s.gcr.io/sig-storage/csi-attacher:v3.4.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 and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}}
+    {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") -}}
       {{- print "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.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 and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}}
+    {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") -}}
       {{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.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 and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}}
+    {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") -}}
       {{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.4.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 and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") -}}
+    {{- else if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") -}}
       {{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0" -}}
     {{- else -}}
       {{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0" -}}