Merge pull request #3108 from sbueringer/pr-bump-cpi-beta

✨ Bump CPI to v1.31.0-beta.0
kubernetes-sigs · Jul 18, 2024 · 7368207 · 7368207
2 parents 4a7d0ff + 7d5c3a2
commit 7368207
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 20 deletions.
diff --git a/packaging/flavorgen/cloudprovider/cloud-controller-manager.go b/packaging/flavorgen/cloudprovider/cloud-controller-manager.go
@@ -31,10 +31,6 @@ 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"
-)
-
 // CloudControllerManagerManifests returns the yaml manifests generated via
 // `helm template` from https://github.com/kubernetes/cloud-provider-vsphere/tree/master/charts/vsphere-cpi
 func CloudControllerManagerManifests() (string, error) {

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-rc.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,6 @@ 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"
 	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
@@ -1282,7 +1282,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
@@ -1496,7 +1496,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
@@ -1417,7 +1417,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
@@ -1367,7 +1367,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
@@ -1175,7 +1175,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
@@ -1190,7 +1190,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
@@ -1407,7 +1407,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/config/vsphere.yaml b/test/e2e/config/vsphere.yaml
@@ -271,7 +271,7 @@ variables:
   KUBERNETES_VERSION_UPGRADE_FROM: "v1.29.0"
   KUBERNETES_VERSION_UPGRADE_TO: "v1.30.0"
   KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.31"
-  CPI_IMAGE_K8S_VERSION: "v1.30.0"
+  CPI_IMAGE_K8S_VERSION: "v1.31.0-beta.0"
   CNI: "./data/cni/calico/calico.yaml"
   EXP_CLUSTER_RESOURCE_SET: "true"
   EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"

diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.10/topology/cluster-template-topology.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.10/topology/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/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:

diff --git a/...nfrastructure-vsphere-supervisor/v1.10/topology/cluster-template-topology-supervisor.yaml b/...nfrastructure-vsphere-supervisor/v1.10/topology/cluster-template-topology-supervisor.yaml
@@ -1189,7 +1189,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
@@ -1275,4 +1275,4 @@ data:
 kind: ConfigMap
 metadata:
   name: cpi-manifests
-  namespace: '${NAMESPACE}'
+  namespace: '${NAMESPACE}'
diff --git a/...infrastructure-vsphere-supervisor/v1.9/topology/cluster-template-topology-supervisor.yaml b/...infrastructure-vsphere-supervisor/v1.9/topology/cluster-template-topology-supervisor.yaml
@@ -1189,7 +1189,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
@@ -1275,4 +1275,4 @@ data:
 kind: ConfigMap
 metadata:
   name: cpi-manifests
-  namespace: '${NAMESPACE}'
+  namespace: '${NAMESPACE}'