From 6361badb1ba49adc7b80c4d23cc6a97d549d7881 Mon Sep 17 00:00:00 2001 From: panigs7 Date: Fri, 18 Aug 2023 02:12:30 -0400 Subject: [PATCH 1/2] support k8s v1.28 --- charts/csi-unity/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/csi-unity/Chart.yaml b/charts/csi-unity/Chart.yaml index 4258903f..e0071cc2 100644 --- a/charts/csi-unity/Chart.yaml +++ b/charts/csi-unity/Chart.yaml @@ -7,10 +7,10 @@ description: | integration. This chart includes everything required to provision via CSI as well as a Unity XT StorageClass. type: application -kubeVersion: ">= 1.24.0 < 1.28.0" +kubeVersion: ">= 1.24.0 < 1.29.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.24.0-0 < 1.28.0-0" +# kubeVersion: ">= 1.24.0-0 < 1.29.0-0" keywords: - csi - storage From d975355956acec69d9ba9f5dc70c952a80e00d70 Mon Sep 17 00:00:00 2001 From: panigs7 Date: Fri, 18 Aug 2023 02:25:01 -0400 Subject: [PATCH 2/2] support k8s v1.28 --- charts/csi-unity/templates/_helpers.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/csi-unity/templates/_helpers.tpl b/charts/csi-unity/templates/_helpers.tpl index d64acb2c..c20b246f 100644 --- a/charts/csi-unity/templates/_helpers.tpl +++ b/charts/csi-unity/templates/_helpers.tpl @@ -3,7 +3,7 @@ Return the appropriate sidecar images based on k8s version */}} {{- define "csi-unity.attacherImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} {{- 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-unity.provisionerImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} {{- 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-unity.snapshotterImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} {{- 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-unity.resizerImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} {{- 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-unity.registrarImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} {{- 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-unity.healthmonitorImage" -}} {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}} + {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} {{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}} {{- end -}} {{- end -}}