Skip to content

Commit ec192ef

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3202 from chrischdi/pr-csi-new-location-1.10
🌱 [release-1.10] csi: use images from new location
2 parents 1eb8cdf + da8e0e4 commit ec192ef

16 files changed

+53
-544
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/cloudprovider/csi/kustomization.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ resources:
66
- vsphere-csi-driver.yaml
77
images:
88
- name: gcr.io/cloud-provider-vsphere/csi/ci/driver
9-
newName: gcr.io/cloud-provider-vsphere/csi/release/driver
10-
newTag: v3.1.0
9+
newName: registry.k8s.io/csi-vsphere/driver
10+
newTag: v3.1.2
1111
- name: gcr.io/cloud-provider-vsphere/csi/ci/syncer
12-
newName: gcr.io/cloud-provider-vsphere/csi/release/syncer
13-
newTag: v3.1.0
12+
newName: registry.k8s.io/csi-vsphere/syncer
13+
newTag: v3.1.2
1414
patches:
1515
- patch: |-
1616
kind: Deployment

‎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

+5-5
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ data:
680680
valueFrom:
681681
fieldRef:
682682
fieldPath: metadata.namespace
683-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
683+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
684684
imagePullPolicy: Always
685685
livenessProbe:
686686
failureThreshold: 3
@@ -740,7 +740,7 @@ data:
740740
valueFrom:
741741
fieldRef:
742742
fieldPath: metadata.namespace
743-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
743+
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
744744
imagePullPolicy: Always
745745
name: vsphere-syncer
746746
ports:
@@ -876,7 +876,7 @@ data:
876876
fieldPath: metadata.namespace
877877
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
878878
value: "1"
879-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
879+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
880880
imagePullPolicy: Always
881881
livenessProbe:
882882
failureThreshold: 3
@@ -1025,7 +1025,7 @@ data:
10251025
fieldPath: metadata.namespace
10261026
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
10271027
value: "1"
1028-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
1028+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
10291029
imagePullPolicy: Always
10301030
livenessProbe:
10311031
failureThreshold: 3
@@ -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

+5-5
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ data:
894894
valueFrom:
895895
fieldRef:
896896
fieldPath: metadata.namespace
897-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
897+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
898898
imagePullPolicy: Always
899899
livenessProbe:
900900
failureThreshold: 3
@@ -954,7 +954,7 @@ data:
954954
valueFrom:
955955
fieldRef:
956956
fieldPath: metadata.namespace
957-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
957+
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
958958
imagePullPolicy: Always
959959
name: vsphere-syncer
960960
ports:
@@ -1090,7 +1090,7 @@ data:
10901090
fieldPath: metadata.namespace
10911091
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
10921092
value: "1"
1093-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
1093+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
10941094
imagePullPolicy: Always
10951095
livenessProbe:
10961096
failureThreshold: 3
@@ -1239,7 +1239,7 @@ data:
12391239
fieldPath: metadata.namespace
12401240
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
12411241
value: "1"
1242-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
1242+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
12431243
imagePullPolicy: Always
12441244
livenessProbe:
12451245
failureThreshold: 3
@@ -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

+5-5
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ data:
815815
valueFrom:
816816
fieldRef:
817817
fieldPath: metadata.namespace
818-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
818+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
819819
imagePullPolicy: Always
820820
livenessProbe:
821821
failureThreshold: 3
@@ -875,7 +875,7 @@ data:
875875
valueFrom:
876876
fieldRef:
877877
fieldPath: metadata.namespace
878-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
878+
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
879879
imagePullPolicy: Always
880880
name: vsphere-syncer
881881
ports:
@@ -1011,7 +1011,7 @@ data:
10111011
fieldPath: metadata.namespace
10121012
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
10131013
value: "1"
1014-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
1014+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
10151015
imagePullPolicy: Always
10161016
livenessProbe:
10171017
failureThreshold: 3
@@ -1160,7 +1160,7 @@ data:
11601160
fieldPath: metadata.namespace
11611161
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
11621162
value: "1"
1163-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
1163+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
11641164
imagePullPolicy: Always
11651165
livenessProbe:
11661166
failureThreshold: 3
@@ -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

+5-5
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ data:
774774
valueFrom:
775775
fieldRef:
776776
fieldPath: metadata.namespace
777-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
777+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
778778
imagePullPolicy: Always
779779
livenessProbe:
780780
failureThreshold: 3
@@ -834,7 +834,7 @@ data:
834834
valueFrom:
835835
fieldRef:
836836
fieldPath: metadata.namespace
837-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
837+
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
838838
imagePullPolicy: Always
839839
name: vsphere-syncer
840840
ports:
@@ -970,7 +970,7 @@ data:
970970
fieldPath: metadata.namespace
971971
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
972972
value: "1"
973-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
973+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
974974
imagePullPolicy: Always
975975
livenessProbe:
976976
failureThreshold: 3
@@ -1119,7 +1119,7 @@ data:
11191119
fieldPath: metadata.namespace
11201120
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
11211121
value: "1"
1122-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
1122+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
11231123
imagePullPolicy: Always
11241124
livenessProbe:
11251125
failureThreshold: 3
@@ -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

+5-5
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ data:
582582
valueFrom:
583583
fieldRef:
584584
fieldPath: metadata.namespace
585-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
585+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
586586
imagePullPolicy: Always
587587
livenessProbe:
588588
failureThreshold: 3
@@ -642,7 +642,7 @@ data:
642642
valueFrom:
643643
fieldRef:
644644
fieldPath: metadata.namespace
645-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
645+
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
646646
imagePullPolicy: Always
647647
name: vsphere-syncer
648648
ports:
@@ -778,7 +778,7 @@ data:
778778
fieldPath: metadata.namespace
779779
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
780780
value: "1"
781-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
781+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
782782
imagePullPolicy: Always
783783
livenessProbe:
784784
failureThreshold: 3
@@ -927,7 +927,7 @@ data:
927927
fieldPath: metadata.namespace
928928
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
929929
value: "1"
930-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
930+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
931931
imagePullPolicy: Always
932932
livenessProbe:
933933
failureThreshold: 3
@@ -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

+5-5
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ data:
588588
valueFrom:
589589
fieldRef:
590590
fieldPath: metadata.namespace
591-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
591+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
592592
imagePullPolicy: Always
593593
livenessProbe:
594594
failureThreshold: 3
@@ -648,7 +648,7 @@ data:
648648
valueFrom:
649649
fieldRef:
650650
fieldPath: metadata.namespace
651-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
651+
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
652652
imagePullPolicy: Always
653653
name: vsphere-syncer
654654
ports:
@@ -784,7 +784,7 @@ data:
784784
fieldPath: metadata.namespace
785785
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
786786
value: "1"
787-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
787+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
788788
imagePullPolicy: Always
789789
livenessProbe:
790790
failureThreshold: 3
@@ -933,7 +933,7 @@ data:
933933
fieldPath: metadata.namespace
934934
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
935935
value: "1"
936-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
936+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
937937
imagePullPolicy: Always
938938
livenessProbe:
939939
failureThreshold: 3
@@ -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

+5-5
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ data:
805805
valueFrom:
806806
fieldRef:
807807
fieldPath: metadata.namespace
808-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
808+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
809809
imagePullPolicy: Always
810810
livenessProbe:
811811
failureThreshold: 3
@@ -865,7 +865,7 @@ data:
865865
valueFrom:
866866
fieldRef:
867867
fieldPath: metadata.namespace
868-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
868+
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
869869
imagePullPolicy: Always
870870
name: vsphere-syncer
871871
ports:
@@ -1001,7 +1001,7 @@ data:
10011001
fieldPath: metadata.namespace
10021002
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
10031003
value: "1"
1004-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
1004+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
10051005
imagePullPolicy: Always
10061006
livenessProbe:
10071007
failureThreshold: 3
@@ -1150,7 +1150,7 @@ data:
11501150
fieldPath: metadata.namespace
11511151
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
11521152
value: "1"
1153-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
1153+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
11541154
imagePullPolicy: Always
11551155
livenessProbe:
11561156
failureThreshold: 3
@@ -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

0 commit comments

Comments
 (0)