From 4cc554ad43845463141c0c622409957aeba305cf Mon Sep 17 00:00:00 2001 From: Francis Nijay Date: Thu, 16 Dec 2021 12:07:11 +0530 Subject: [PATCH] CSI Powerstore v2.2.0 version update (#40) * CSI Powerstore v2.2.0 version update * Addressed review comments and have removed k8s 1.20 , added k8s 1.23 support --- dell-csi-helm-installer/verify-csi-powerstore.sh | 2 +- docker-files/Dockerfile.centos | 2 +- docker-files/Dockerfile.ubi | 2 +- docker-files/Dockerfile.ubi.alt | 2 +- docker-files/Dockerfile.ubi.min | 2 +- helm/csi-powerstore/Chart.yaml | 4 ++-- helm/csi-powerstore/driver-image.yaml | 2 +- .../{k8s-1.20-values.yaml => k8s-1.23-values.yaml} | 2 +- helm/csi-powerstore/templates/csidriver.yaml | 3 ++- 9 files changed, 11 insertions(+), 10 deletions(-) rename helm/csi-powerstore/{k8s-1.20-values.yaml => k8s-1.23-values.yaml} (98%) diff --git a/dell-csi-helm-installer/verify-csi-powerstore.sh b/dell-csi-helm-installer/verify-csi-powerstore.sh index 16ea456b..b9cb6a73 100755 --- a/dell-csi-helm-installer/verify-csi-powerstore.sh +++ b/dell-csi-helm-installer/verify-csi-powerstore.sh @@ -10,7 +10,7 @@ # verify-csi-powerstore method function verify-csi-powerstore() { - 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}-config" diff --git a/docker-files/Dockerfile.centos b/docker-files/Dockerfile.centos index 6a4f1582..e7bf05ae 100644 --- a/docker-files/Dockerfile.centos +++ b/docker-files/Dockerfile.centos @@ -8,7 +8,7 @@ LABEL vendor="Dell Inc." \ name="csi-powerstore" \ summary="CSI Driver for Dell EMC PowerStore" \ description="CSI Driver for provisioning persistent storage from Dell EMC PowerStore" \ - version="2.1.0" \ + version="2.2.0" \ license="Apache-2.0" COPY licenses /licenses diff --git a/docker-files/Dockerfile.ubi b/docker-files/Dockerfile.ubi index 375c1802..bc6bb48a 100644 --- a/docker-files/Dockerfile.ubi +++ b/docker-files/Dockerfile.ubi @@ -7,7 +7,7 @@ LABEL vendor="Dell Inc." \ name="csi-powerstore" \ summary="CSI Driver for Dell EMC PowerStore" \ description="CSI Driver for provisioning persistent storage from Dell EMC PowerStore" \ - version="2.1.0" \ + version="2.2.0" \ license="Apache-2.0" COPY licenses /licenses diff --git a/docker-files/Dockerfile.ubi.alt b/docker-files/Dockerfile.ubi.alt index 426bad2f..79487196 100644 --- a/docker-files/Dockerfile.ubi.alt +++ b/docker-files/Dockerfile.ubi.alt @@ -7,7 +7,7 @@ LABEL vendor="Dell Inc." \ name="csi-powerstore" \ summary="CSI Driver for Dell EMC PowerStore" \ description="CSI Driver for provisioning persistent storage from Dell EMC PowerStore" \ - version="2.1.0" \ + version="2.2.0" \ license="Apache-2.0" COPY licenses /licenses diff --git a/docker-files/Dockerfile.ubi.min b/docker-files/Dockerfile.ubi.min index b596d4c2..1ca53fd6 100644 --- a/docker-files/Dockerfile.ubi.min +++ b/docker-files/Dockerfile.ubi.min @@ -7,7 +7,7 @@ LABEL vendor="Dell Inc." \ name="csi-powerstore" \ summary="CSI Driver for Dell EMC PowerStore" \ description="CSI Driver for provisioning persistent storage from Dell EMC PowerStore" \ - version="2.1.0" \ + version="2.2.0" \ license="Apache-2.0" COPY licenses /licenses diff --git a/helm/csi-powerstore/Chart.yaml b/helm/csi-powerstore/Chart.yaml index 06a3086c..2066097a 100644 --- a/helm/csi-powerstore/Chart.yaml +++ b/helm/csi-powerstore/Chart.yaml @@ -1,7 +1,7 @@ name: csi-powerstore apiVersion: v2 -version: 2.1.0 -appVersion: 2.1.0 +version: 2.2.0 +appVersion: 2.2.0 description: | PowerStore CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as diff --git a/helm/csi-powerstore/driver-image.yaml b/helm/csi-powerstore/driver-image.yaml index 2389bddb..7c9119af 100644 --- a/helm/csi-powerstore/driver-image.yaml +++ b/helm/csi-powerstore/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-powerstore:v2.1.0 + driver: dellemc/csi-powerstore:v2.2.0 diff --git a/helm/csi-powerstore/k8s-1.20-values.yaml b/helm/csi-powerstore/k8s-1.23-values.yaml similarity index 98% rename from helm/csi-powerstore/k8s-1.20-values.yaml rename to helm/csi-powerstore/k8s-1.23-values.yaml index fa861530..8429f244 100644 --- a/helm/csi-powerstore/k8s-1.20-values.yaml +++ b/helm/csi-powerstore/k8s-1.23-values.yaml @@ -1,5 +1,5 @@ # IT IS RECOMMENDED YOU DO NOT CHANGE THE IMAGES TO BE DOWNLOADED. -kubeversion: "v1.20" +kubeversion: "v1.23" images: # "images.attacher" defines the container images used for the csi attacher diff --git a/helm/csi-powerstore/templates/csidriver.yaml b/helm/csi-powerstore/templates/csidriver.yaml index 117bb645..37890987 100644 --- a/helm/csi-powerstore/templates/csidriver.yaml +++ b/helm/csi-powerstore/templates/csidriver.yaml @@ -1,3 +1,4 @@ +# apiVersion v1beta1 is deprecated and will be removed in future release. {{- if or (eq .Capabilities.KubeVersion.Minor "17") (eq .Capabilities.KubeVersion.Minor "17+")}} apiVersion: storage.k8s.io/v1beta1 {{- else }} @@ -8,6 +9,6 @@ metadata: name: {{ .Values.driverName }} spec: podInfoOnMount: true - volumeLifecycleModes: # added in Kubernetes 1.16, this field is beta + volumeLifecycleModes: - Persistent - Ephemeral