Merge pull request #3202 from chrischdi/pr-csi-new-location-1.10

🌱 [release-1.10] csi: use images from new location
kubernetes-sigs · Sep 23, 2024 · ec192ef · ec192ef
2 parents 1eb8cdf + da8e0e4
commit ec192ef
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 544 deletions.
diff --git a/packaging/flavorgen/cloudprovider/cloud-controller-manager.go b/packaging/flavorgen/cloudprovider/cloud-controller-manager.go
@@ -32,7 +32,7 @@ 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"
+	CPIControllerImageURL = "registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere"
 )
 
 // CloudControllerManagerManifests returns the yaml manifests generated via

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
         imagePullPolicy: IfNotPresent
         args:
           - --cloud-provider=vsphere

diff --git a/packaging/flavorgen/cloudprovider/csi/kustomization.yaml b/packaging/flavorgen/cloudprovider/csi/kustomization.yaml
@@ -6,11 +6,11 @@ resources:
   - vsphere-csi-driver.yaml
 images:
   - name: gcr.io/cloud-provider-vsphere/csi/ci/driver
-    newName: gcr.io/cloud-provider-vsphere/csi/release/driver
-    newTag: v3.1.0
+    newName: registry.k8s.io/csi-vsphere/driver
+    newTag: v3.1.2
   - name: gcr.io/cloud-provider-vsphere/csi/ci/syncer
-    newName: gcr.io/cloud-provider-vsphere/csi/release/syncer
-    newTag: v3.1.0
+    newName: registry.k8s.io/csi-vsphere/syncer
+    newTag: v3.1.2
 patches:
 - patch: |-
     kind: Deployment

diff --git a/packaging/flavorgen/flavors/env/envsubts_consts.go b/packaging/flavorgen/flavors/env/envsubts_consts.go
@@ -21,7 +21,7 @@ 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"
+	DefaultCloudProviderImage     = "registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere: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
@@ -680,7 +680,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
@@ -740,7 +740,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:
@@ -876,7 +876,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
@@ -1025,7 +1025,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
@@ -1289,7 +1289,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
@@ -894,7 +894,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
@@ -954,7 +954,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:
@@ -1090,7 +1090,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
@@ -1239,7 +1239,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
@@ -1503,7 +1503,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
@@ -815,7 +815,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
@@ -875,7 +875,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:
@@ -1011,7 +1011,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
@@ -1160,7 +1160,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
@@ -1424,7 +1424,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
@@ -774,7 +774,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
@@ -834,7 +834,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:
@@ -970,7 +970,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
@@ -1119,7 +1119,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
@@ -1383,7 +1383,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
@@ -582,7 +582,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
@@ -642,7 +642,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:
@@ -778,7 +778,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
@@ -927,7 +927,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
@@ -1191,7 +1191,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
@@ -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
@@ -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/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -805,7 +805,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
@@ -865,7 +865,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:
@@ -1001,7 +1001,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
@@ -1150,7 +1150,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
@@ -1414,7 +1414,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