Merge pull request #3201 from chrischdi/pr-csi-new-location-1.11

🌱 [release-1.11] csi: use images from new location
kubernetes-sigs · Sep 23, 2024 · 228bb2f · 228bb2f
2 parents e54da21 + 5864718
commit 228bb2f
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 48 deletions.
diff --git a/packaging/flavorgen/cloudprovider/csi/vsphere-csi-driver.yaml b/packaging/flavorgen/cloudprovider/csi/vsphere-csi-driver.yaml
@@ -277,7 +277,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: vsphere-csi-controller
-          image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+          image: registry.k8s.io/csi-vsphere/driver:v3.3.1
           args:
             - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
             - "--fss-namespace=$(CSI_NAMESPACE)"
@@ -337,7 +337,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: vsphere-syncer
-          image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
+          image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
           args:
             - "--leader-election"
             - "--leader-election-lease-duration=30s"
@@ -470,7 +470,7 @@ spec:
               - --mode=kubelet-registration-probe
             initialDelaySeconds: 3
         - name: vsphere-csi-node
-          image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+          image: registry.k8s.io/csi-vsphere/driver:v3.3.1
           args:
             - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
             - "--fss-namespace=$(CSI_NAMESPACE)"
@@ -615,7 +615,7 @@ spec:
               - --mode=kubelet-registration-probe
             initialDelaySeconds: 3
         - name: vsphere-csi-node
-          image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+          image: registry.k8s.io/csi-vsphere/driver:v3.3.1
           args:
             - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
             - "--fss-namespace=$(CSI_NAMESPACE)"

diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml
@@ -677,7 +677,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -735,7 +735,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -869,7 +869,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1018,7 +1018,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3

diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml
@@ -897,7 +897,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -955,7 +955,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -1089,7 +1089,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1238,7 +1238,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3

diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml
@@ -812,7 +812,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -870,7 +870,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -1004,7 +1004,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1153,7 +1153,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3

diff --git a/templates/cluster-template-supervisor.yaml b/templates/cluster-template-supervisor.yaml
@@ -762,7 +762,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -820,7 +820,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -954,7 +954,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1103,7 +1103,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3

diff --git a/templates/cluster-template-topology-supervisor.yaml b/templates/cluster-template-topology-supervisor.yaml
@@ -570,7 +570,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -628,7 +628,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -762,7 +762,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -911,7 +911,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3

diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
@@ -585,7 +585,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -643,7 +643,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -777,7 +777,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -926,7 +926,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -802,7 +802,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -860,7 +860,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.3.1
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -994,7 +994,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1143,7 +1143,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.3.1
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3

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
@@ -588,7 +588,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -648,7 +648,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -784,7 +784,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -933,7 +933,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3

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
@@ -577,7 +577,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -637,7 +637,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -773,7 +773,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -922,7 +922,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3

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
@@ -580,7 +580,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -640,7 +640,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
+            image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -776,7 +776,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -925,7 +925,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: registry.k8s.io/csi-vsphere/driver:v3.1.2
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3