From 43272c49c2f38094c98a6e0981c94000fb603af3 Mon Sep 17 00:00:00 2001 From: Rishabh Raj <120644626+rishabh-dell@users.noreply.github.com> Date: Wed, 31 May 2023 16:11:09 +0530 Subject: [PATCH] changes for powerstore 2.7 (#213) --- charts/container-storage-modules/Chart.yaml | 2 +- charts/container-storage-modules/values.yaml | 4 ++-- charts/csi-powerstore/Chart.yaml | 8 ++++---- charts/csi-powerstore/templates/_helpers.tpl | 12 ++++++------ charts/csi-powerstore/values.yaml | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/container-storage-modules/Chart.yaml b/charts/container-storage-modules/Chart.yaml index 70cd3425..ea567769 100644 --- a/charts/container-storage-modules/Chart.yaml +++ b/charts/container-storage-modules/Chart.yaml @@ -40,7 +40,7 @@ appVersion: "1.0.0" dependencies: - name: csi-powerstore - version: 2.6.0 + version: 2.7.0 repository: file://../csi-powerstore condition: csi-powerstore.enabled diff --git a/charts/container-storage-modules/values.yaml b/charts/container-storage-modules/values.yaml index 748010fe..6f7bb388 100644 --- a/charts/container-storage-modules/values.yaml +++ b/charts/container-storage-modules/values.yaml @@ -20,7 +20,7 @@ ######################## csi-powerstore: enabled: false - version: "v2.6.0" + version: "v2.7.0" images: driverRepository: dellemc ## Controller ATTRIBUTES @@ -75,7 +75,7 @@ csi-powerstore: # Enable this feature only after contact support for additional information podmon: enabled: false - image: dellemc/podmon:v1.5.0 + image: dellemc/podmon:v1.6.0 controller: args: - "--csisock=unix:/var/run/csi/csi.sock" diff --git a/charts/csi-powerstore/Chart.yaml b/charts/csi-powerstore/Chart.yaml index f2764a33..f64ae17c 100644 --- a/charts/csi-powerstore/Chart.yaml +++ b/charts/csi-powerstore/Chart.yaml @@ -14,18 +14,18 @@ # # apiVersion: v2 -appVersion: "2.6.0" +appVersion: "2.7.0" name: csi-powerstore -version: 2.6.0 +version: 2.7.0 description: | PowerStore CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as well as a PowerStore StorageClass. type: application -kubeVersion: ">= 1.23.0 < 1.28.0" +kubeVersion: ">= 1.22.0 < 1.28.0" # If you are using a complex K8s version like "v1.23.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.23.0-0 < 1.28.0-0" +# kubeVersion: ">= 1.22.0-0 < 1.28.0-0" keywords: - csi - storage diff --git a/charts/csi-powerstore/templates/_helpers.tpl b/charts/csi-powerstore/templates/_helpers.tpl index 82906b48..d0028f50 100644 --- a/charts/csi-powerstore/templates/_helpers.tpl +++ b/charts/csi-powerstore/templates/_helpers.tpl @@ -3,7 +3,7 @@ Return the appropriate sidecar images based on k8s version */}} {{- define "csi-powerstore.attacherImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-attacher:v4.2.0" -}} {{- end -}} {{- end -}} @@ -11,7 +11,7 @@ Return the appropriate sidecar images based on k8s version {{- define "csi-powerstore.provisionerImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.4.0" -}} {{- end -}} {{- end -}} @@ -19,7 +19,7 @@ Return the appropriate sidecar images based on k8s version {{- define "csi-powerstore.snapshotterImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.1" -}} {{- end -}} {{- end -}} @@ -27,7 +27,7 @@ Return the appropriate sidecar images based on k8s version {{- define "csi-powerstore.resizerImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-resizer:v1.7.0" -}} {{- end -}} {{- end -}} @@ -35,7 +35,7 @@ Return the appropriate sidecar images based on k8s version {{- define "csi-powerstore.registrarImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.3" -}} {{- end -}} {{- end -}} @@ -43,7 +43,7 @@ Return the appropriate sidecar images based on k8s version {{- define "csi-powerstore.healthmonitorImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "22") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.8.0" -}} {{- end -}} {{- end -}} diff --git a/charts/csi-powerstore/values.yaml b/charts/csi-powerstore/values.yaml index 49bb5204..3011264a 100644 --- a/charts/csi-powerstore/values.yaml +++ b/charts/csi-powerstore/values.yaml @@ -23,7 +23,7 @@ driverName: "csi-powerstore.dellemc.com" # Driver version required to pull the latest driver image -version: "v2.6.0" +version: "v2.7.0" # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. @@ -311,7 +311,7 @@ storageCapacity: # Enable this feature only after contact support for additional information podmon: enabled: false - image: dellemc/podmon:v1.5.0 + image: dellemc/podmon:v1.6.0 controller: args: - "--csisock=unix:/var/run/csi/csi.sock"