From cbc1bd4c45149a2d43d5953ecf3e9fcef13eec40 Mon Sep 17 00:00:00 2001
From: Sakshi-dell <75004921+Sakshi-dell@users.noreply.github.com>
Date: Tue, 14 Dec 2021 16:41:23 +0530
Subject: [PATCH] CSI-Powerscale 2.2 changes

---
 Dockerfile.podman                                             | 2 +-
 dell-csi-helm-installer/verify-csi-isilon.sh                  | 4 ++--
 helm/csi-isilon/Chart.yaml                                    | 4 ++--
 helm/csi-isilon/driver-image.yaml                             | 2 +-
 helm/csi-isilon/k8s-1.21-values.yaml                          | 2 +-
 helm/csi-isilon/k8s-1.22-values.yaml                          | 2 +-
 .../csi-isilon/{k8s-1.20-values.yaml => k8s-1.23-values.yaml} | 4 ++--
 helm/csi-isilon/templates/csidriver.yaml                      | 4 ----
 helm/csi-isilon/values.yaml                                   | 2 +-
 9 files changed, 11 insertions(+), 15 deletions(-)
 rename helm/csi-isilon/{k8s-1.20-values.yaml => k8s-1.23-values.yaml} (97%)

diff --git a/Dockerfile.podman b/Dockerfile.podman
index 712b82b5..78e78afa 100644
--- a/Dockerfile.podman
+++ b/Dockerfile.podman
@@ -52,7 +52,7 @@ LABEL vendor="Dell Inc." \
       name="csi-isilon" \
       summary="CSI Driver for Dell EMC PowerScale" \
       description="CSI Driver for provisioning persistent storage from Dell EMC PowerScale" \
-      version="2.1.0" \
+      version="2.2.0" \
       license="Apache-2.0"
 
 COPY ./licenses /licenses
diff --git a/dell-csi-helm-installer/verify-csi-isilon.sh b/dell-csi-helm-installer/verify-csi-isilon.sh
index bcd98529..54ca00e2 100644
--- a/dell-csi-helm-installer/verify-csi-isilon.sh
+++ b/dell-csi-helm-installer/verify-csi-isilon.sh
@@ -11,7 +11,7 @@
 #
 # verify-csi-isilon method
 function verify-csi-isilon() {
-  verify_k8s_versions "1.20" "1.22"
+  verify_k8s_versions "1.21" "1.23"
   verify_openshift_versions "4.8" "4.9"
   verify_namespace "${NS}"
   verify_required_secrets "${RELEASE}-creds"
@@ -19,6 +19,6 @@ function verify-csi-isilon() {
   verify_alpha_snap_resources
   verify_snap_requirements
   verify_helm_3
-  verify_helm_values_version "2.1.0"
+  verify_helm_values_version "2.2.0"
   verify_authorization_proxy_server
 }
diff --git a/helm/csi-isilon/Chart.yaml b/helm/csi-isilon/Chart.yaml
index 39a500c4..cc59d98e 100644
--- a/helm/csi-isilon/Chart.yaml
+++ b/helm/csi-isilon/Chart.yaml
@@ -1,6 +1,6 @@
 name: csi-isilon
-version: 2.1.0
-appVersion: 2.1.0
+version: 2.2.0
+appVersion: 2.2.0
 description: |
   PowerScale CSI (Container Storage Interface) driver Kubernetes
   integration. This chart includes everything required to provision via CSI as
diff --git a/helm/csi-isilon/driver-image.yaml b/helm/csi-isilon/driver-image.yaml
index d35423b9..00f07604 100644
--- a/helm/csi-isilon/driver-image.yaml
+++ b/helm/csi-isilon/driver-image.yaml
@@ -1,4 +1,4 @@
 # IT IS RECOMMENDED YOU DO NOT CHANGE THE IMAGES TO BE DOWNLOADED.
 images:
   # "images.driver" defines the container images used for the driver container.
-  driver: dellemc/csi-isilon:v2.1.0
+  driver: dellemc/csi-isilon:v2.2.0
diff --git a/helm/csi-isilon/k8s-1.21-values.yaml b/helm/csi-isilon/k8s-1.21-values.yaml
index fe0ce6ad..6192e35c 100644
--- a/helm/csi-isilon/k8s-1.21-values.yaml
+++ b/helm/csi-isilon/k8s-1.21-values.yaml
@@ -15,7 +15,7 @@ images:
 
   # "images.registrar" defines the container images used for the csi registrar
   # container.
-  registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
+  registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.4.0
   
   # "images.resizer" defines the container images used for the csi resizer
   # container.
diff --git a/helm/csi-isilon/k8s-1.22-values.yaml b/helm/csi-isilon/k8s-1.22-values.yaml
index 5cdf0af4..35398fe1 100644
--- a/helm/csi-isilon/k8s-1.22-values.yaml
+++ b/helm/csi-isilon/k8s-1.22-values.yaml
@@ -15,7 +15,7 @@ images:
 
   # "images.registrar" defines the container images used for the csi registrar
   # container.
-  registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
+  registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.4.0
 
   # "images.resizer" defines the container images used for the csi resizer
   # container.
diff --git a/helm/csi-isilon/k8s-1.20-values.yaml b/helm/csi-isilon/k8s-1.23-values.yaml
similarity index 97%
rename from helm/csi-isilon/k8s-1.20-values.yaml
rename to helm/csi-isilon/k8s-1.23-values.yaml
index 0272b615..d11ce784 100644
--- a/helm/csi-isilon/k8s-1.20-values.yaml
+++ b/helm/csi-isilon/k8s-1.23-values.yaml
@@ -1,4 +1,4 @@
-kubeversion: "v1.20"
+kubeversion: "v1.23"
 
 # IT IS RECOMMENDED YOU DO NOT CHANGE THE IMAGES TO BE DOWNLOADED.
 images:
@@ -15,7 +15,7 @@ images:
 
   # "images.registrar" defines the container images used for the csi registrar
   # container.
-  registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
+  registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.4.0
   
   # "images.resizer" defines the container images used for the csi resizer
   # container.
diff --git a/helm/csi-isilon/templates/csidriver.yaml b/helm/csi-isilon/templates/csidriver.yaml
index 576261c4..cb4da50a 100644
--- a/helm/csi-isilon/templates/csidriver.yaml
+++ b/helm/csi-isilon/templates/csidriver.yaml
@@ -1,8 +1,4 @@
-{{- if or (eq .Capabilities.KubeVersion.Minor "17") (eq .Capabilities.KubeVersion.Minor "17+")}}
-apiVersion: storage.k8s.io/v1beta1
-{{- else }}
 apiVersion: storage.k8s.io/v1
-{{- end }}
 kind: CSIDriver
 metadata:
     name: csi-isilon.dellemc.com
diff --git a/helm/csi-isilon/values.yaml b/helm/csi-isilon/values.yaml
index 25e13284..e952cd70 100644
--- a/helm/csi-isilon/values.yaml
+++ b/helm/csi-isilon/values.yaml
@@ -2,7 +2,7 @@
 ########################
 # version: version of this values file
 # Note: Do not change this value
-version: "2.1.0"
+version: "2.2.0"
 
 # CSI driver log level
 # Allowed values: "error", "warn"/"warning", "info", "debug"