Switch from k8s.gcr.io to registry.k8s.io (#2250)

kubernetes-sigs · Mar 1, 2023 · b07a4f9 · b07a4f9
1 parent bca5e31
commit b07a4f9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/manifests/vanilla/csi-snapshot-validatingwebhook.yaml b/manifests/vanilla/csi-snapshot-validatingwebhook.yaml
@@ -84,7 +84,7 @@ spec:
       serviceAccountName: snapshot-webhook
       containers:
         - name: snapshot-validation
-          image: k8s.gcr.io/sig-storage/snapshot-validation-webhook:v6.2.1 # change the image if you wish to use your own custom validation server image
+          image: registry.k8s.io/sig-storage/snapshot-validation-webhook:v6.2.1 # change the image if you wish to use your own custom validation server image
           imagePullPolicy: IfNotPresent
           args: ['--tls-cert-file=/run/secrets/tls/tls.crt', '--tls-private-key-file=/run/secrets/tls/tls.key']
           ports:

diff --git a/manifests/vanilla/deploy-csi-snapshot-components.sh b/manifests/vanilla/deploy-csi-snapshot-components.sh
@@ -237,7 +237,7 @@ spec:
     spec:
       containers:
         - name: csi-snapshotter
-          image: 'k8s.gcr.io/sig-storage/csi-snapshotter:${qualified_version}'
+          image: 'registry.k8s.io/sig-storage/csi-snapshotter:${qualified_version}'
           args:
             - '--v=4'
             - '--kube-api-qps=100'
@@ -265,7 +265,7 @@ EOF
 check_snapshotter_sidecar(){
 	local found="false"
 	local container_images
-	local csi_snapshotter_image="k8s.gcr.io/sig-storage/csi-snapshotter"
+	local csi_snapshotter_image="registry.k8s.io/sig-storage/csi-snapshotter"
 	container_images=$(kubectl -n vmware-system-csi get deployment vsphere-csi-controller -o jsonpath='{.spec.template.spec.containers[*].image}')
 	IFS=' '
 	read -r -a container_images_arr <<< "$container_images"

diff --git a/manifests/vanilla/vsphere-csi-driver.yaml b/manifests/vanilla/vsphere-csi-driver.yaml
@@ -244,7 +244,7 @@ spec:
       dnsPolicy: "Default"
       containers:
         - name: csi-attacher
-          image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
+          image: registry.k8s.io/sig-storage/csi-attacher:v4.2.0
           args:
             - "--v=4"
             - "--timeout=300s"
@@ -262,7 +262,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: csi-resizer
-          image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
+          image: registry.k8s.io/sig-storage/csi-resizer:v1.7.0
           args:
             - "--v=4"
             - "--timeout=300s"
@@ -329,7 +329,7 @@ spec:
             periodSeconds: 180
             failureThreshold: 3
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.9.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.9.0
           args:
             - "--v=4"
             - "--csi-address=/csi/csi.sock"
@@ -372,7 +372,7 @@ spec:
               name: vsphere-config-volume
               readOnly: true
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v3.4.0
+          image: registry.k8s.io/sig-storage/csi-provisioner:v3.4.0
           args:
             - "--v=4"
             - "--timeout=300s"
@@ -394,7 +394,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: csi-snapshotter
-          image: k8s.gcr.io/sig-storage/csi-snapshotter:v6.2.1
+          image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.1
           args:
             - "--v=4"
             - "--kube-api-qps=100"
@@ -445,7 +445,7 @@ spec:
       dnsPolicy: "ClusterFirstWithHostNet"
       containers:
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.7.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -530,7 +530,7 @@ spec:
             periodSeconds: 5
             failureThreshold: 3
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.9.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.9.0
           args:
             - "--v=4"
             - "--csi-address=/csi/csi.sock"
@@ -592,7 +592,7 @@ spec:
       serviceAccountName: vsphere-csi-node
       containers:
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.7.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -672,7 +672,7 @@ spec:
             periodSeconds: 5
             failureThreshold: 3
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.9.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.9.0
           args:
             - "--v=4"
             - "--csi-address=/csi/csi.sock"

diff --git a/tests/e2e/vmc_csi_deployments.go b/tests/e2e/vmc_csi_deployments.go
@@ -92,7 +92,7 @@ var _ = ginkgo.Describe("[vmc-gc] Deploy, Update and Scale Deployments", func()
 		1. Create Storage Class and PVC
 		2. Deploy nginx pods with volume
 		3. Update the nginx deployment pods, update the nginx image from
-		k8s.gcr.io/nginx-slim:0.8 to k8s.gcr.io/nginx-slim:0.9
+		registry.k8s.io/nginx-slim:0.8 to registry.k8s.io/nginx-slim:0.9
 		4. Wait for some time and verify the update is successful
 		5. Scale dowm the deployment to 0 replicas
 		6. Scale up the deployment to 1 replicas and verify all the pods should be up and running