Fix CPI image location

chrischdi · chrischdi · commit da8e0e44e74b · 2024-09-23T12:29:22.000+02:00
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"
 )
 
 // CloudControllerManagerManifests returns the yaml manifests generated via
diff --git a/packaging/flavorgen/cloudprovider/cpi/cpi.yaml b/packaging/flavorgen/cloudprovider/cpi/cpi.yaml
@@ -155,7 +155,7 @@ spec:
       priorityClassName: system-node-critical
       containers:
       - name: vsphere-cpi
-        image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.30.0-rc.0
+        image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.30.0
         imagePullPolicy: IfNotPresent
         args:
           - --cloud-provider=vsphere
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
@@ -1289,7 +1289,7 @@ data:
           priorityClassName: system-node-critical
           containers:
           - name: vsphere-cpi
-            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}
             imagePullPolicy: IfNotPresent
             args:
               - --cloud-provider=vsphere
diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml
@@ -1503,7 +1503,7 @@ data:
           priorityClassName: system-node-critical
           containers:
           - name: vsphere-cpi
-            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}
             imagePullPolicy: IfNotPresent
             args:
               - --cloud-provider=vsphere
diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml
@@ -1424,7 +1424,7 @@ data:
           priorityClassName: system-node-critical
           containers:
           - name: vsphere-cpi
-            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}
             imagePullPolicy: IfNotPresent
             args:
               - --cloud-provider=vsphere
diff --git a/templates/cluster-template-supervisor.yaml b/templates/cluster-template-supervisor.yaml
@@ -1383,7 +1383,7 @@ data:
           priorityClassName: system-node-critical
           containers:
           - name: vsphere-cpi
-            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}
             imagePullPolicy: IfNotPresent
             args:
               - --cloud-provider=vsphere
diff --git a/templates/cluster-template-topology-supervisor.yaml b/templates/cluster-template-topology-supervisor.yaml
@@ -1191,7 +1191,7 @@ data:
           priorityClassName: system-node-critical
           containers:
           - name: vsphere-cpi
-            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}
             imagePullPolicy: IfNotPresent
             args:
               - --cloud-provider=vsphere
diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
@@ -1197,7 +1197,7 @@ data:
           priorityClassName: system-node-critical
           containers:
           - name: vsphere-cpi
-            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}
             imagePullPolicy: IfNotPresent
             args:
               - --cloud-provider=vsphere
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -1414,7 +1414,7 @@ data:
           priorityClassName: system-node-critical
           containers:
           - name: vsphere-cpi
-            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}
             imagePullPolicy: IfNotPresent
             args:
               - --cloud-provider=vsphere
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/base/cluster-template-topology.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.8/base/cluster-template-topology.yaml
@@ -332,7 +332,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/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/base/cluster-template.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/base/cluster-template.yaml
@@ -1441,7 +1441,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/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/cluster-template-topology.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/cluster-template-topology.yaml
@@ -1225,7 +1225,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:

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`	`// NOTE: the contents of this file are derived from https://github.com/kubernetes/cloud-provider-vsphere/tree/master/manifests/controller-manager`
`33`	`33`
`34`	`34`	`const (`
`35`		`- CPIControllerImageURL = "gcr.io/cloud-provider-vsphere/cpi/release/manager"`
	`35`	`+ CPIControllerImageURL = "registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere"`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`// CloudControllerManagerManifests returns the yaml manifests generated via`