Add K8s 1.31 support for CPI and CSI (rancher#88)

* Add K8s 1.31 support for CPI and CSI * Update to latest mirrored images for K8s 1.31 * Match rancher app/chart version to csi-driver 3.3.1 Signed-off-by: Derek Nola <derek.nola@suse.com>
dmpe · Aug 28, 2024 · bdbf378 · bdbf378
1 parent bd4e797
commit bdbf378
Show file tree

Hide file tree

Showing 6 changed files with 165 additions and 69 deletions.
diff --git a/charts/rancher-vsphere-cpi/Chart.yaml b/charts/rancher-vsphere-cpi/Chart.yaml
@@ -1,14 +1,14 @@
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: vSphere CPI
-  catalog.cattle.io/kube-version: '>= 1.27.0-0 < 1.31.0-0'
+  catalog.cattle.io/kube-version: '>= 1.27.0-0 < 1.32.0-0'
   catalog.cattle.io/namespace: kube-system
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux,windows
   catalog.cattle.io/rancher-version: '>= 2.9.0-0'
   catalog.cattle.io/release-name: vsphere-cpi
 apiVersion: v1
-appVersion: 1.30.1
+appVersion: 1.31.0
 description: vSphere Cloud Provider Interface (CPI)
 icon: https://charts.rancher.io/assets/logos/vsphere-cpi.svg
 keywords:
@@ -21,4 +21,4 @@ maintainers:
 name: rancher-vsphere-cpi
 sources:
 - https://github.com/kubernetes/cloud-provider-vsphere
-version: 1.8.1
+version: 1.9.0
diff --git a/charts/rancher-vsphere-cpi/values.yaml b/charts/rancher-vsphere-cpi/values.yaml
@@ -32,6 +32,11 @@ vCenter:
 # Supported versions can be found at:
 # https://github.com/kubernetes/cloud-provider-vsphere#compatibility-with-kubernetes
 versionOverrides:
+  - constraint: "~ 1.31"
+    values:
+      cloudControllerManager:
+        repository: rancher/mirrored-cloud-provider-vsphere
+        tag: v1.31.0
   - constraint: "~ 1.30"
     values:
       cloudControllerManager:

diff --git a/charts/rancher-vsphere-csi/Chart.yaml b/charts/rancher-vsphere-csi/Chart.yaml
@@ -1,14 +1,14 @@
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: vSphere CSI
-  catalog.cattle.io/kube-version: '>= 1.27.0-0 < 1.31.0-0'
+  catalog.cattle.io/kube-version: '>= 1.27.0-0 < 1.32.0-0'
   catalog.cattle.io/namespace: kube-system
   catalog.cattle.io/os: linux,windows
   catalog.cattle.io/permits-os: linux,windows
   catalog.cattle.io/rancher-version: '>= 2.9.0-0'
   catalog.cattle.io/release-name: vsphere-csi
 apiVersion: v1
-appVersion: 3.3.0-rancher2
+appVersion: 3.3.1-rancher1
 description: vSphere Cloud Storage Interface (CSI)
 icon: https://charts.rancher.io/assets/logos/vsphere-csi.svg
 keywords:
@@ -21,4 +21,4 @@ maintainers:
 name: rancher-vsphere-csi
 sources:
 - https://github.com/kubernetes-sigs/vsphere-csi-driver
-version: 3.3.0-rancher2
+version: 3.3.1-rancher1
diff --git a/charts/rancher-vsphere-csi/values.yaml b/charts/rancher-vsphere-csi/values.yaml
@@ -149,25 +149,25 @@ global:
 # Supported versions can be found at:
 # https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-D4AAD99E-9128-40CE-B89C-AD451DA8379D.html#kubernetes-versions-compatible-with-vsphere-container-storage-plugin-1
 versionOverrides:
-  # Versions from https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/v3.3.0/manifests/vanilla/vsphere-csi-driver.yaml
-  - constraint: ">= 1.28 < 1.31"
+  # Versions from https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/v3.3.1/manifests/vanilla/vsphere-csi-driver.yaml
+  - constraint: ">= 1.28 < 1.32"
     values:
       csiController:
         image:
           repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
-          tag: v3.3.0
+          tag: v3.3.1
           csiAttacher:
             repository: rancher/mirrored-sig-storage-csi-attacher
-            tag: v4.5.1
+            tag: v4.7.0
           csiResizer:
             repository: rancher/mirrored-sig-storage-csi-resizer
             tag: v1.10.1
           livenessProbe:
             repository: rancher/mirrored-sig-storage-livenessprobe
-            tag: v2.12.0
+            tag: v2.14.0
           vsphereSyncer:
             repository: rancher/mirrored-cloud-provider-vsphere-csi-release-syncer
-            tag: v3.3.0
+            tag: v3.3.1
           csiProvisioner:
             repository: rancher/mirrored-sig-storage-csi-provisioner
             tag: v4.0.1
@@ -177,13 +177,13 @@ versionOverrides:
       csiNode:
         image:
           repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver
-          tag: v3.3.0
+          tag: v3.3.1
           nodeDriverRegistrar:
             repository: rancher/mirrored-sig-storage-csi-node-driver-registrar
-            tag: v2.10.1
+            tag: v2.12.0
           livenessProbe:
             repository: rancher/mirrored-sig-storage-livenessprobe
-            tag: v2.12.0
+            tag: v2.14.0
   # Versions from https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/v3.2.0/manifests/vanilla/vsphere-csi-driver.yaml
   - constraint: ">= 1.27 < 1.28"
     values:

diff --git a/tests/unit/cpi_template_test.go b/tests/unit/cpi_template_test.go
@@ -28,6 +28,17 @@ func TestCPITemplateRenderedDaemonset(t *testing.T) {
 		name string
 		args args
 	}{
+		{
+			name: "Kubernetes 1.31",
+			args: args{
+				values:        map[string]string{},
+				kubeVersion:   "1.31",
+				namespace:     "cpitest-" + strings.ToLower(random.UniqueId()),
+				releaseName:   "cpitest-" + strings.ToLower(random.UniqueId()),
+				chartRelPath:  cpiChart,
+				expectedImage: "rancher/mirrored-cloud-provider-vsphere:v1.31.0",
+			},
+		},
 		{
 			name: "Kubernetes 1.30",
 			args: args{