Merge pull request #1543 from thockin-tmp/gcr-vanity

Convert registry to k8s.gcr.io

contributors/design-proposals/apps/indexed-job.md

@@ -761,7 +761,7 @@ spec:
     spec:
       containers:
         - name: c
-          image: gcr.io/google_containers/busybox
+          image: k8s.gcr.io/busybox
           command:
             - 'sh'
             - '-c'

contributors/design-proposals/apps/statefulset-update.md

@@ -479,7 +479,7 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: gcr.io/google_containers/nginx-slim:0.8
+        image: k8s.gcr.io/nginx-slim:0.8
         ports:
         - containerPort: 80
           name: web
@@ -530,7 +530,7 @@ spec:
         type: RollingUpdate
       containers:
       - name: nginx
-        image: gcr.io/google_containers/nginx-slim:0.9
+        image: k8s.gcr.io/nginx-slim:0.9
         ports:
         - containerPort: 80
           name: web
@@ -582,7 +582,7 @@ spec:
           ordinal: 2
       containers:
       - name: nginx
-        image: gcr.io/google_containers/nginx-slim:0.9
+        image: k8s.gcr.io/nginx-slim:0.9
         ports:
         - containerPort: 80
           name: web
@@ -626,7 +626,7 @@ spec:
           ordinal: 3
       containers:
       - name: nginx
-        image: gcr.io/google_containers/nginx-slim:0.9
+        image: k8s.gcr.io/nginx-slim:0.9
         ports:
         - containerPort: 80
           name: web
@@ -670,7 +670,7 @@ spec:
           ordinal: 2
       containers:
       - name: nginx
-        image: gcr.io/google_containers/nginx-slim:0.9
+        image: k8s.gcr.io/nginx-slim:0.9
         ports:
         - containerPort: 80
           name: web
@@ -714,7 +714,7 @@ spec:
           ordinal: 1
       containers:
       - name: nginx
-        image: gcr.io/google_containers/nginx-slim:0.9
+        image: k8s.gcr.io/nginx-slim:0.9
         ports:
         - containerPort: 80
           name: web

contributors/design-proposals/cluster-lifecycle/cluster-deployment.md

@@ -163,5 +163,5 @@ For simpler UX we will provide simple bash scripts that will wrap all basic comm
 One disadvantage of using Ansible is that it adds a dependency on a machine which runs deployment scripts. We will workaround
 this by distributing deployment scripts via a docker image so that user will run the following command to create a cluster:
 
-```docker run gcr.io/google_containers/deploy_kubernetes:v1.2 up --num-nodes=3 --provider=aws```
+```docker run k8s.gcr.io/deploy_kubernetes:v1.2 up --num-nodes=3 --provider=aws```
 

contributors/design-proposals/multi-platform.md

@@ -121,7 +121,7 @@ For reference see [docker/docker#24739](https://github.com/docker/docker/issues/
 
 This has been debated quite a lot about; how we should name non-amd64 docker images that are pushed to `gcr.io`. See [#23059](https://github.com/kubernetes/kubernetes/pull/23059) and [#23009](https://github.com/kubernetes/kubernetes/pull/23009).
 
-This means that the naming `gcr.io/google_containers/${binary}:${version}` should contain a _manifest list_ for future tags.
+This means that the naming `k8s.gcr.io/${binary}:${version}` should contain a _manifest list_ for future tags.
 The manifest list thereby becomes a wrapper that is pointing to the `-${arch}` images.
 This requires `docker-1.10` or newer, which probably means Kubernetes v1.4 and higher.
 
@@ -471,7 +471,7 @@ CMD ["/usr/local/bin/kube-apiserver"]
 ```console
 $ file kube-apiserver
 kube-apiserver: ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), statically linked, not stripped
-$ docker build -t gcr.io/google_containers/kube-apiserver-arm:v1.x.y .
+$ docker build -t k8s.gcr.io/kube-apiserver-arm:v1.x.y .
 Step 1 : FROM armel/busybox
  ---> 9bb1e6d4f824
 Step 2 : ENV kubernetes true

contributors/design-proposals/node/downward_api_resources_limits_requests.md

@@ -162,7 +162,7 @@ metadata:
 spec:
   containers:
     - name: test-container
-      image: gcr.io/google_containers/busybox
+      image: k8s.gcr.io/busybox
       command: [ "/bin/sh","-c", "env" ]
       resources:
         requests:
@@ -186,7 +186,7 @@ metadata:
 spec:
   containers:
     - name: client-container
-      image: gcr.io/google_containers/busybox
+      image: k8s.gcr.io/busybox
       command: ["sh", "-c", "while true; do if [[ -e /etc/labels ]]; then cat /etc/labels; fi; if [[ -e /etc/annotations ]]; then cat /etc/annotations; fi;sleep 5; done"]
       resources:
         requests:
@@ -308,7 +308,7 @@ metadata:
 spec:
   containers:
     - name: test-container
-      image: gcr.io/google_containers/busybox
+      image: k8s.gcr.io/busybox
       command: [ "/bin/sh","-c", "env" ]
       resources:
         requests:
@@ -332,7 +332,7 @@ metadata:
 spec:
   containers:
     - name: client-container
-      image: gcr.io/google_containers/busybox
+      image: k8s.gcr.io/busybox
       command: ["sh", "-c", "while true; do if [[ -e /etc/labels ]]; then cat /etc/labels; fi; if [[ -e /etc/annotations ]]; then cat /etc/annotations; fi; sleep 5; done"]
       resources:
         requests:
@@ -470,7 +470,7 @@ metadata:
 spec:
   containers:
     - name: test-container
-      image: gcr.io/google_containers/busybox
+      image: k8s.gcr.io/busybox
       command: [ "/bin/sh","-c", "env" ]
       resources:
         requests:
@@ -501,7 +501,7 @@ metadata:
 spec:
   containers:
     - name: client-container
-      image: gcr.io/google_containers/busybox
+      image: k8s.gcr.io/busybox
       command: ["sh", "-c","while true; do if [[ -e /etc/labels ]]; then cat /etc/labels; fi; if [[ -e /etc/annotations ]]; then cat /etc/annotations; fi; sleep 5; done"]
       resources:
         requests:
@@ -586,7 +586,7 @@ metadata:
 spec:
   containers:
     - name: test-container
-      image: gcr.io/google_containers/busybox
+      image: k8s.gcr.io/busybox
       command: [ "/bin/sh","-c", "env" ]
       resources:
         requests:

contributors/design-proposals/node/expansion.md

@@ -381,7 +381,7 @@ metadata:
 spec:
   containers:
     - name: test-container
-      image: gcr.io/google_containers/busybox
+      image: k8s.gcr.io/busybox
       command: [ "/bin/sh", "-c", "env" ]
       env:
         - name: PUBLIC_URL
@@ -399,7 +399,7 @@ metadata:
 spec:
   containers:
     - name: test-container
-      image: gcr.io/google_containers/busybox
+      image: k8s.gcr.io/busybox
       command: [ "/bin/sh", "-c", "env" ]
       env:
         - name: POD_NAMESPACE

contributors/design-proposals/node/kubelet-rootfs-distribution.md

@@ -30,7 +30,7 @@ running the Kubelet intentionally is using a chroot and is neither a container n
 The kubelet chroot will essentially operate as follows:
 
 ```
-container-download-and-extract gcr.io/google_containers/hyperkube:v1.4.0 /path/to/chroot
+container-download-and-extract k8s.gcr.io/hyperkube:v1.4.0 /path/to/chroot
 mount --make-shared /var/lib/kubelet
 mount --rbind /var/lib/kubelet /path/to/chroot/var/lib/kubelet
 # And many more mounts, omitted
@@ -65,7 +65,7 @@ This work will also only initially target the GCE provider and `kube-up` method
 
 #### Hyperkube Image Packaging
 
-The Hyperkube image is distributed as part of an official release to the `gcr.io/google_containers` registry, but is not included along with the `kube-up` artifacts used for deployment.
+The Hyperkube image is distributed as part of an official release to the `k8s.gcr.io` registry, but is not included along with the `kube-up` artifacts used for deployment.
 
 This will need to be remediated in order to complete this proposal.
 

contributors/design-proposals/node/seccomp.md

@@ -248,7 +248,7 @@ metadata:
 spec:
   containers:
     - name: explorer
-      image: gcr.io/google_containers/explorer:1.0
+      image: k8s.gcr.io/explorer:1.0
       args: ["-port=8080"]
       ports:
         - containerPort: 8080

contributors/design-proposals/node/troubleshoot-running-pods.md

@@ -569,7 +569,7 @@ application image is constructed. When someone asks for help, Roy's first step
 is to run his team's autodiagnose script:
 
 ```
-% kubectl debug --image=gcr.io/google_containers/autodiagnose nginx-pod-1234
+% kubectl debug --image=k8s.gcr.io/autodiagnose nginx-pod-1234
 ```
 
 ### Appendix 2: Requirements Analysis

contributors/design-proposals/storage/local-storage-overview.md

@@ -266,7 +266,7 @@ The term `Partitions` are used here to describe the main use cases for local sto
           terminationGracePeriodSeconds: 10
           containers:
           - name: nginx
-            image: gcr.io/google_containers/nginx-slim:0.8
+            image: k8s.gcr.io/nginx-slim:0.8
             ports:
             - containerPort: 80
               name: web

contributors/design-proposals/storage/local-storage-pv.md

@@ -461,7 +461,7 @@ spec:
     spec:
       containers:
       - name: provisioner
-        image: "gcr.io/google_containers/local-storage-provisioner:v1.0"
+        image: "k8s.gcr.io/local-storage-provisioner:v1.0"
         imagePullPolicy: Always
         volumeMounts:
         - name: vol1

contributors/design-proposals/storage/volume-snapshotting.md

@@ -466,7 +466,7 @@ metadata:
   name: test-pd
 spec:
   containers:
-  - image: gcr.io/google_containers/test-webserver
+  - image: k8s.gcr.io/test-webserver
     name: test-container
     volumeMounts:
     - mountPath: /test-pd
@@ -486,7 +486,7 @@ metadata:
   name: test-pd
 spec:
   containers:
-  - image: gcr.io/google_containers/test-webserver
+  - image: k8s.gcr.io/test-webserver
     name: test-container
     volumeMounts:
     - mountPath: /test-pd