Update to latest mirrored images for K8s 1.31

Signed-off-by: Derek Nola <[email protected]>
rancher · Aug 28, 2024 · d7b300e · d7b300e
1 parent f510cb9
commit d7b300e
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 76 deletions.
diff --git a/charts/rancher-vsphere-cpi/values.yaml b/charts/rancher-vsphere-cpi/values.yaml
@@ -35,7 +35,7 @@ versionOverrides:
   - constraint: "~ 1.31"
     values:
       cloudControllerManager:
-        repository: rancher/mirrored-cloud-provider-vsphere-cpi-release-manager
+        repository: rancher/mirrored-cloud-provider-vsphere
         tag: v1.31.0
   - constraint: "~ 1.30"
     values:

diff --git a/charts/rancher-vsphere-csi/Chart.yaml b/charts/rancher-vsphere-csi/Chart.yaml
@@ -8,7 +8,7 @@ annotations:
   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.0-rancher3
 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.0-rancher3
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
+  # 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
@@ -36,7 +36,7 @@ func TestCPITemplateRenderedDaemonset(t *testing.T) {
 				namespace:     "cpitest-" + strings.ToLower(random.UniqueId()),
 				releaseName:   "cpitest-" + strings.ToLower(random.UniqueId()),
 				chartRelPath:  cpiChart,
-				expectedImage: "rancher/mirrored-cloud-provider-vsphere-cpi-release-manager:v1.31.0",
+				expectedImage: "rancher/mirrored-cloud-provider-vsphere:v1.31.0",
 			},
 		},
 		{

diff --git a/tests/unit/csi_template_test.go b/tests/unit/csi_template_test.go
@@ -38,9 +38,9 @@ func TestCSITemplateRenderedNodeDaemonset(t *testing.T) {
 				chartRelPath:   csiChart,
 				windowsEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.10.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
+					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.12.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
 				},
 			},
 		},
@@ -56,9 +56,9 @@ func TestCSITemplateRenderedNodeDaemonset(t *testing.T) {
 				releaseName:  "csitest-" + strings.ToLower(random.UniqueId()),
 				chartRelPath: csiChart,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.10.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
+					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.12.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
 				},
 			},
 		},
@@ -72,9 +72,9 @@ func TestCSITemplateRenderedNodeDaemonset(t *testing.T) {
 				chartRelPath:   csiChart,
 				windowsEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.10.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
+					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.12.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
 				},
 			},
 		},
@@ -90,9 +90,9 @@ func TestCSITemplateRenderedNodeDaemonset(t *testing.T) {
 				releaseName:  "csitest-" + strings.ToLower(random.UniqueId()),
 				chartRelPath: csiChart,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.10.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
+					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.12.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
 				},
 			},
 		},
@@ -106,9 +106,9 @@ func TestCSITemplateRenderedNodeDaemonset(t *testing.T) {
 				chartRelPath:   csiChart,
 				windowsEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.10.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
+					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.12.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
 				},
 			},
 		},
@@ -124,9 +124,9 @@ func TestCSITemplateRenderedNodeDaemonset(t *testing.T) {
 				releaseName:  "csitest-" + strings.ToLower(random.UniqueId()),
 				chartRelPath: csiChart,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.10.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
+					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.12.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
 				},
 			},
 		},
@@ -140,9 +140,9 @@ func TestCSITemplateRenderedNodeDaemonset(t *testing.T) {
 				chartRelPath:   csiChart,
 				windowsEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.10.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
+					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.12.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
 				},
 			},
 		},
@@ -158,9 +158,9 @@ func TestCSITemplateRenderedNodeDaemonset(t *testing.T) {
 				releaseName:  "csitest-" + strings.ToLower(random.UniqueId()),
 				chartRelPath: csiChart,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.10.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
+					"rancher/mirrored-sig-storage-csi-node-driver-registrar:v2.12.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
 				},
 			},
 		},
@@ -267,10 +267,10 @@ func TestCSITemplateRenderedControllerDeployment(t *testing.T) {
 				chartRelPath:      csiChart,
 				csiResizerEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-attacher:v4.5.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.0",
+					"rancher/mirrored-sig-storage-csi-attacher:v4.7.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1",
 					"rancher/mirrored-sig-storage-csi-provisioner:v4.0.1",
 				},
 			},
@@ -288,11 +288,11 @@ func TestCSITemplateRenderedControllerDeployment(t *testing.T) {
 				chartRelPath:      csiChart,
 				csiResizerEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-attacher:v4.5.1",
+					"rancher/mirrored-sig-storage-csi-attacher:v4.7.0",
 					"rancher/mirrored-sig-storage-csi-snapshotter:v7.0.2",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1",
 					"rancher/mirrored-sig-storage-csi-provisioner:v4.0.1",
 				},
 			},
@@ -310,11 +310,11 @@ func TestCSITemplateRenderedControllerDeployment(t *testing.T) {
 				chartRelPath:      csiChart,
 				csiResizerEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-attacher:v4.5.1",
+					"rancher/mirrored-sig-storage-csi-attacher:v4.7.0",
 					"rancher/mirrored-sig-storage-csi-resizer:v1.10.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1",
 					"rancher/mirrored-sig-storage-csi-provisioner:v4.0.1",
 				},
 			},
@@ -329,10 +329,10 @@ func TestCSITemplateRenderedControllerDeployment(t *testing.T) {
 				chartRelPath:      csiChart,
 				csiResizerEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-attacher:v4.5.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.0",
+					"rancher/mirrored-sig-storage-csi-attacher:v4.7.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1",
 					"rancher/mirrored-sig-storage-csi-provisioner:v4.0.1",
 				},
 			},
@@ -351,11 +351,11 @@ func TestCSITemplateRenderedControllerDeployment(t *testing.T) {
 				chartRelPath:      csiChart,
 				csiResizerEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-attacher:v4.5.1",
+					"rancher/mirrored-sig-storage-csi-attacher:v4.7.0",
 					"rancher/mirrored-sig-storage-csi-snapshotter:v7.0.2",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1",
 					"rancher/mirrored-sig-storage-csi-provisioner:v4.0.1",
 				},
 			},
@@ -373,11 +373,11 @@ func TestCSITemplateRenderedControllerDeployment(t *testing.T) {
 				chartRelPath:      csiChart,
 				csiResizerEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-attacher:v4.5.1",
+					"rancher/mirrored-sig-storage-csi-attacher:v4.7.0",
 					"rancher/mirrored-sig-storage-csi-resizer:v1.10.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1",
 					"rancher/mirrored-sig-storage-csi-provisioner:v4.0.1",
 				},
 			},
@@ -392,10 +392,10 @@ func TestCSITemplateRenderedControllerDeployment(t *testing.T) {
 				chartRelPath:      csiChart,
 				csiResizerEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-attacher:v4.5.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.0",
+					"rancher/mirrored-sig-storage-csi-attacher:v4.7.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1",
 					"rancher/mirrored-sig-storage-csi-provisioner:v4.0.1",
 				},
 			},
@@ -413,11 +413,11 @@ func TestCSITemplateRenderedControllerDeployment(t *testing.T) {
 				chartRelPath:      csiChart,
 				csiResizerEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-attacher:v4.5.1",
+					"rancher/mirrored-sig-storage-csi-attacher:v4.7.0",
 					"rancher/mirrored-sig-storage-csi-snapshotter:v7.0.2",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1",
 					"rancher/mirrored-sig-storage-csi-provisioner:v4.0.1",
 				},
 			},
@@ -435,11 +435,11 @@ func TestCSITemplateRenderedControllerDeployment(t *testing.T) {
 				chartRelPath:      csiChart,
 				csiResizerEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-attacher:v4.5.1",
+					"rancher/mirrored-sig-storage-csi-attacher:v4.7.0",
 					"rancher/mirrored-sig-storage-csi-resizer:v1.10.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1",
 					"rancher/mirrored-sig-storage-csi-provisioner:v4.0.1",
 				},
 			},
@@ -454,10 +454,10 @@ func TestCSITemplateRenderedControllerDeployment(t *testing.T) {
 				chartRelPath:      csiChart,
 				csiResizerEnabled: false,
 				expectedImages: []string{
-					"rancher/mirrored-sig-storage-csi-attacher:v4.5.1",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.0",
-					"rancher/mirrored-sig-storage-livenessprobe:v2.12.0",
-					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.0",
+					"rancher/mirrored-sig-storage-csi-attacher:v4.7.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-driver:v3.3.1",
+					"rancher/mirrored-sig-storage-livenessprobe:v2.14.0",
+					"rancher/mirrored-cloud-provider-vsphere-csi-release-syncer:v3.3.1",
 					"rancher/mirrored-sig-storage-csi-provisioner:v4.0.1",
 				},
 			},