Fix CPI image location

kubernetes-sigs · Sep 23, 2024 · 389bed7 · 389bed7
1 parent 30d1b5e
commit 389bed7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: