chore: move registry from k8s.gcr.io to registry.k8s.io

ajayk · ajayk · commit 33dfad21f4f4 · 2022-11-30T03:01:20.000Z
diff --git a/guestbook-go/README.md b/guestbook-go/README.md
@@ -109,7 +109,7 @@ The Redis master we created earlier is a single pod (REPLICAS = 1), while the Re
     $ kubectl get rc
     CONTROLLER              CONTAINER(S)            IMAGE(S)                         SELECTOR                    REPLICAS
     redis-master            redis-master            redis                            app=redis,role=master       1
-    redis-replica           redis-replica           k8s.gcr.io/redis-slave:v2        app=redis,role=replica      2
+    redis-replica           redis-replica           registry.k8s.io/redis-slave:v2   app=redis,role=replica      2
     ...
     ```
 
@@ -178,9 +178,9 @@ This is a simple Go `net/http` ([negroni](https://github.com/codegangsta/negroni
     ```console
     $ kubectl get rc
     CONTROLLER            CONTAINER(S)         IMAGE(S)                               SELECTOR                  REPLICAS
-    guestbook             guestbook            k8s.gcr.io/guestbook:v3                app=guestbook             3
+    guestbook             guestbook            registry.k8s.io/guestbook:v3           app=guestbook             3
     redis-master          redis-master         redis                                  app=redis,role=master     1
-    redis-replica         redis-replica        k8s.gcr.io/redis-replica:v2            app=redis,role=replica    2
+    redis-replica         redis-replica        registry.k8s.io/redis-replica:v2       app=redis,role=replica    2
     ...
     ```
 
diff --git a/guestbook-go/guestbook-controller.json b/guestbook-go/guestbook-controller.json
@@ -22,7 +22,7 @@
             "containers":[
                {
                   "name":"guestbook",
-                  "image":"k8s.gcr.io/guestbook:v3",
+                  "image":"registry.k8s.io/guestbook:v3",
                   "ports":[
                      {
                         "name":"http-server",
diff --git a/guestbook-go/redis-master-controller.json b/guestbook-go/redis-master-controller.json
@@ -25,7 +25,7 @@
             "containers":[
                {
                   "name":"redis-master",
-                  "image":"k8s.gcr.io/redis:e2e",
+                  "image":"registry.k8s.io/redis:e2e",
                   "ports":[
                      {
                         "name":"redis-server",
diff --git a/guestbook-go/redis-replica-controller.json b/guestbook-go/redis-replica-controller.json
@@ -25,7 +25,7 @@
             "containers":[
                {
                   "name":"redis-replica",
-                  "image":"k8s.gcr.io/redis-slave:v2",
+                  "image":"registry.k8s.io/redis-slave:v2",
                   "ports":[
                      {
                         "name":"redis-server",
diff --git a/guestbook/all-in-one/guestbook-all-in-one.yaml b/guestbook/all-in-one/guestbook-all-in-one.yaml
@@ -35,7 +35,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: k8s.gcr.io/redis:e2e  # or just image: redis
+        image: registry.k8s.io/redis:e2e  # or just image: redis
         resources:
           requests:
             cpu: 100m
diff --git a/guestbook/legacy/redis-master-controller.yaml b/guestbook/legacy/redis-master-controller.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: k8s.gcr.io/redis:e2e  # or just image: redis
+        image: registry.k8s.io/redis:e2e  # or just image: redis
         resources:
           requests:
             cpu: 100m
diff --git a/guestbook/redis-master-deployment.yaml b/guestbook/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: k8s.gcr.io/redis:e2e  # or just image: redis
+        image: registry.k8s.io/redis:e2e  # or just image: redis
         resources:
           requests:
             cpu: 100m
diff --git a/staging/cluster-dns/dns-backend-rc.yaml b/staging/cluster-dns/dns-backend-rc.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: dns-backend
-          image: k8s.gcr.io/example-dns-backend:v1
+          image: registry.k8s.io/example-dns-backend:v1
           ports:
             - name: backend-port
               containerPort: 8000
diff --git a/staging/cluster-dns/dns-frontend-pod.yaml b/staging/cluster-dns/dns-frontend-pod.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
     - name: dns-frontend
-      image: k8s.gcr.io/example-dns-frontend:v1
+      image: registry.k8s.io/example-dns-frontend:v1
       command:
         - python
         - client.py
diff --git a/staging/explorer/README.md b/staging/explorer/README.md
@@ -2,7 +2,7 @@
 
 Explorer is a little container for examining the runtime environment Kubernetes produces for your pods.
 
-The intended use is to substitute k8s.gcr.io/explorer for your intended container, and then visit it via the proxy.
+The intended use is to substitute registry.k8s.io/explorer for your intended container, and then visit it via the proxy.
 
 Currently, you can look at:
  * The environment variables to make sure Kubernetes is doing what you expect.
diff --git a/staging/explorer/pod.yaml b/staging/explorer/pod.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
     - name: explorer
-      image: k8s.gcr.io/explorer:1.0
+      image: registry.k8s.io/explorer:1.0
       args: ["-port=8080"]
       ports:
         - containerPort: 8080
diff --git a/staging/spark/spark-gluster/spark-master-controller.yaml b/staging/spark/spark-gluster/spark-master-controller.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: spark-master
-          image: k8s.gcr.io/spark:1.5.2_v1
+          image: registry.k8s.io/spark:1.5.2_v1
           command: ["/start-master"]
           ports:
             - containerPort: 7077
diff --git a/staging/spark/spark-gluster/spark-worker-controller.yaml b/staging/spark/spark-gluster/spark-worker-controller.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: spark-worker
-          image: k8s.gcr.io/spark:1.5.2_v1
+          image: registry.k8s.io/spark:1.5.2_v1
           command: ["/start-worker"]
           ports:
             - containerPort: 8888
diff --git a/staging/spark/spark-master-controller.yaml b/staging/spark/spark-master-controller.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: spark-master
-          image: k8s.gcr.io/spark:1.5.2_v1
+          image: registry.k8s.io/spark:1.5.2_v1
           command: ["/start-master"]
           ports:
             - containerPort: 7077
diff --git a/staging/spark/spark-worker-controller.yaml b/staging/spark/spark-worker-controller.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: spark-worker
-          image: k8s.gcr.io/spark:1.5.2_v1
+          image: registry.k8s.io/spark:1.5.2_v1
           command: ["/start-worker"]
           ports:
             - containerPort: 8081
diff --git a/staging/spark/zeppelin-controller.yaml b/staging/spark/zeppelin-controller.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
         - name: zeppelin
-          image: k8s.gcr.io/zeppelin:v0.5.6_v1
+          image: registry.k8s.io/zeppelin:v0.5.6_v1
           ports:
             - containerPort: 8080
           resources:
diff --git a/staging/storage/redis/redis-controller.yaml b/staging/storage/redis/redis-controller.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: redis
-        image: k8s.gcr.io/redis:v1
+        image: registry.k8s.io/redis:v1
         ports:
         - containerPort: 6379
         resources:
diff --git a/staging/storage/redis/redis-master.yaml b/staging/storage/redis/redis-master.yaml
@@ -9,7 +9,7 @@ metadata:
 spec:
   containers:
     - name: master
-      image: k8s.gcr.io/redis:v1
+      image: registry.k8s.io/redis:v1
       env:
         - name: MASTER
           value: "true"
@@ -22,7 +22,7 @@ spec:
         - mountPath: /redis-master-data
           name: data
     - name: sentinel
-      image: k8s.gcr.io/redis:v1
+      image: registry.k8s.io/redis:v1
       env:
         - name: SENTINEL
           value: "true"
diff --git a/staging/storage/redis/redis-sentinel-controller.yaml b/staging/storage/redis/redis-sentinel-controller.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: sentinel
-        image: k8s.gcr.io/redis:v1
+        image: registry.k8s.io/redis:v1
         env:
           - name: SENTINEL
             value: "true"
diff --git a/staging/storage/rethinkdb/admin-pod.yaml b/staging/storage/rethinkdb/admin-pod.yaml
@@ -7,7 +7,7 @@ metadata:
   name: rethinkdb-admin
 spec:
   containers:
-  - image: k8s.gcr.io/rethinkdb:1.16.0_1
+  - image: registry.k8s.io/rethinkdb:1.16.0_1
     name: rethinkdb
     env:
     - name: POD_NAMESPACE
diff --git a/staging/storage/rethinkdb/rc.yaml b/staging/storage/rethinkdb/rc.yaml
@@ -16,7 +16,7 @@ spec:
         role: replicas
     spec:
       containers:
-      - image: k8s.gcr.io/rethinkdb:1.16.0_1
+      - image: registry.k8s.io/rethinkdb:1.16.0_1
         name: rethinkdb
         env:
         - name: POD_NAMESPACE
diff --git a/staging/volumes/nfs/nfs-server-deployment.yaml b/staging/volumes/nfs/nfs-server-deployment.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: nfs-server
-        image: k8s.gcr.io/volume-nfs:0.8
+        image: registry.k8s.io/volume-nfs:0.8
         ports:
           - name: nfs
             containerPort: 2049
diff --git a/staging/volumes/portworx/README.md b/staging/volumes/portworx/README.md
@@ -45,7 +45,7 @@ The following examples assumes that you already have a running Kubernetes cluste
     name: test-portworx-volume-pod
    spec:
      containers:
-     - image: k8s.gcr.io/test-webserver
+     - image: registry.k8s.io/test-webserver
        name: test-container
        volumeMounts:
        - mountPath: /test-portworx-volume
@@ -181,7 +181,7 @@ The following examples assumes that you already have a running Kubernetes cluste
       spec:
         containers:
         - name: test-container
-          image: k8s.gcr.io/test-webserver
+          image: registry.k8s.io/test-webserver
           volumeMounts:
           - name: test-volume
             mountPath: /test-portworx-volume
@@ -338,7 +338,7 @@ create Portworx volumes out of band and they will be created automatically.
      spec:
        containers:
        - name: test-container
-         image: k8s.gcr.io/test-webserver
+         image: registry.k8s.io/test-webserver
          volumeMounts:
          - name: test-volume
            mountPath: /test-portworx-volume
diff --git a/staging/volumes/portworx/portworx-volume-pod.yaml b/staging/volumes/portworx/portworx-volume-pod.yaml
@@ -4,7 +4,7 @@ metadata:
   name: test-portworx-volume-pod
 spec:
   containers:
-  - image: k8s.gcr.io/test-webserver
+  - image: registry.k8s.io/test-webserver
     name: test-container
     volumeMounts:
     - mountPath: /test-portworx-volume
diff --git a/staging/volumes/portworx/portworx-volume-pvcpod.yaml b/staging/volumes/portworx/portworx-volume-pvcpod.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: test-container
-    image: k8s.gcr.io/test-webserver
+    image: registry.k8s.io/test-webserver
     volumeMounts:
     - name: test-volume
       mountPath: /test-portworx-volume
diff --git a/staging/volumes/portworx/portworx-volume-pvcscpod.yaml b/staging/volumes/portworx/portworx-volume-pvcscpod.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: test-container
-    image: k8s.gcr.io/test-webserver
+    image: registry.k8s.io/test-webserver
     volumeMounts:
     - name: test-volume
       mountPath: /test-portworx-volume
diff --git a/staging/volumes/scaleio/README.md b/staging/volumes/scaleio/README.md
@@ -84,7 +84,7 @@ metadata:
   name: pod-0
 spec:
   containers:
-  - image: k8s.gcr.io/test-webserver
+  - image: registry.k8s.io/test-webserver
     name: pod-0
     volumeMounts:
     - mountPath: /test-pd
@@ -221,7 +221,7 @@ metadata:
 spec:
   containers:
     - name: pod-sio-small-container
-      image: k8s.gcr.io/test-webserver
+      image: registry.k8s.io/test-webserver
       volumeMounts:
       - mountPath: /test
         name: test-data
diff --git a/staging/volumes/scaleio/pod-sc-pvc.yaml b/staging/volumes/scaleio/pod-sc-pvc.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
     - name: pod-sio-small-container
-      image: k8s.gcr.io/test-webserver
+      image: registry.k8s.io/test-webserver
       volumeMounts:
       - mountPath: /test
         name: test-data
diff --git a/staging/volumes/scaleio/pod.yaml b/staging/volumes/scaleio/pod.yaml
@@ -4,7 +4,7 @@ metadata:
   name: pod-0
 spec:
   containers:
-  - image: k8s.gcr.io/test-webserver
+  - image: registry.k8s.io/test-webserver
     name: pod-0
     volumeMounts:
     - mountPath: /test-pd
diff --git a/staging/volumes/vsphere/README.md b/staging/volumes/vsphere/README.md
@@ -38,7 +38,7 @@
           name: test-vmdk
         spec:
           containers:
-          - image: k8s.gcr.io/test-webserver
+          - image: registry.k8s.io/test-webserver
             name: test-container
             volumeMounts:
             - mountPath: /test-vmdk
@@ -180,7 +180,7 @@
       spec:
         containers:
         - name: test-container
-          image: k8s.gcr.io/test-webserver
+          image: registry.k8s.io/test-webserver
           volumeMounts:
           - name: test-volume
             mountPath: /test-vmdk
@@ -350,7 +350,7 @@
       spec:
         containers:
         - name: test-container
-          image: k8s.gcr.io/test-webserver
+          image: registry.k8s.io/test-webserver
           volumeMounts:
           - name: test-volume
             mountPath: /test-vmdk
@@ -568,7 +568,7 @@
       spec:
         containers:
         - name: test-container
-          image: k8s.gcr.io/test-webserver
+          image: registry.k8s.io/test-webserver
           volumeMounts:
           - name: test-volume
             mountPath: /test
@@ -653,7 +653,7 @@ vSphere volumes can be consumed by Stateful Sets.
          spec:
            containers:
            - name: nginx
-             image: k8s.gcr.io/nginx-slim:0.8
+             image: registry.k8s.io/nginx-slim:0.8
              ports:
              - containerPort: 80
                name: web
diff --git a/staging/volumes/vsphere/simple-statefulset.yaml b/staging/volumes/vsphere/simple-statefulset.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: k8s.gcr.io/nginx-slim:0.8
+        image: registry.k8s.io/nginx-slim:0.8
         ports:
         - containerPort: 80
           name: web
diff --git a/staging/volumes/vsphere/vsphere-volume-pod.yaml b/staging/volumes/vsphere/vsphere-volume-pod.yaml
@@ -4,7 +4,7 @@ metadata:
   name: test-vmdk
 spec:
   containers:
-  - image: k8s.gcr.io/test-webserver
+  - image: registry.k8s.io/test-webserver
     name: test-container
     volumeMounts:
     - mountPath: /test-vmdk
diff --git a/staging/volumes/vsphere/vsphere-volume-pvcpod.yaml b/staging/volumes/vsphere/vsphere-volume-pvcpod.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: test-container
-    image: k8s.gcr.io/test-webserver
+    image: registry.k8s.io/test-webserver
     volumeMounts:
     - name: test-volume
       mountPath: /test-vmdk
diff --git a/staging/volumes/vsphere/vsphere-volume-pvcscpod.yaml b/staging/volumes/vsphere/vsphere-volume-pvcscpod.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: test-container
-    image: k8s.gcr.io/test-webserver
+    image: registry.k8s.io/test-webserver
     volumeMounts:
     - name: test-volume
       mountPath: /test-vmdk
diff --git a/staging/volumes/vsphere/vsphere-volume-pvcscvsanpod.yaml b/staging/volumes/vsphere/vsphere-volume-pvcscvsanpod.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: test-container
-    image: k8s.gcr.io/test-webserver
+    image: registry.k8s.io/test-webserver
     volumeMounts:
     - name: test-volume
       mountPath: /test

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"containers":[`
`23`	`23`	`{`
`24`	`24`	`"name":"guestbook",`
`25`		`- "image":"k8s.gcr.io/guestbook:v3",`
	`25`	`+ "image":"registry.k8s.io/guestbook:v3",`
`26`	`26`	`"ports":[`
`27`	`27`	`{`
`28`	`28`	`"name":"http-server",`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"containers":[`
`26`	`26`	`{`
`27`	`27`	`"name":"redis-master",`
`28`		`- "image":"k8s.gcr.io/redis:e2e",`
	`28`	`+ "image":"registry.k8s.io/redis:e2e",`
`29`	`29`	`"ports":[`
`30`	`30`	`{`
`31`	`31`	`"name":"redis-server",`