Skip to content

Commit da8e0e4

Browse files
chrischdichrischdi
committed
Fix CPI image location
1 parent 736512b commit da8e0e4

13 files changed

+13
-13
lines changed

‎packaging/flavorgen/cloudprovider/cloud-controller-manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
// NOTE: the contents of this file are derived from https://github.com/kubernetes/cloud-provider-vsphere/tree/master/manifests/controller-manager
3333

3434
const (
35-
CPIControllerImageURL = "gcr.io/cloud-provider-vsphere/cpi/release/manager"
35+
CPIControllerImageURL = "registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere"
3636
)
3737

3838
// CloudControllerManagerManifests returns the yaml manifests generated via

‎packaging/flavorgen/cloudprovider/cpi/cpi.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ spec:
155155
priorityClassName: system-node-critical
156156
containers:
157157
- name: vsphere-cpi
158-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.30.0-rc.0
158+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.30.0
159159
imagePullPolicy: IfNotPresent
160160
args:
161161
- --cloud-provider=vsphere

‎packaging/flavorgen/flavors/env/envsubts_consts.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const (
2121
ClusterNameVar = "${CLUSTER_NAME}"
2222
ClusterClassNameVar = "${CLUSTER_CLASS_NAME}"
2323
ControlPlaneMachineCountVar = "${CONTROL_PLANE_MACHINE_COUNT}"
24-
DefaultCloudProviderImage = "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.2.1"
24+
DefaultCloudProviderImage = "registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.2.1"
2525
DefaultClusterCIDR = "192.168.0.0/16"
2626
DefaultDiskGiB = 25
2727
DefaultMemoryMiB = 8192

‎templates/cluster-template-external-loadbalancer.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ data:
12891289
priorityClassName: system-node-critical
12901290
containers:
12911291
- name: vsphere-cpi
1292-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
1292+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
12931293
imagePullPolicy: IfNotPresent
12941294
args:
12951295
- --cloud-provider=vsphere

‎templates/cluster-template-ignition.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,7 @@ data:
15031503
priorityClassName: system-node-critical
15041504
containers:
15051505
- name: vsphere-cpi
1506-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
1506+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
15071507
imagePullPolicy: IfNotPresent
15081508
args:
15091509
- --cloud-provider=vsphere

‎templates/cluster-template-node-ipam.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,7 @@ data:
14241424
priorityClassName: system-node-critical
14251425
containers:
14261426
- name: vsphere-cpi
1427-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
1427+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
14281428
imagePullPolicy: IfNotPresent
14291429
args:
14301430
- --cloud-provider=vsphere

‎templates/cluster-template-supervisor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1383,7 +1383,7 @@ data:
13831383
priorityClassName: system-node-critical
13841384
containers:
13851385
- name: vsphere-cpi
1386-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
1386+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
13871387
imagePullPolicy: IfNotPresent
13881388
args:
13891389
- --cloud-provider=vsphere

‎templates/cluster-template-topology-supervisor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ data:
11911191
priorityClassName: system-node-critical
11921192
containers:
11931193
- name: vsphere-cpi
1194-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
1194+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
11951195
imagePullPolicy: IfNotPresent
11961196
args:
11971197
- --cloud-provider=vsphere

‎templates/cluster-template-topology.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ data:
11971197
priorityClassName: system-node-critical
11981198
containers:
11991199
- name: vsphere-cpi
1200-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
1200+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
12011201
imagePullPolicy: IfNotPresent
12021202
args:
12031203
- --cloud-provider=vsphere

‎templates/cluster-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,7 @@ data:
14141414
priorityClassName: system-node-critical
14151415
containers:
14161416
- name: vsphere-cpi
1417-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
1417+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
14181418
imagePullPolicy: IfNotPresent
14191419
args:
14201420
- --cloud-provider=vsphere

‎test/e2e/data/infrastructure-vsphere-govmomi/v1.8/base/cluster-template-topology.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ data:
332332
- --v=2
333333
- --cloud-provider=vsphere
334334
- --cloud-config=/etc/cloud/vsphere.conf
335-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
335+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
336336
name: vsphere-cloud-controller-manager
337337
resources:
338338
requests:

‎test/e2e/data/infrastructure-vsphere-govmomi/v1.9/base/cluster-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,7 @@ data:
14411441
- --v=2
14421442
- --cloud-provider=vsphere
14431443
- --cloud-config=/etc/cloud/vsphere.conf
1444-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
1444+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
14451445
name: vsphere-cloud-controller-manager
14461446
resources:
14471447
requests:

‎test/e2e/data/infrastructure-vsphere-govmomi/v1.9/topology/cluster-template-topology.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ data:
12251225
- --v=2
12261226
- --cloud-provider=vsphere
12271227
- --cloud-config=/etc/cloud/vsphere.conf
1228-
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
1228+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
12291229
name: vsphere-cloud-controller-manager
12301230
resources:
12311231
requests:

0 commit comments

Comments
 (0)