🌱 [release-1.9] csi: use images from new location (#3203)

* csi: use images from new location * Fix CPI image location * Drop csi for v1.7 and fix CPI image * fixup * fix v1.8 upgrade tests
kubernetes-sigs · Sep 24, 2024 · aad8649 · aad8649
1 parent 56fb9c4
commit aad8649
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 990 deletions.
diff --git a/packaging/flavorgen/cloudprovider/cloud-controller-manager.go b/packaging/flavorgen/cloudprovider/cloud-controller-manager.go
@@ -32,7 +32,7 @@ import (
 // NOTE: the contents of this file are derived from https://github.com/kubernetes/cloud-provider-vsphere/tree/master/manifests/controller-manager
 
 const (
-	CPIControllerImageURL = "gcr.io/cloud-provider-vsphere/cpi/release/manager"
+	CPIControllerImageURL = "registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere"
 )
 
 // CloudControllerManagerServiceAccount returns the ServiceAccount used for the cloud-controller-manager.

diff --git a/packaging/flavorgen/cloudprovider/csi/kustomization.yaml b/packaging/flavorgen/cloudprovider/csi/kustomization.yaml
@@ -6,11 +6,11 @@ resources:
   - vsphere-csi-driver.yaml
 images:
   - name: gcr.io/cloud-provider-vsphere/csi/ci/driver
-    newName: gcr.io/cloud-provider-vsphere/csi/release/driver
-    newTag: v3.1.0
+    newName: registry.k8s.io/csi-vsphere/driver
+    newTag: v3.1.2
   - name: gcr.io/cloud-provider-vsphere/csi/ci/syncer
-    newName: gcr.io/cloud-provider-vsphere/csi/release/syncer
-    newTag: v3.1.0
+    newName: registry.k8s.io/csi-vsphere/syncer
+    newTag: v3.1.2
 patches:
 - patch: |-
     kind: Deployment

diff --git a/packaging/flavorgen/flavors/env/envsubts_consts.go b/packaging/flavorgen/flavors/env/envsubts_consts.go
@@ -21,7 +21,7 @@ const (
 	ClusterNameVar               = "${CLUSTER_NAME}"
 	ClusterClassNameVar          = "${CLUSTER_CLASS_NAME}"
 	ControlPlaneMachineCountVar  = "${CONTROL_PLANE_MACHINE_COUNT}"
-	DefaultCloudProviderImage    = "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.2.1"
+	DefaultCloudProviderImage    = "registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.2.1"
 	DefaultClusterCIDR           = "192.168.0.0/16"
 	DefaultDiskGiB               = 25
 	DefaultMemoryMiB             = 8192

diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml
@@ -677,7 +677,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -737,7 +737,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -873,7 +873,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1022,7 +1022,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1328,7 +1328,7 @@ data:
             - --v=2
             - --cloud-provider=vsphere
             - --cloud-config=/etc/cloud/vsphere.conf
-            image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
+            image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
             name: vsphere-cloud-controller-manager
             resources:
               requests:

diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml
@@ -881,7 +881,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -941,7 +941,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -1077,7 +1077,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1226,7 +1226,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1532,7 +1532,7 @@ data:
             - --v=2
             - --cloud-provider=vsphere
             - --cloud-config=/etc/cloud/vsphere.conf
-            image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
+            image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
             name: vsphere-cloud-controller-manager
             resources:
               requests:

diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml
@@ -802,7 +802,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -862,7 +862,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -998,7 +998,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1147,7 +1147,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1453,7 +1453,7 @@ data:
             - --v=2
             - --cloud-provider=vsphere
             - --cloud-config=/etc/cloud/vsphere.conf
-            image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
+            image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
             name: vsphere-cloud-controller-manager
             resources:
               requests:

diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
@@ -576,7 +576,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -636,7 +636,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -772,7 +772,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -921,7 +921,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1227,7 +1227,7 @@ data:
             - --v=2
             - --cloud-provider=vsphere
             - --cloud-config=/etc/cloud/vsphere.conf
-            image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
+            image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
             name: vsphere-cloud-controller-manager
             resources:
               requests:

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -792,7 +792,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -852,7 +852,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -988,7 +988,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1137,7 +1137,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1443,7 +1443,7 @@ data:
             - --v=2
             - --cloud-provider=vsphere
             - --cloud-config=/etc/cloud/vsphere.conf
-            image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
+            image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
             name: vsphere-cloud-controller-manager
             resources:
               requests: