Skip to content

Commit 228bb2f

Browse files
authored
Merge pull request #3201 from chrischdi/pr-csi-new-location-1.11
🌱 [release-1.11] csi: use images from new location
2 parents e54da21 + 5864718 commit 228bb2f

12 files changed

+48
-48
lines changed

packaging/flavorgen/cloudprovider/csi/vsphere-csi-driver.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ spec:
277277
- mountPath: /csi
278278
name: socket-dir
279279
- name: vsphere-csi-controller
280-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
280+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
281281
args:
282282
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
283283
- "--fss-namespace=$(CSI_NAMESPACE)"
@@ -337,7 +337,7 @@ spec:
337337
- name: socket-dir
338338
mountPath: /csi
339339
- name: vsphere-syncer
340-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
340+
image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
341341
args:
342342
- "--leader-election"
343343
- "--leader-election-lease-duration=30s"
@@ -470,7 +470,7 @@ spec:
470470
- --mode=kubelet-registration-probe
471471
initialDelaySeconds: 3
472472
- name: vsphere-csi-node
473-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
473+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
474474
args:
475475
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
476476
- "--fss-namespace=$(CSI_NAMESPACE)"
@@ -615,7 +615,7 @@ spec:
615615
- --mode=kubelet-registration-probe
616616
initialDelaySeconds: 3
617617
- name: vsphere-csi-node
618-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
618+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
619619
args:
620620
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
621621
- "--fss-namespace=$(CSI_NAMESPACE)"

templates/cluster-template-external-loadbalancer.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ data:
677677
valueFrom:
678678
fieldRef:
679679
fieldPath: metadata.namespace
680-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
680+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
681681
imagePullPolicy: Always
682682
livenessProbe:
683683
failureThreshold: 3
@@ -735,7 +735,7 @@ data:
735735
valueFrom:
736736
fieldRef:
737737
fieldPath: metadata.namespace
738-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
738+
image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
739739
imagePullPolicy: Always
740740
name: vsphere-syncer
741741
ports:
@@ -869,7 +869,7 @@ data:
869869
fieldPath: metadata.namespace
870870
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
871871
value: "1"
872-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
872+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
873873
imagePullPolicy: Always
874874
livenessProbe:
875875
failureThreshold: 3
@@ -1018,7 +1018,7 @@ data:
10181018
fieldPath: metadata.namespace
10191019
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
10201020
value: "1"
1021-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
1021+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
10221022
imagePullPolicy: Always
10231023
livenessProbe:
10241024
failureThreshold: 3

templates/cluster-template-ignition.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ data:
897897
valueFrom:
898898
fieldRef:
899899
fieldPath: metadata.namespace
900-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
900+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
901901
imagePullPolicy: Always
902902
livenessProbe:
903903
failureThreshold: 3
@@ -955,7 +955,7 @@ data:
955955
valueFrom:
956956
fieldRef:
957957
fieldPath: metadata.namespace
958-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
958+
image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
959959
imagePullPolicy: Always
960960
name: vsphere-syncer
961961
ports:
@@ -1089,7 +1089,7 @@ data:
10891089
fieldPath: metadata.namespace
10901090
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
10911091
value: "1"
1092-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
1092+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
10931093
imagePullPolicy: Always
10941094
livenessProbe:
10951095
failureThreshold: 3
@@ -1238,7 +1238,7 @@ data:
12381238
fieldPath: metadata.namespace
12391239
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
12401240
value: "1"
1241-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
1241+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
12421242
imagePullPolicy: Always
12431243
livenessProbe:
12441244
failureThreshold: 3

templates/cluster-template-node-ipam.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ data:
812812
valueFrom:
813813
fieldRef:
814814
fieldPath: metadata.namespace
815-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
815+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
816816
imagePullPolicy: Always
817817
livenessProbe:
818818
failureThreshold: 3
@@ -870,7 +870,7 @@ data:
870870
valueFrom:
871871
fieldRef:
872872
fieldPath: metadata.namespace
873-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
873+
image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
874874
imagePullPolicy: Always
875875
name: vsphere-syncer
876876
ports:
@@ -1004,7 +1004,7 @@ data:
10041004
fieldPath: metadata.namespace
10051005
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
10061006
value: "1"
1007-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
1007+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
10081008
imagePullPolicy: Always
10091009
livenessProbe:
10101010
failureThreshold: 3
@@ -1153,7 +1153,7 @@ data:
11531153
fieldPath: metadata.namespace
11541154
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
11551155
value: "1"
1156-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
1156+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
11571157
imagePullPolicy: Always
11581158
livenessProbe:
11591159
failureThreshold: 3

templates/cluster-template-supervisor.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ data:
762762
valueFrom:
763763
fieldRef:
764764
fieldPath: metadata.namespace
765-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
765+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
766766
imagePullPolicy: Always
767767
livenessProbe:
768768
failureThreshold: 3
@@ -820,7 +820,7 @@ data:
820820
valueFrom:
821821
fieldRef:
822822
fieldPath: metadata.namespace
823-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
823+
image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
824824
imagePullPolicy: Always
825825
name: vsphere-syncer
826826
ports:
@@ -954,7 +954,7 @@ data:
954954
fieldPath: metadata.namespace
955955
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
956956
value: "1"
957-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
957+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
958958
imagePullPolicy: Always
959959
livenessProbe:
960960
failureThreshold: 3
@@ -1103,7 +1103,7 @@ data:
11031103
fieldPath: metadata.namespace
11041104
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
11051105
value: "1"
1106-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
1106+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
11071107
imagePullPolicy: Always
11081108
livenessProbe:
11091109
failureThreshold: 3

templates/cluster-template-topology-supervisor.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ data:
570570
valueFrom:
571571
fieldRef:
572572
fieldPath: metadata.namespace
573-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
573+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
574574
imagePullPolicy: Always
575575
livenessProbe:
576576
failureThreshold: 3
@@ -628,7 +628,7 @@ data:
628628
valueFrom:
629629
fieldRef:
630630
fieldPath: metadata.namespace
631-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
631+
image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
632632
imagePullPolicy: Always
633633
name: vsphere-syncer
634634
ports:
@@ -762,7 +762,7 @@ data:
762762
fieldPath: metadata.namespace
763763
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
764764
value: "1"
765-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
765+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
766766
imagePullPolicy: Always
767767
livenessProbe:
768768
failureThreshold: 3
@@ -911,7 +911,7 @@ data:
911911
fieldPath: metadata.namespace
912912
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
913913
value: "1"
914-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
914+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
915915
imagePullPolicy: Always
916916
livenessProbe:
917917
failureThreshold: 3

templates/cluster-template-topology.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ data:
585585
valueFrom:
586586
fieldRef:
587587
fieldPath: metadata.namespace
588-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
588+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
589589
imagePullPolicy: Always
590590
livenessProbe:
591591
failureThreshold: 3
@@ -643,7 +643,7 @@ data:
643643
valueFrom:
644644
fieldRef:
645645
fieldPath: metadata.namespace
646-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
646+
image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
647647
imagePullPolicy: Always
648648
name: vsphere-syncer
649649
ports:
@@ -777,7 +777,7 @@ data:
777777
fieldPath: metadata.namespace
778778
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
779779
value: "1"
780-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
780+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
781781
imagePullPolicy: Always
782782
livenessProbe:
783783
failureThreshold: 3
@@ -926,7 +926,7 @@ data:
926926
fieldPath: metadata.namespace
927927
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
928928
value: "1"
929-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
929+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
930930
imagePullPolicy: Always
931931
livenessProbe:
932932
failureThreshold: 3

templates/cluster-template.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ data:
802802
valueFrom:
803803
fieldRef:
804804
fieldPath: metadata.namespace
805-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
805+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
806806
imagePullPolicy: Always
807807
livenessProbe:
808808
failureThreshold: 3
@@ -860,7 +860,7 @@ data:
860860
valueFrom:
861861
fieldRef:
862862
fieldPath: metadata.namespace
863-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
863+
image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
864864
imagePullPolicy: Always
865865
name: vsphere-syncer
866866
ports:
@@ -994,7 +994,7 @@ data:
994994
fieldPath: metadata.namespace
995995
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
996996
value: "1"
997-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
997+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
998998
imagePullPolicy: Always
999999
livenessProbe:
10001000
failureThreshold: 3
@@ -1143,7 +1143,7 @@ data:
11431143
fieldPath: metadata.namespace
11441144
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
11451145
value: "1"
1146-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
1146+
image: registry.k8s.io/csi-vsphere/driver:v3.3.1
11471147
imagePullPolicy: Always
11481148
livenessProbe:
11491149
failureThreshold: 3

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

+4-4
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

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ data:
577577
valueFrom:
578578
fieldRef:
579579
fieldPath: metadata.namespace
580-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
580+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
581581
imagePullPolicy: Always
582582
livenessProbe:
583583
failureThreshold: 3
@@ -637,7 +637,7 @@ data:
637637
valueFrom:
638638
fieldRef:
639639
fieldPath: metadata.namespace
640-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
640+
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
641641
imagePullPolicy: Always
642642
name: vsphere-syncer
643643
ports:
@@ -773,7 +773,7 @@ data:
773773
fieldPath: metadata.namespace
774774
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
775775
value: "1"
776-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
776+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
777777
imagePullPolicy: Always
778778
livenessProbe:
779779
failureThreshold: 3
@@ -922,7 +922,7 @@ data:
922922
fieldPath: metadata.namespace
923923
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
924924
value: "1"
925-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
925+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
926926
imagePullPolicy: Always
927927
livenessProbe:
928928
failureThreshold: 3

test/e2e/data/infrastructure-vsphere-supervisor/v1.10/topology/cluster-template-topology-supervisor.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ data:
580580
valueFrom:
581581
fieldRef:
582582
fieldPath: metadata.namespace
583-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
583+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
584584
imagePullPolicy: Always
585585
livenessProbe:
586586
failureThreshold: 3
@@ -640,7 +640,7 @@ data:
640640
valueFrom:
641641
fieldRef:
642642
fieldPath: metadata.namespace
643-
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
643+
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
644644
imagePullPolicy: Always
645645
name: vsphere-syncer
646646
ports:
@@ -776,7 +776,7 @@ data:
776776
fieldPath: metadata.namespace
777777
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
778778
value: "1"
779-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
779+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
780780
imagePullPolicy: Always
781781
livenessProbe:
782782
failureThreshold: 3
@@ -925,7 +925,7 @@ data:
925925
fieldPath: metadata.namespace
926926
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
927927
value: "1"
928-
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
928+
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
929929
imagePullPolicy: Always
930930
livenessProbe:
931931
failureThreshold: 3

0 commit comments

Comments
 (0)