From eb75d61ff9b51abaa36b8b12911b636a9c82837c Mon Sep 17 00:00:00 2001 From: boyamurthy <92081029+boyamurthy@users.noreply.github.com> Date: Tue, 6 Jun 2023 13:33:29 +0530 Subject: [PATCH] updating supported k8 versions (#207) --- 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 7a1bcb9d..e7dfc538 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.23" "1.27" + verify_k8s_versions "1.24" "1.27" verify_openshift_versions "4.11" "4.12" verify_helm_values_version "${DRIVER_VERSION}" verify_namespace "${NS}" diff --git a/helm/csi-powermax/Chart.yaml b/helm/csi-powermax/Chart.yaml index 72e6449d..3ad200b2 100644 --- a/helm/csi-powermax/Chart.yaml +++ b/helm/csi-powermax/Chart.yaml @@ -2,10 +2,10 @@ apiVersion: v1 name: csi-powermax version: 2.7.0 appVersion: "2.7.0" -kubeVersion: ">= 1.23.0 < 1.28.0" -#If you are using a complex K8s version like "v1.23.3-mirantis-1", use this kubeVersion check instead +kubeVersion: ">= 1.24.0 < 1.28.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.23.0-0 < 1.28.0-0" +#kubeVersion: ">= 1.24.0-0 < 1.28.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 51e4c90f..ddd813d9 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) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-attacher:v4.3.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) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.5.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) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2" -}} {{- 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) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-resizer:v1.8.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) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.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) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} {{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}} {{- end -}} {{- end -}}