From 342fbe9f297f5f0313fe52db0fa5b7a6c487473e Mon Sep 17 00:00:00 2001
From: boya murthy <boya.murthy@dell.com>
Date: Thu, 12 Jan 2023 13:51:09 +0530
Subject: [PATCH] adding k8 1.26 support

---
 dell-csi-helm-installer/verify-csi-powermax.sh |  2 +-
 helm/csi-powermax/Chart.yaml                   |  6 +++---
 helm/csi-powermax/templates/_helpers.tpl       | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dell-csi-helm-installer/verify-csi-powermax.sh b/dell-csi-helm-installer/verify-csi-powermax.sh
index d800aa2d..806c857f 100644
--- a/dell-csi-helm-installer/verify-csi-powermax.sh
+++ b/dell-csi-helm-installer/verify-csi-powermax.sh
@@ -15,7 +15,7 @@
 
 # verify-csi-powermax method
 function verify-csi-powermax() {
-  verify_k8s_versions "1.21" "1.25"
+  verify_k8s_versions "1.24" "1.26"
   verify_openshift_versions "4.10" "4.11"  
   verify_helm_values_version "${DRIVER_VERSION}"
   verify_namespace "${NS}"
diff --git a/helm/csi-powermax/Chart.yaml b/helm/csi-powermax/Chart.yaml
index 936128b0..44ea01a1 100644
--- a/helm/csi-powermax/Chart.yaml
+++ b/helm/csi-powermax/Chart.yaml
@@ -2,10 +2,10 @@ apiVersion: v1
 name: csi-powermax
 version: 2.5.0
 appVersion: "2.5.0"
-kubeVersion: ">= 1.21.0 < 1.26.0"
-#If you are using a complex K8s version like "v1.21.3-mirantis-1", use this kubeVersion check instead
+kubeVersion: ">= 1.24.0 < 1.27.0"
+#If you are using a complex K8s version like "v1.24.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.26.0-0"
+#kubeVersion: ">= 1.24.0-0 < 1.27.0-0"
 description: |
   PowerMax CSI (Container Storage Interface) driver Kubernetes
   integration. This chart includes everything required to provision via CSI as
diff --git a/helm/csi-powermax/templates/_helpers.tpl b/helm/csi-powermax/templates/_helpers.tpl
index d2548773..426e7330 100644
--- a/helm/csi-powermax/templates/_helpers.tpl
+++ b/helm/csi-powermax/templates/_helpers.tpl
@@ -3,7 +3,7 @@ Return the appropriate sidecar images based on k8s version
 */}}
 {{- define "csi-powermax.attacherImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "25") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "26") -}}
       {{- print "k8s.gcr.io/sig-storage/csi-attacher:v4.0.0" -}}
     {{- end -}}
   {{- end -}}
@@ -11,7 +11,7 @@ Return the appropriate sidecar images based on k8s version
 
 {{- define "csi-powermax.provisionerImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "25") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "26") -}}
       {{- print "k8s.gcr.io/sig-storage/csi-provisioner:v3.3.0" -}}
     {{- end -}}
   {{- end -}}
@@ -19,7 +19,7 @@ Return the appropriate sidecar images based on k8s version
 
 {{- define "csi-powermax.snapshotterImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "25") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "26") -}}
       {{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v6.1.0" -}}
     {{- end -}}
   {{- end -}}
@@ -27,7 +27,7 @@ Return the appropriate sidecar images based on k8s version
 
 {{- define "csi-powermax.resizerImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "25") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "26") -}}
       {{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.6.0" -}}
     {{- end -}}
   {{- end -}}
@@ -35,7 +35,7 @@ Return the appropriate sidecar images based on k8s version
 
 {{- define "csi-powermax.registrarImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "25") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "26") -}}
       {{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.6.0" -}}
     {{- end -}}
   {{- end -}}
@@ -43,7 +43,7 @@ Return the appropriate sidecar images based on k8s version
 
 {{- define "csi-powermax.healthmonitorImage" -}}
   {{- if eq .Capabilities.KubeVersion.Major "1" }}
-    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "25") -}}
+    {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "26") -}}
       {{- print "gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.7.0" -}}
     {{- end -}}
   {{- end -}}