Use k8s.gcr.io vanity domain for container images

CHANGELOG-1.4.md

@@ -177,15 +177,15 @@ filename | sha256 hash
 ### Other notable changes
 
 * kube-apiserver now drops unneeded path information if an older version of Windows kubectl sends it. ([#44586](https://github.com/kubernetes/kubernetes/pull/44586), [@mml](https://github.com/mml))
-* Bump gcr.io/google_containers/glbc from 0.8.0 to 0.9.2. Release notes: [0.9.0](https://github.com/kubernetes/ingress/releases/tag/0.9.0), [0.9.1](https://github.com/kubernetes/ingress/releases/tag/0.9.1), [0.9.2](https://github.com/kubernetes/ingress/releases/tag/0.9.2) ([#43098](https://github.com/kubernetes/kubernetes/pull/43098), [@timstclair](https://github.com/timstclair))
+* Bump k8s.gcr.io/glbc from 0.8.0 to 0.9.2. Release notes: [0.9.0](https://github.com/kubernetes/ingress/releases/tag/0.9.0), [0.9.1](https://github.com/kubernetes/ingress/releases/tag/0.9.1), [0.9.2](https://github.com/kubernetes/ingress/releases/tag/0.9.2) ([#43098](https://github.com/kubernetes/kubernetes/pull/43098), [@timstclair](https://github.com/timstclair))
 * Patch CVE-2016-8859 in alpine based images: ([#42937](https://github.com/kubernetes/kubernetes/pull/42937), [@timstclair](https://github.com/timstclair))
-    * - gcr.io/google-containers/etcd-empty-dir-cleanup
+    * - k8s.gcr.io/etcd-empty-dir-cleanup
-    * - gcr.io/google-containers/kube-dnsmasq-amd64
+    * - k8s.gcr.io/kube-dnsmasq-amd64
 * Check if pathExists before performing Unmount ([#39311](https://github.com/kubernetes/kubernetes/pull/39311), [@rkouj](https://github.com/rkouj))
 * Unmount operation should not fail if volume is already unmounted ([#38547](https://github.com/kubernetes/kubernetes/pull/38547), [@rkouj](https://github.com/rkouj))
 * Updates base image used for `kube-addon-manager` to latest `python:2.7-slim` and embedded `kubectl` to `v1.3.10`. No functionality changes expected. ([#42842](https://github.com/kubernetes/kubernetes/pull/42842), [@ixdy](https://github.com/ixdy))
 * list-resources: don't fail if the grep fails to match any resources ([#41933](https://github.com/kubernetes/kubernetes/pull/41933), [@ixdy](https://github.com/ixdy))
-* Update gcr.io/google-containers/rescheduler to v0.2.2, which uses busybox as a base image instead of ubuntu. ([#41911](https://github.com/kubernetes/kubernetes/pull/41911), [@ixdy](https://github.com/ixdy))
+* Update k8s.gcr.io/rescheduler to v0.2.2, which uses busybox as a base image instead of ubuntu. ([#41911](https://github.com/kubernetes/kubernetes/pull/41911), [@ixdy](https://github.com/ixdy))
 * Backporting TPR fix to 1.4 ([#42380](https://github.com/kubernetes/kubernetes/pull/42380), [@foxish](https://github.com/foxish))
 * Fix AWS device allocator to only use valid device names ([#41455](https://github.com/kubernetes/kubernetes/pull/41455), [@gnufied](https://github.com/gnufied))
 * Reverts to looking up the current VM in vSphere using the machine's UUID, either obtained via sysfs or via the `vm-uuid` parameter in the cloud configuration file. ([#40892](https://github.com/kubernetes/kubernetes/pull/40892), [@robdaemon](https://github.com/robdaemon))

CHANGELOG-1.5.md

@@ -249,18 +249,18 @@ filename | sha256 hash
 
 * kube-up (with gce/gci and gce/coreos providers) now ensures the authentication token file contains correct tokens for the control plane components, even if the file already exists (ensures upgrades and downgrades work successfully) ([#43676](https://github.com/kubernetes/kubernetes/pull/43676), [@liggitt](https://github.com/liggitt))
 * Patch CVE-2016-8859 in alpine based images: ([#42936](https://github.com/kubernetes/kubernetes/pull/42936), [@timstclair](https://github.com/timstclair))
-    * - gcr.io/google-containers/cluster-proportional-autoscaler-amd64
+    * - k8s.gcr.io/cluster-proportional-autoscaler-amd64
-    * - gcr.io/google-containers/dnsmasq-metrics-amd64
+    * - k8s.gcr.io/dnsmasq-metrics-amd64
-    * - gcr.io/google-containers/etcd-empty-dir-cleanup
+    * - k8s.gcr.io/etcd-empty-dir-cleanup
-    * - gcr.io/google-containers/kube-addon-manager
+    * - k8s.gcr.io/kube-addon-manager
-    * - gcr.io/google-containers/kube-dnsmasq-amd64
+    * - k8s.gcr.io/kube-dnsmasq-amd64
 * - Disable thin_ls due to excessive iops ([#43113](https://github.com/kubernetes/kubernetes/pull/43113), [@dashpole](https://github.com/dashpole))
     * - Ignore .mount cgroups, fixing dissappearing stats
     * - Fix wc goroutine leak
     * - Update aws-sdk-go dependency to 1.6.10
 * PodSecurityPolicy authorization is correctly enforced by the PodSecurityPolicy admission plugin. ([#43489](https://github.com/kubernetes/kubernetes/pull/43489), [@liggitt](https://github.com/liggitt))
-* Bump gcr.io/google_containers/glbc from 0.9.1 to 0.9.2. Release notes: [0.9.2](https://github.com/kubernetes/ingress/releases/tag/0.9.2) ([#43097](https://github.com/kubernetes/kubernetes/pull/43097), [@timstclair](https://github.com/timstclair))
+* Bump k8s.gcr.io/glbc from 0.9.1 to 0.9.2. Release notes: [0.9.2](https://github.com/kubernetes/ingress/releases/tag/0.9.2) ([#43097](https://github.com/kubernetes/kubernetes/pull/43097), [@timstclair](https://github.com/timstclair))
-* Update gcr.io/google-containers/rescheduler to v0.2.2, which uses busybox as a base image instead of ubuntu. ([#41911](https://github.com/kubernetes/kubernetes/pull/41911), [@ixdy](https://github.com/ixdy))
+* Update k8s.gcr.io/rescheduler to v0.2.2, which uses busybox as a base image instead of ubuntu. ([#41911](https://github.com/kubernetes/kubernetes/pull/41911), [@ixdy](https://github.com/ixdy))
 * restored normalization of custom `--etcd-prefix` when `--storage-backend` is set to etcd3 ([#42506](https://github.com/kubernetes/kubernetes/pull/42506), [@liggitt](https://github.com/liggitt))
 
 
@@ -655,7 +655,7 @@ Features for this release were tracked via the use of the [kubernetes/features](
   - [alpha] Introducing the v1alpha1 CRI API to allow pluggable container runtimes; an experimental docker-CRI integration is ready for testing and feedback. ([docs](https://github.com/kubernetes/community/blob/master/contributors/devel/container-runtime-interface.md)) ([kubernetes/features#54](https://github.com/kubernetes/features/issues/54))
   - [alpha] Kubelet launches container in a per pod cgroup hierarchy based on quality of service tier ([kubernetes/features#126](https://github.com/kubernetes/features/issues/126))
   - [beta] Kubelet integrates with memcg notification API to detect when a hard eviction threshold is crossed ([kubernetes/features#125](https://github.com/kubernetes/features/issues/125))
-  - [beta] Introducing the beta version containerized node conformance test gcr.io/google_containers/node-test:0.2 for users to verify node setup. ([docs](http://kubernetes.io/docs/admin/node-conformance/)) ([kubernetes/features#84](https://github.com/kubernetes/features/issues/84))
+  - [beta] Introducing the beta version containerized node conformance test k8s.gcr.io/node-test:0.2 for users to verify node setup. ([docs](http://kubernetes.io/docs/admin/node-conformance/)) ([kubernetes/features#84](https://github.com/kubernetes/features/issues/84))
 - **Scheduling**
   - [alpha] Added support for accounting opaque integer resources. ([docs](http://kubernetes.io/docs/user-guide/compute-resources/#opaque-integer-resources-alpha-feature)) ([kubernetes/features#76](https://github.com/kubernetes/features/issues/76))
   - [beta] PodDisruptionBudget has been promoted to beta, can be used to safely drain nodes while respecting application SLO's ([docs](http://kubernetes.io/docs/tasks/administer-cluster/safely-drain-node/)) ([kubernetes/features#85](https://github.com/kubernetes/features/issues/85))

CHANGELOG-1.6.md

@@ -1935,7 +1935,7 @@ Features for this release were tracked via the use of the [kubernetes/features](
 * Fixes a bug in the OpenStack-Heat kubernetes provider, in the handling of differences between the Identity v2 and Identity v3 APIs ([#40105](https://github.com/kubernetes/kubernetes/pull/40105), [@sc68cal](https://github.com/sc68cal))
 
 ### Container Images
-* Update gcr.io/google-containers/rescheduler to v0.2.2, which uses busybox as a base image instead of ubuntu. ([#41911](https://github.com/kubernetes/kubernetes/pull/41911), [@ixdy](https://github.com/ixdy))
+* Update k8s.gcr.io/rescheduler to v0.2.2, which uses busybox as a base image instead of ubuntu. ([#41911](https://github.com/kubernetes/kubernetes/pull/41911), [@ixdy](https://github.com/ixdy))
 * Remove unnecessary metrics (http/process/go) from being exposed by etcd-version-monitor ([#41807](https://github.com/kubernetes/kubernetes/pull/41807), [@shyamjvs](https://github.com/shyamjvs))
 * Align the hyperkube image to support running binaries at /usr/local/bin/ like the other server images ([#41017](https://github.com/kubernetes/kubernetes/pull/41017), [@luxas](https://github.com/luxas))
 * Bump up GLBC version from 0.9.0-beta to 0.9.1 ([#41037](https://github.com/kubernetes/kubernetes/pull/41037), [@bprashanth](https://github.com/bprashanth))
@@ -1982,7 +1982,7 @@ Features for this release were tracked via the use of the [kubernetes/features](
 * Use kube-dns:1.11.0 ([#39925](https://github.com/kubernetes/kubernetes/pull/39925), [@sadlil](https://github.com/sadlil))
 
 ### DNS Autoscaler
-* Patch CVE-2016-8859 in gcr.io/google-containers/cluster-proportional-autoscaler-amd64 ([#42933](https://github.com/kubernetes/kubernetes/pull/42933), [@timstclair](https://github.com/timstclair))
+* Patch CVE-2016-8859 in k8s.gcr.io/cluster-proportional-autoscaler-amd64 ([#42933](https://github.com/kubernetes/kubernetes/pull/42933), [@timstclair](https://github.com/timstclair))
 
 ### Cluster Autoscaler
 * Allow the Horizontal Pod Autoscaler controller to talk to the metrics API and custom metrics API as standard APIs. ([#41824](https://github.com/kubernetes/kubernetes/pull/41824), [@DirectXMan12](https://github.com/DirectXMan12))
@@ -2149,7 +2149,7 @@ filename | sha256 hash
 * Rescheduler uses taints in v1beta1 and will remove old ones (in version v1alpha1) right after its start. ([#43106](https://github.com/kubernetes/kubernetes/pull/43106), [@piosz](https://github.com/piosz))
 * kubeadm: `kubeadm reset` won't drain and remove the current node anymore ([#42713](https://github.com/kubernetes/kubernetes/pull/42713), [@luxas](https://github.com/luxas))
 * hack/godep-restore.sh: use godep v79 which works ([#42965](https://github.com/kubernetes/kubernetes/pull/42965), [@sttts](https://github.com/sttts))
-* Patch CVE-2016-8859 in gcr.io/google-containers/cluster-proportional-autoscaler-amd64 ([#42933](https://github.com/kubernetes/kubernetes/pull/42933), [@timstclair](https://github.com/timstclair))
+* Patch CVE-2016-8859 in k8s.gcr.io/cluster-proportional-autoscaler-amd64 ([#42933](https://github.com/kubernetes/kubernetes/pull/42933), [@timstclair](https://github.com/timstclair))
 * Disable devicemapper thin_ls due to excessive iops ([#42899](https://github.com/kubernetes/kubernetes/pull/42899), [@dashpole](https://github.com/dashpole))
 
 
@@ -2383,7 +2383,7 @@ filename | sha256 hash
 * Add configurable limits to CronJob resource to specify how many successful and failed jobs are preserved. ([#40932](https://github.com/kubernetes/kubernetes/pull/40932), [@peay](https://github.com/peay))
 * Deprecate outofdisk-transition-frequency and low-diskspace-threshold-mb flags ([#41941](https://github.com/kubernetes/kubernetes/pull/41941), [@dashpole](https://github.com/dashpole))
 * Add OWNERS for sample-apiserver in staging ([#42094](https://github.com/kubernetes/kubernetes/pull/42094), [@sttts](https://github.com/sttts))
-* Update gcr.io/google-containers/rescheduler to v0.2.2, which uses busybox as a base image instead of ubuntu. ([#41911](https://github.com/kubernetes/kubernetes/pull/41911), [@ixdy](https://github.com/ixdy))
+* Update k8s.gcr.io/rescheduler to v0.2.2, which uses busybox as a base image instead of ubuntu. ([#41911](https://github.com/kubernetes/kubernetes/pull/41911), [@ixdy](https://github.com/ixdy))
 * Add storage.k8s.io/v1 API ([#40088](https://github.com/kubernetes/kubernetes/pull/40088), [@jsafrane](https://github.com/jsafrane))
 * Juju - K8s master charm now properly keeps distributed master files in sync for an HA control plane. ([#41351](https://github.com/kubernetes/kubernetes/pull/41351), [@chuckbutler](https://github.com/chuckbutler))
 * Fix zsh completion: unknown file attribute error ([#38104](https://github.com/kubernetes/kubernetes/pull/38104), [@elipapa](https://github.com/elipapa))

api/openapi-spec/swagger.json

@@ -75018,7 +75018,7 @@
     ],
     "properties": {
      "names": {
-      "description": "Names by which this image is known. e.g. [\"gcr.io/google_containers/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]",
+      "description": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]",
       "type": "array",
       "items": {
        "type": "string"

api/swagger-spec/v1.json

@@ -20257,7 +20257,7 @@
       "items": {
        "type": "string"
       },
-      "description": "Names by which this image is known. e.g. [\"gcr.io/google_containers/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]"
+      "description": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]"
      },
      "sizeBytes": {
       "type": "integer",

build/BUILD

@@ -62,7 +62,11 @@ DOCKERIZED_BINARIES = {
 
 [docker_bundle(
     name = binary,
-    images = {"gcr.io/google_containers/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal"},
+    # TODO(thockin): remove the google_containers name after release 1.10.
+    images = {
+        "k8s.gcr.io/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
+        "gcr.io/google_containers/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
+    },
     stamp = True,
 ) for binary in DOCKERIZED_BINARIES.keys()]
 

build/build-image/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # This file creates a standard build environment for building Kubernetes
-FROM gcr.io/google_containers/kube-cross:KUBE_BUILD_IMAGE_CROSS_TAG
+FROM k8s.gcr.io/kube-cross:KUBE_BUILD_IMAGE_CROSS_TAG
 
 # Mark this as a kube-build container
 RUN touch /kube-build-image

build/build-image/cross/Makefile

@@ -21,7 +21,7 @@ TAG=$(shell cat VERSION)
 all: push
 
 build:
-	docker build --pull -t gcr.io/google_containers/$(IMAGE):$(TAG) .
+	docker build --pull -t k8s.gcr.io/$(IMAGE):$(TAG) .
 
 push: build
-	gcloud docker --server=gcr.io -- push gcr.io/google_containers/$(IMAGE):$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push k8s.gcr.io/$(IMAGE):$(TAG)

build/common.sh

@@ -96,7 +96,7 @@ kube::build::get_docker_wrapped_binaries() {
           kube-controller-manager,busybox
           kube-scheduler,busybox
           kube-aggregator,busybox
-          kube-proxy,gcr.io/google-containers/debian-iptables-amd64:${debian_iptables_version}
+          kube-proxy,k8s.gcr.io/debian-iptables-amd64:${debian_iptables_version}
         );;
     "arm")
         local targets=(
@@ -105,7 +105,7 @@ kube::build::get_docker_wrapped_binaries() {
           kube-controller-manager,arm32v7/busybox
           kube-scheduler,arm32v7/busybox
           kube-aggregator,arm32v7/busybox
-          kube-proxy,gcr.io/google-containers/debian-iptables-arm:${debian_iptables_version}
+          kube-proxy,k8s.gcr.io/debian-iptables-arm:${debian_iptables_version}
         );;
     "arm64")
         local targets=(
@@ -114,7 +114,7 @@ kube::build::get_docker_wrapped_binaries() {
           kube-controller-manager,arm64v8/busybox
           kube-scheduler,arm64v8/busybox
           kube-aggregator,arm64v8/busybox
-          kube-proxy,gcr.io/google-containers/debian-iptables-arm64:${debian_iptables_version}
+          kube-proxy,k8s.gcr.io/debian-iptables-arm64:${debian_iptables_version}
         );;
     "ppc64le")
         local targets=(
@@ -123,7 +123,7 @@ kube::build::get_docker_wrapped_binaries() {
           kube-controller-manager,ppc64le/busybox
           kube-scheduler,ppc64le/busybox
           kube-aggregator,ppc64le/busybox
-          kube-proxy,gcr.io/google-containers/debian-iptables-ppc64le:${debian_iptables_version}
+          kube-proxy,k8s.gcr.io/debian-iptables-ppc64le:${debian_iptables_version}
         );;
     "s390x")
         local targets=(
@@ -132,7 +132,7 @@ kube::build::get_docker_wrapped_binaries() {
           kube-controller-manager,s390x/busybox
           kube-scheduler,s390x/busybox
           kube-aggregator,s390x/busybox
-          kube-proxy,gcr.io/google-containers/debian-iptables-s390x:${debian_iptables_version}
+          kube-proxy,k8s.gcr.io/debian-iptables-s390x:${debian_iptables_version}
         );;
   esac
 

build/debian-base/Makefile

@@ -14,7 +14,7 @@
 
 all: build
 
-REGISTRY ?= gcr.io/google-containers
+REGISTRY ?= k8s.gcr.io
 IMAGE ?= debian-base
 BUILD_IMAGE ?= debian-build
 
@@ -71,7 +71,7 @@ endif
 	rm -rf $(TEMP_DIR)
 
 push: build
-	gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
 
 clean:
 	docker rmi -f $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) || true

build/debian-hyperkube-base/Makefile

@@ -15,15 +15,15 @@
 # Build the hyperkube base image. This image is used to build the hyperkube image.
 #
 # Usage:
-#   [ARCH=amd64] [REGISTRY="gcr.io/google-containers"] make (build|push)
+#   [ARCH=amd64] [REGISTRY="k8s.gcr.io"] make (build|push)
 
-REGISTRY?=gcr.io/google-containers
+REGISTRY?=k8s.gcr.io
 IMAGE?=debian-hyperkube-base
 TAG=0.8
 ARCH?=amd64
 CACHEBUST?=1
 
-BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.3
+BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3
 CNI_VERSION=v0.6.0
 
 TEMP_DIR:=$(shell mktemp -d)
@@ -57,4 +57,4 @@ endif
 	rm -rf $(TEMP_DIR)
 
 push: build
-	gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)

build/debian-hyperkube-base/README.md

@@ -1,6 +1,6 @@
 ### debian-hyperkube-base
 
-Serves as the base image for `gcr.io/google-containers/hyperkube-${ARCH}`
+Serves as the base image for `k8s.gcr.io/hyperkube-${ARCH}`
 images.
 
 This image is compiled for multiple architectures.
@@ -12,19 +12,19 @@ If you're editing the Dockerfile or some other thing, please bump the `TAG` in t
 ```console
 # Build for linux/amd64 (default)
 $ make push ARCH=amd64
-# ---> gcr.io/google-containers/debian-hyperkube-base-amd64:TAG
+# ---> k8s.gcr.io/debian-hyperkube-base-amd64:TAG
 
 $ make push ARCH=arm
-# ---> gcr.io/google-containers/debian-hyperkube-base-arm:TAG
+# ---> k8s.gcr.io/debian-hyperkube-base-arm:TAG
 
 $ make push ARCH=arm64
-# ---> gcr.io/google-containers/debian-hyperkube-base-arm64:TAG
+# ---> k8s.gcr.io/debian-hyperkube-base-arm64:TAG
 
 $ make push ARCH=ppc64le
-# ---> gcr.io/google-containers/debian-hyperkube-base-ppc64le:TAG
+# ---> k8s.gcr.io/debian-hyperkube-base-ppc64le:TAG
 
 $ make push ARCH=s390x
-# ---> gcr.io/google-containers/debian-hyperkube-base-s390x:TAG
+# ---> k8s.gcr.io/debian-hyperkube-base-s390x:TAG
 ```
 
 If you don't want to push the images, run `make build` instead

build/debian-iptables/Makefile

@@ -14,7 +14,7 @@
 
 .PHONY:	build push
 
-REGISTRY?="gcr.io/google-containers"
+REGISTRY?="k8s.gcr.io"
 IMAGE=debian-iptables
 TAG=v10
 ARCH?=amd64
@@ -34,7 +34,7 @@ ifeq ($(ARCH),s390x)
 	QEMUARCH=s390x
 endif
 
-BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.3
+BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3
 
 build:
 	cp ./* $(TEMP_DIR)
@@ -55,6 +55,6 @@ endif
 	docker build --pull -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
 
 push: build
-	gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
 
 all: push

build/debian-iptables/README.md

@@ -1,6 +1,6 @@
 ### debian-iptables
 
-Serves as the base image for `gcr.io/google_containers/kube-proxy-${ARCH}` and multiarch (not `amd64`) `gcr.io/google_containers/flannel-${ARCH}` images.
+Serves as the base image for `k8s.gcr.io/kube-proxy-${ARCH}` and multiarch (not `amd64`) `k8s.gcr.io/flannel-${ARCH}` images.
 
 This image is compiled for multiple architectures.
 
@@ -11,19 +11,19 @@ If you're editing the Dockerfile or some other thing, please bump the `TAG` in t
 ```console
 # Build for linux/amd64 (default)
 $ make push ARCH=amd64
-# ---> gcr.io/google_containers/debian-iptables-amd64:TAG
+# ---> k8s.gcr.io/debian-iptables-amd64:TAG
 
 $ make push ARCH=arm
-# ---> gcr.io/google_containers/debian-iptables-arm:TAG
+# ---> k8s.gcr.io/debian-iptables-arm:TAG
 
 $ make push ARCH=arm64
-# ---> gcr.io/google_containers/debian-iptables-arm64:TAG
+# ---> k8s.gcr.io/debian-iptables-arm64:TAG
 
 $ make push ARCH=ppc64le
-# ---> gcr.io/google_containers/debian-iptables-ppc64le:TAG
+# ---> k8s.gcr.io/debian-iptables-ppc64le:TAG
 
 $ make push ARCH=s390x
-# ---> gcr.io/google_containers/debian-iptables-s390x:TAG
+# ---> k8s.gcr.io/debian-iptables-s390x:TAG
 ```
 
 If you don't want to push the images, run `make` or `make build` instead

build/lib/release.sh

@@ -285,7 +285,11 @@ function kube::release::create_docker_images_for_server() {
     local images_dir="${RELEASE_IMAGES}/${arch}"
     mkdir -p "${images_dir}"
 
-    local -r docker_registry="gcr.io/google_containers"
+    local -r docker_registry="k8s.gcr.io"
+    # TODO(thockin): Remove all traces of this after 1.10 release.
+    # The following is the old non-indirected registry name.  To ease the
+    # transition to the new name (above), we are double-tagging saved images.
+    local -r deprecated_registry="gcr.io/google_containers"
     # Docker tags cannot contain '+'
     local docker_tag="${KUBE_GIT_VERSION/+/_}"
     if [[ -z "${docker_tag}" ]]; then
@@ -306,14 +310,17 @@ function kube::release::create_docker_images_for_server() {
       local docker_file_path="${docker_build_path}/Dockerfile"
       local binary_file_path="${binary_dir}/${binary_name}"
       local docker_image_tag="${docker_registry}"
+      local deprecated_image_tag="${deprecated_registry}"
       if [[ ${arch} == "amd64" ]]; then
         # If we are building a amd64 docker image, preserve the original
         # image name
         docker_image_tag+="/${binary_name}:${docker_tag}"
+        deprecated_image_tag+="/${binary_name}:${docker_tag}"
       else
         # If we are building a docker image for another architecture,
         # append the arch in the image tag
         docker_image_tag+="/${binary_name}-${arch}:${docker_tag}"
+        deprecated_image_tag+="/${binary_name}-${arch}:${docker_tag}"
       fi
 
 
@@ -325,7 +332,8 @@ function kube::release::create_docker_images_for_server() {
         printf " FROM ${base_image} \n ADD ${binary_name} /usr/local/bin/${binary_name}\n" > ${docker_file_path}
 
         "${DOCKER[@]}" build --pull -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null
-        "${DOCKER[@]}" save "${docker_image_tag}" > "${binary_dir}/${binary_name}.tar"
+        "${DOCKER[@]}" tag "${docker_image_tag}" ${deprecated_image_tag} >/dev/null
+        "${DOCKER[@]}" save "${docker_image_tag}" ${deprecated_image_tag} > "${binary_dir}/${binary_name}.tar"
         echo "${docker_tag}" > ${binary_dir}/${binary_name}.docker_tag
         rm -rf ${docker_build_path}
         ln "${binary_dir}/${binary_name}.tar" "${images_dir}/"
@@ -344,6 +352,7 @@ function kube::release::create_docker_images_for_server() {
           # not a release
           kube::log::status "Deleting docker image ${docker_image_tag}"
           "${DOCKER[@]}" rmi ${docker_image_tag} &>/dev/null || true
+          "${DOCKER[@]}" rmi ${deprecated_image_tag} &>/dev/null || true
         fi
       ) &
     done

build/pause/Makefile

@@ -14,7 +14,7 @@
 
 .PHONY: all push push-legacy container clean orphan
 
-REGISTRY ?= gcr.io/google_containers
+REGISTRY ?= k8s.gcr.io
 IMAGE = $(REGISTRY)/pause-$(ARCH)
 LEGACY_AMD64_IMAGE = $(REGISTRY)/pause
 
@@ -26,7 +26,7 @@ ARCH ?= amd64
 ALL_ARCH = amd64 arm arm64 ppc64le s390x
 
 CFLAGS = -Os -Wall -Werror -static
-KUBE_CROSS_IMAGE ?= gcr.io/google_containers/kube-cross
+KUBE_CROSS_IMAGE ?= k8s.gcr.io/kube-cross
 KUBE_CROSS_VERSION ?= $(shell cat ../build-image/cross/VERSION)
 
 BIN = pause
@@ -87,13 +87,13 @@ endif
 
 push: .push-$(ARCH)
 .push-$(ARCH): .container-$(ARCH)
-	gcloud docker -- push $(IMAGE):$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push $(IMAGE):$(TAG)
 	touch $@
 
 push-legacy: .push-legacy-$(ARCH)
 .push-legacy-$(ARCH): .container-$(ARCH)
 ifeq ($(ARCH),amd64)
-	gcloud docker -- push $(LEGACY_AMD64_IMAGE):$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push $(LEGACY_AMD64_IMAGE):$(TAG)
 endif
 	touch $@
 

build/root/WORKSPACE

@@ -81,16 +81,16 @@ http_file(
 docker_pull(
     name = "debian-iptables-amd64",
     digest = "sha256:a3b936c0fb98a934eecd2cfb91f73658d402b29116084e778ce9ddb68e55383e",
-    registry = "gcr.io",
+    registry = "k8s.gcr.io",
-    repository = "google-containers/debian-iptables-amd64",
+    repository = "debian-iptables-amd64",
     tag = "v10",  # ignored, but kept here for documentation
 )
 
 docker_pull(
     name = "debian-hyperkube-base-amd64",
     digest = "sha256:fc1b461367730660ac5a40c1eb2d1b23221829acf8a892981c12361383b3742b",
-    registry = "gcr.io",
+    registry = "k8s.gcr.io",
-    repository = "google-containers/debian-hyperkube-base-amd64",
+    repository = "debian-hyperkube-base-amd64",
     tag = "0.8",  # ignored, but kept here for documentation
 )
 

cluster/addons/addon-manager/Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-IMAGE=gcr.io/google-containers/kube-addon-manager
+IMAGE=k8s.gcr.io/kube-addon-manager
 ARCH?=amd64
 TEMP_DIR:=$(shell mktemp -d)
 VERSION=v8.4
@@ -46,12 +46,12 @@ build:
 	docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
 
 push: build
-	gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION)
+	gcloud docker --server=k8s.gcr.io -- push $(IMAGE)-$(ARCH):$(VERSION)
 ifeq ($(ARCH),amd64)
 	# Backward compatibility. TODO: deprecate this image tag
 	docker rmi $(IMAGE):$(VERSION) 2>/dev/null || true
 	docker tag $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION)
-	gcloud docker -- push $(IMAGE):$(VERSION)
+	gcloud docker --server=k8s.gcr.io -- push $(IMAGE):$(VERSION)
 endif
 
 clean:

cluster/addons/addon-manager/README.md

@@ -40,20 +40,20 @@ The `addon-manager` is built for multiple architectures.
 ```console
 # Build for linux/amd64 (default)
 $ make push ARCH=amd64
-# ---> gcr.io/google-containers/kube-addon-manager-amd64:VERSION
+# ---> k8s.gcr.io/kube-addon-manager-amd64:VERSION
-# ---> gcr.io/google-containers/kube-addon-manager:VERSION (image with backwards-compatible naming)
+# ---> k8s.gcr.io/kube-addon-manager:VERSION (image with backwards-compatible naming)
 
 $ make push ARCH=arm
-# ---> gcr.io/google-containers/kube-addon-manager-arm:VERSION
+# ---> k8s.gcr.io/kube-addon-manager-arm:VERSION
 
 $ make push ARCH=arm64
-# ---> gcr.io/google-containers/kube-addon-manager-arm64:VERSION
+# ---> k8s.gcr.io/kube-addon-manager-arm64:VERSION
 
 $ make push ARCH=ppc64le
-# ---> gcr.io/google-containers/kube-addon-manager-ppc64le:VERSION
+# ---> k8s.gcr.io/kube-addon-manager-ppc64le:VERSION
 
 $ make push ARCH=s390x
-# ---> gcr.io/google-containers/kube-addon-manager-s390x:VERSION
+# ---> k8s.gcr.io/kube-addon-manager-s390x:VERSION
 ```
 
 If you don't want to push the images, run `make` or `make build` instead

cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml

@@ -17,7 +17,7 @@ spec:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
-        - image: gcr.io/google_containers/cpvpa-amd64:v0.6.0
+        - image: k8s.gcr.io/cpvpa-amd64:v0.6.0
           name: autoscaler
           command:
             - /cpvpa

cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml

@@ -17,7 +17,7 @@ spec:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
-        - image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.2
+        - image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.2
           name: autoscaler
           command:
             - /cluster-proportional-autoscaler

cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml

@@ -17,7 +17,7 @@ spec:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
-        - image: gcr.io/google_containers/cpvpa-amd64:v0.6.0
+        - image: k8s.gcr.io/cpvpa-amd64:v0.6.0
           name: autoscaler
           command:
             - /cpvpa

cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml

@@ -24,7 +24,7 @@ spec:
         # Any image is permissible as long as:
         # 1. It serves a 404 page at /
         # 2. It serves 200 on a /healthz endpoint
-        image: gcr.io/google_containers/defaultbackend:1.3
+        image: k8s.gcr.io/defaultbackend:1.3
         livenessProbe:
           httpGet:
             path: /healthz

cluster/addons/cluster-monitoring/google/heapster-controller.yaml

@@ -71,7 +71,7 @@ spec:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster-amd64:v1.5.0
+        - image: k8s.gcr.io/heapster-amd64:v1.5.0
           name: heapster
           livenessProbe:
             httpGet:
@@ -84,13 +84,13 @@ spec:
             - /heapster
             - --source=kubernetes.summary_api:''
             - --sink=gcm
-        - image: gcr.io/google_containers/heapster-amd64:v1.5.0
+        - image: k8s.gcr.io/heapster-amd64:v1.5.0
           name: eventer
           command:
             - /eventer
             - --source=kubernetes:''
             - --sink=gcl
-        - image: gcr.io/google_containers/addon-resizer:1.8.1
+        - image: k8s.gcr.io/addon-resizer:1.8.1
           name: heapster-nanny
           resources:
             limits:
@@ -123,7 +123,7 @@ spec:
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
-        - image: gcr.io/google_containers/addon-resizer:1.8.1
+        - image: k8s.gcr.io/addon-resizer:1.8.1
           name: eventer-nanny
           resources:
             limits:

cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml

@@ -71,8 +71,7 @@ spec:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster-amd64:v1.5.0
+        - image: k8s.gcr.io/heapster-amd64:v1.5.0
-
           name: heapster
           livenessProbe:
             httpGet:
@@ -86,13 +85,13 @@ spec:
             - --source=kubernetes.summary_api:''
             - --sink=influxdb:http://monitoring-influxdb:8086
             - --sink=gcm:?metrics=autoscaling
-        - image: gcr.io/google_containers/heapster-amd64:v1.5.0
+        - image: k8s.gcr.io/heapster-amd64:v1.5.0
           name: eventer
           command:
             - /eventer
             - --source=kubernetes:''
             - --sink=gcl
-        - image: gcr.io/google_containers/addon-resizer:1.8.1
+        - image: k8s.gcr.io/addon-resizer:1.8.1
           name: heapster-nanny
           resources:
             limits:
@@ -125,7 +124,7 @@ spec:
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
-        - image: gcr.io/google_containers/addon-resizer:1.8.1
+        - image: k8s.gcr.io/addon-resizer:1.8.1
           name: eventer-nanny
           resources:
             limits:

cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml

@@ -71,7 +71,7 @@ spec:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster-amd64:v1.5.0
+        - image: k8s.gcr.io/heapster-amd64:v1.5.0
           name: heapster
           livenessProbe:
             httpGet:
@@ -84,13 +84,13 @@ spec:
             - /heapster
             - --source=kubernetes.summary_api:''
             - --sink=influxdb:http://monitoring-influxdb:8086
-        - image: gcr.io/google_containers/heapster-amd64:v1.5.0
+        - image: k8s.gcr.io/heapster-amd64:v1.5.0
           name: eventer
           command:
             - /eventer
             - --source=kubernetes:''
             - --sink=influxdb:http://monitoring-influxdb:8086
-        - image: gcr.io/google_containers/addon-resizer:1.8.1
+        - image: k8s.gcr.io/addon-resizer:1.8.1
           name: heapster-nanny
           resources:
             limits:
@@ -123,7 +123,7 @@ spec:
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
-        - image: gcr.io/google_containers/addon-resizer:1.8.1
+        - image: k8s.gcr.io/addon-resizer:1.8.1
           name: eventer-nanny
           resources:
             limits:

cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml

@@ -29,7 +29,7 @@ spec:
         operator: "Exists"
       containers:
         - name: influxdb
-          image: gcr.io/google_containers/heapster-influxdb-amd64:v1.3.3
+          image: k8s.gcr.io/heapster-influxdb-amd64:v1.3.3
           resources:
             limits:
               cpu: 100m
@@ -46,7 +46,7 @@ spec:
           - name: influxdb-persistent-storage
             mountPath: /data
         - name: grafana
-          image: gcr.io/google_containers/heapster-grafana-amd64:v4.4.3
+          image: k8s.gcr.io/heapster-grafana-amd64:v4.4.3
           env:
           resources:
             # keep request = limit to keep this container in guaranteed class

cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml

@@ -56,7 +56,7 @@ spec:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster-amd64:v1.5.0
+        - image: k8s.gcr.io/heapster-amd64:v1.5.0
           name: heapster
           livenessProbe:
             httpGet:
@@ -71,7 +71,7 @@ spec:
             - --sink=stackdriver:?cluster_name={{ cluster_name }}&use_old_resources={{ use_old_resources }}&use_new_resources={{ use_new_resources }}&min_interval_sec=100&batch_export_timeout_sec=110
         # BEGIN_PROMETHEUS_TO_SD
         - name: prom-to-sd
-          image: gcr.io/google-containers/prometheus-to-sd:v0.2.2
+          image: k8s.gcr.io/prometheus-to-sd:v0.2.2
           command:
             - /monitor
             - --source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count
@@ -89,7 +89,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
         # END_PROMETHEUS_TO_SD
-        - image: gcr.io/google_containers/addon-resizer:1.8.1
+        - image: k8s.gcr.io/addon-resizer:1.8.1
           name: heapster-nanny
           resources:
             limits:

cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml

@@ -56,7 +56,7 @@ spec:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster-amd64:v1.5.0
+        - image: k8s.gcr.io/heapster-amd64:v1.5.0
           name: heapster
           livenessProbe:
             httpGet:
@@ -68,7 +68,7 @@ spec:
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
-        - image: gcr.io/google_containers/addon-resizer:1.8.1
+        - image: k8s.gcr.io/addon-resizer:1.8.1
           name: heapster-nanny
           resources:
             limits:

cluster/addons/dashboard/dashboard-controller.yaml

@@ -29,7 +29,7 @@ spec:
     spec:
       containers:
       - name: kubernetes-dashboard
-        image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.0
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.0
         resources:
           limits:
             cpu: 100m

cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml

@@ -77,7 +77,7 @@ spec:
     spec:
       containers:
       - name: autoscaler
-        image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.2-r2
+        image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.2-r2
         resources:
             requests:
                 cpu: "20m"

cluster/addons/dns/kube-dns.yaml.base

@@ -94,7 +94,7 @@ spec:
           optional: true
       containers:
       - name: kubedns
-        image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7
+        image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.7
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -145,7 +145,7 @@ spec:
         - name: kube-dns-config
           mountPath: /kube-dns-config
       - name: dnsmasq
-        image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7
+        image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.7
         livenessProbe:
           httpGet:
             path: /healthcheck/dnsmasq
@@ -184,7 +184,7 @@ spec:
         - name: kube-dns-config
           mountPath: /etc/k8s/dns/dnsmasq-nanny
       - name: sidecar
-        image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7
+        image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.7
         livenessProbe:
           httpGet:
             path: /metrics

cluster/addons/dns/kube-dns.yaml.in

@@ -94,7 +94,7 @@ spec:
           optional: true
       containers:
       - name: kubedns
-        image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7
+        image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.7
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -145,7 +145,7 @@ spec:
         - name: kube-dns-config
           mountPath: /kube-dns-config
       - name: dnsmasq
-        image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7
+        image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.7
         livenessProbe:
           httpGet:
             path: /healthcheck/dnsmasq
@@ -184,7 +184,7 @@ spec:
         - name: kube-dns-config
           mountPath: /etc/k8s/dns/dnsmasq-nanny
       - name: sidecar
-        image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7
+        image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.7
         livenessProbe:
           httpGet:
             path: /metrics

cluster/addons/dns/kube-dns.yaml.sed

@@ -94,7 +94,7 @@ spec:
           optional: true
       containers:
       - name: kubedns
-        image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7
+        image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.7
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -145,7 +145,7 @@ spec:
         - name: kube-dns-config
           mountPath: /kube-dns-config
       - name: dnsmasq
-        image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7
+        image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.7
         livenessProbe:
           httpGet:
             path: /healthcheck/dnsmasq
@@ -184,7 +184,7 @@ spec:
         - name: kube-dns-config
           mountPath: /etc/k8s/dns/dnsmasq-nanny
       - name: sidecar
-        image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7
+        image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.7
         livenessProbe:
           httpGet:
             path: /metrics

cluster/addons/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml

@@ -23,4 +23,4 @@ spec:
   dnsPolicy: Default
   containers:
   - name: etcd-empty-dir-cleanup
-    image: gcr.io/google-containers/etcd-empty-dir-cleanup:3.0.14.0
+    image: k8s.gcr.io/etcd-empty-dir-cleanup:3.0.14.0

cluster/addons/fluentd-elasticsearch/es-image/Makefile

@@ -14,7 +14,7 @@
 
 .PHONY:	binary build push
 
-PREFIX = gcr.io/google-containers
+PREFIX = k8s.gcr.io
 IMAGE = elasticsearch
 TAG = v5.6.4
 
@@ -22,7 +22,7 @@ build:
 	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
 
 push:
-	gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push $(PREFIX)/$(IMAGE):$(TAG)
 
 binary:
 	CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-w" elasticsearch_logging_discovery.go

cluster/addons/fluentd-elasticsearch/es-statefulset.yaml

@@ -73,7 +73,7 @@ spec:
     spec:
       serviceAccountName: elasticsearch-logging
       containers:
-      - image: gcr.io/google-containers/elasticsearch:v5.6.4
+      - image: k8s.gcr.io/elasticsearch:v5.6.4
         name: elasticsearch-logging
         resources:
           # need more cpu upon initialization, therefore burstable class

cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml

@@ -75,7 +75,7 @@ spec:
       serviceAccountName: fluentd-es
       containers:
       - name: fluentd-es
-        image: gcr.io/google-containers/fluentd-elasticsearch:v2.0.2
+        image: k8s.gcr.io/fluentd-elasticsearch:v2.0.2
         env:
         - name: FLUENTD_ARGS
           value: --no-supervisor -q

cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile

@@ -14,7 +14,7 @@
 
 .PHONY:	build push
 
-PREFIX = gcr.io/google-containers
+PREFIX = k8s.gcr.io
 IMAGE = fluentd-elasticsearch
 TAG = v2.0.2
 
@@ -22,4 +22,4 @@ build:
 	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
 
 push:
-	gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push $(PREFIX)/$(IMAGE):$(TAG)

cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md

@@ -4,11 +4,11 @@ that collects Docker container log files using [Fluentd][fluentd]
 and sends them to an instance of [Elasticsearch][elasticsearch].
 This image is designed to be used as part of the [Kubernetes][kubernetes]
 cluster bring up process. The image resides at GCR under the name
-[gcr.io/google-containers/fluentd-elasticsearch][image].
+[k8s.gcr.io/fluentd-elasticsearch][image].
 
 [fluentd]: http://www.fluentd.org/
 [elasticsearch]: https://www.elastic.co/products/elasticsearch
 [kubernetes]: https://kubernetes.io
-[image]: https://gcr.io/google-containers/fluentd-elasticsearch
+[image]: https://k8s.gcr.io/fluentd-elasticsearch
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/fluentd-elasticsearch/fluentd-es-image/README.md?pixel)]()

cluster/addons/fluentd-gcp/event-exporter.yaml

@@ -47,12 +47,12 @@ spec:
       serviceAccountName: event-exporter-sa
       containers:
       - name: event-exporter
-        image: gcr.io/google-containers/event-exporter:v0.1.7
+        image: k8s.gcr.io/event-exporter:v0.1.7
         command:
         - '/event-exporter'
       # BEGIN_PROMETHEUS_TO_SD
       - name: prometheus-to-sd-exporter
-        image: gcr.io/google-containers/prometheus-to-sd:v0.2.2
+        image: k8s.gcr.io/prometheus-to-sd:v0.2.2
         command:
           - /monitor
           - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons

cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml

@@ -27,7 +27,7 @@ spec:
       dnsPolicy: Default
       containers:
       - name: fluentd-gcp
-        image: gcr.io/google-containers/fluentd-gcp:2.0.11
+        image: k8s.gcr.io/fluentd-gcp:2.0.11
         env:
         - name: FLUENTD_ARGS
           value: --no-supervisor -q
@@ -82,7 +82,7 @@ spec:
               fi;
       # BEGIN_PROMETHEUS_TO_SD
       - name: prometheus-to-sd-exporter
-        image: gcr.io/google-containers/prometheus-to-sd:v0.2.2
+        image: k8s.gcr.io/prometheus-to-sd:v0.2.2
         command:
           - /monitor
           - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons

cluster/addons/ip-masq-agent/ip-masq-agent.yaml

@@ -28,7 +28,7 @@ spec:
       hostNetwork: true
       containers:
       - name: ip-masq-agent
-        image: gcr.io/google-containers/ip-masq-agent-amd64:v2.0.2
+        image: k8s.gcr.io/ip-masq-agent-amd64:v2.0.2
         resources:
           requests:
             cpu: 10m

cluster/addons/metadata-proxy/gce/metadata-proxy.yaml

@@ -38,7 +38,7 @@ spec:
       dnsPolicy: Default
       containers:
       - name: metadata-proxy
-        image: gcr.io/google_containers/metadata-proxy:v0.1.6
+        image: k8s.gcr.io/metadata-proxy:v0.1.6
         securityContext:
           privileged: true
         # Request and limit resources to get guaranteed QoS.
@@ -51,7 +51,7 @@ spec:
             cpu: "30m"
       # BEGIN_PROMETHEUS_TO_SD
       - name: prometheus-to-sd-exporter
-        image: gcr.io/google_containers/prometheus-to-sd:v0.2.2
+        image: k8s.gcr.io/prometheus-to-sd:v0.2.2
         # Request and limit resources to get guaranteed QoS.
         resources:
           requests:

cluster/addons/metrics-server/metrics-server-deployment.yaml

@@ -47,7 +47,7 @@ spec:
       serviceAccountName: metrics-server
       containers:
       - name: metrics-server
-        image: gcr.io/google_containers/metrics-server-amd64:v0.2.0
+        image: k8s.gcr.io/metrics-server-amd64:v0.2.0
         command:
         - /metrics-server
         - --source=kubernetes.summary_api:''
@@ -56,7 +56,7 @@ spec:
           name: https
           protocol: TCP
       - name: metrics-server-nanny
-        image: gcr.io/google_containers/addon-resizer:1.8.1
+        image: k8s.gcr.io/addon-resizer:1.8.1
         resources:
           limits:
             cpu: 100m

cluster/addons/node-problem-detector/npd.yaml

@@ -43,7 +43,7 @@ spec:
     spec:
       containers:
       - name: node-problem-detector
-        image: gcr.io/google_containers/node-problem-detector:v0.4.1
+        image: k8s.gcr.io/node-problem-detector:v0.4.1
         command:
         - "/bin/sh"
         - "-c"

cluster/addons/python-image/Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-IMAGE=gcr.io/google_containers/python
+IMAGE=k8s.gcr.io/python
 VERSION=v1
 
 .PHONY: build push
@@ -21,5 +21,5 @@ build:
 	docker build --pull -t "$(IMAGE):$(VERSION)" .
 
 push:
-	gcloud docker -- push "$(IMAGE):$(VERSION)"
+	gcloud docker --server=k8s.gcr.io -- push "$(IMAGE):$(VERSION)"
 

cluster/addons/registry/README.md

@@ -199,7 +199,7 @@ spec:
     spec:
       containers:
       - name: kube-registry-proxy
-        image: gcr.io/google_containers/kube-registry-proxy:0.4
+        image: k8s.gcr.io/kube-registry-proxy:0.4
         resources:
           limits:
             cpu: 100m

cluster/addons/registry/images/Makefile

@@ -15,10 +15,10 @@
 .PHONY: build push vet test clean
 
 TAG = 0.4
-REPO = gcr.io/google_containers/kube-registry-proxy
+REPO = k8s.gcr.io/kube-registry-proxy
 
 build:
 	docker build --pull -t $(REPO):$(TAG) .
 
 push:
-	gcloud docker -- push $(REPO):$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push $(REPO):$(TAG)

cluster/common.sh

@@ -478,7 +478,7 @@ function stage-images() {
 
   local docker_cmd=("docker")
 
-  if [[ "${KUBE_DOCKER_REGISTRY}" == "gcr.io/"* ]]; then
+  if [[ "${KUBE_DOCKER_REGISTRY}" =~ "gcr.io/" ]]; then
     local docker_push_cmd=("gcloud" "docker")
   else
     local docker_push_cmd=("${docker_cmd[@]}")
@@ -493,7 +493,7 @@ function stage-images() {
     (
       "${docker_cmd[@]}" load -i "${temp_dir}/kubernetes/server/bin/${binary}.tar"
       "${docker_cmd[@]}" rmi "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}" 2>/dev/null || true
-      "${docker_cmd[@]}" tag "gcr.io/google_containers/${binary}:${docker_tag}" "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}"
+      "${docker_cmd[@]}" tag "k8s.gcr.io/${binary}:${docker_tag}" "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}"
       "${docker_push_cmd[@]}" push "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}"
     ) &> "${temp_dir}/${binary}-push.log" &
   done

cluster/gce/config-test.sh

@@ -151,7 +151,7 @@ ENABLE_METRICS_SERVER="${KUBE_ENABLE_METRICS_SERVER:-true}"
 # Useful for scheduling heapster in large clusters with nodes of small size.
 HEAPSTER_MACHINE_TYPE="${HEAPSTER_MACHINE_TYPE:-}"
 
-# Set etcd image (e.g. gcr.io/google_containers/etcd) and version (e.g. 3.1.10) if you need
+# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.1.10) if you need
 # non-default version.
 ETCD_IMAGE="${TEST_ETCD_IMAGE:-}"
 ETCD_DOCKER_REPOSITORY="${TEST_ETCD_DOCKER_REPOSITORY:-}"

cluster/gce/container-linux/configure-helper.sh

@@ -671,7 +671,7 @@ function prepare-kube-proxy-manifest-variables {
   remove-salt-config-comments "${src_file}"
 
   local -r kubeconfig="--kubeconfig=/var/lib/kube-proxy/kubeconfig"
-  local kube_docker_registry="gcr.io/google_containers"
+  local kube_docker_registry="k8s.gcr.io"
   if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then
     kube_docker_registry=${KUBE_DOCKER_REGISTRY}
   fi
@@ -853,7 +853,7 @@ function compute-master-manifest-variables {
     CLOUD_CONFIG_VOLUME="{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"/etc/gce.conf\", \"type\": \"FileOrCreate\"}},"
     CLOUD_CONFIG_MOUNT="{\"name\": \"cloudconfigmount\",\"mountPath\": \"/etc/gce.conf\", \"readOnly\": true},"
   fi
-  DOCKER_REGISTRY="gcr.io/google_containers"
+  DOCKER_REGISTRY="k8s.gcr.io"
   if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then
     DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY}"
   fi

cluster/gce/container-linux/configure.sh

@@ -140,12 +140,12 @@ function install-kube-binary-config {
   echo "Downloading k8s manifests tar"
   download-or-bust "${manifests_tar_hash}" "${manifests_tar_urls[@]}"
   tar xzf "${KUBE_HOME}/${manifests_tar}" -C "${dst_dir}" --overwrite
-  local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-gcr.io/google_containers}"
+  local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-k8s.gcr.io}"
-  if [[ "${kube_addon_registry}" != "gcr.io/google_containers" ]]; then
+  if [[ "${kube_addon_registry}" != "k8s.gcr.io" ]]; then
     find "${dst_dir}" -name \*.yaml -or -name \*.yaml.in | \
-      xargs sed -ri "s@(image:\s.*)gcr.io/google_containers@\1${kube_addon_registry}@"
+      xargs sed -ri "s@(image:\s.*)k8s.gcr.io@\1${kube_addon_registry}@"
     find "${dst_dir}" -name \*.manifest -or -name \*.json | \
-      xargs sed -ri "s@(image\":\s+\")gcr.io/google_containers@\1${kube_addon_registry}@"
+      xargs sed -ri "s@(image\":\s+\")k8s.gcr.io@\1${kube_addon_registry}@"
   fi
   cp "${dst_dir}/kubernetes/gci-trusty/container-linux-configure-helper.sh" "${KUBE_HOME}/bin/configure-helper.sh"
   chmod -R 755 "${kube_bin}"

cluster/gce/gci/configure-helper.sh

@@ -1274,7 +1274,7 @@ function prepare-kube-proxy-manifest-variables {
   remove-salt-config-comments "${src_file}"
 
   local -r kubeconfig="--kubeconfig=/var/lib/kube-proxy/kubeconfig"
-  local kube_docker_registry="gcr.io/google_containers"
+  local kube_docker_registry="k8s.gcr.io"
   if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then
     kube_docker_registry=${KUBE_DOCKER_REGISTRY}
   fi
@@ -1446,7 +1446,7 @@ function compute-master-manifest-variables {
     CLOUD_CONFIG_VOLUME="{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"/etc/gce.conf\", \"type\": \"FileOrCreate\"}},"
     CLOUD_CONFIG_MOUNT="{\"name\": \"cloudconfigmount\",\"mountPath\": \"/etc/gce.conf\", \"readOnly\": true},"
   fi
-  DOCKER_REGISTRY="gcr.io/google_containers"
+  DOCKER_REGISTRY="k8s.gcr.io"
   if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then
     DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY}"
   fi
@@ -2325,7 +2325,7 @@ spec:
   - name: vol
   containers:
   - name: pv-recycler
-    image: gcr.io/google_containers/busybox:1.27
+    image: k8s.gcr.io/busybox:1.27
     command:
     - /bin/sh
     args:

cluster/gce/gci/configure.sh

@@ -221,12 +221,12 @@ function install-kube-manifests {
   echo "Downloading k8s manifests tar"
   download-or-bust "${manifests_tar_hash}" "${manifests_tar_urls[@]}"
   tar xzf "${KUBE_HOME}/${manifests_tar}" -C "${dst_dir}" --overwrite
-  local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-gcr.io/google_containers}"
+  local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-k8s.gcr.io}"
-  if [[ "${kube_addon_registry}" != "gcr.io/google_containers" ]]; then
+  if [[ "${kube_addon_registry}" != "k8s.gcr.io" ]]; then
     find "${dst_dir}" -name \*.yaml -or -name \*.yaml.in | \
-      xargs sed -ri "s@(image:\s.*)gcr.io/google_containers@\1${kube_addon_registry}@"
+      xargs sed -ri "s@(image:\s.*)k8s.gcr.io@\1${kube_addon_registry}@"
     find "${dst_dir}" -name \*.manifest -or -name \*.json | \
-      xargs sed -ri "s@(image\":\s+\")gcr.io/google_containers@\1${kube_addon_registry}@"
+      xargs sed -ri "s@(image\":\s+\")k8s.gcr.io@\1${kube_addon_registry}@"
   fi
   cp "${dst_dir}/kubernetes/gci-trusty/gci-configure-helper.sh" "${KUBE_BIN}/configure-helper.sh"
   cp "${dst_dir}/kubernetes/gci-trusty/health-monitor.sh" "${KUBE_BIN}/health-monitor.sh"

cluster/gce/gci/mounter/Makefile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 TAG=v2
-REGISTRY=gcr.io/google_containers
+REGISTRY=k8s.gcr.io
 IMAGE=gci-mounter
 
 all: container
@@ -22,7 +22,7 @@ container:
 	docker build --pull -t ${REGISTRY}/${IMAGE}:${TAG} .
 
 push: 
-	gcloud docker -- push ${REGISTRY}/${IMAGE}:${TAG}
+	gcloud docker --server=k8s.gcr.io -- push ${REGISTRY}/${IMAGE}:${TAG}
 
 upload:
 	./stage-upload.sh ${TAG} ${REGISTRY}/${IMAGE}:${TAG}

cluster/gce/util.sh

@@ -236,12 +236,12 @@ function set-preferred-region() {
   fi
 
   # If we're using regional GCR, and we're outside the US, go to the
-  # regional registry. The gcr.io/google_containers registry is
+  # regional registry. The k8s.gcr.io registry is
   # appropriate for US (for now).
   if [[ "${REGIONAL_KUBE_ADDONS}" == "true" ]] && [[ "${preferred}" != "us" ]]; then
-    KUBE_ADDON_REGISTRY="${preferred}.gcr.io/google_containers"
+    KUBE_ADDON_REGISTRY="${preferred}.k8s.gcr.io"
   else
-    KUBE_ADDON_REGISTRY="gcr.io/google_containers"
+    KUBE_ADDON_REGISTRY="k8s.gcr.io"
   fi
 
   if [[ "${ENABLE_DOCKER_REGISTRY_CACHE:-}" == "true" ]]; then

cluster/get-kube-local.sh

@@ -97,7 +97,7 @@ function create_cluster {
   --pid=host \
   --privileged=true \
   -d \
-  gcr.io/google_containers/hyperkube-${arch}:${release} \
+  k8s.gcr.io/hyperkube-${arch}:${release} \
     /hyperkube kubelet \
       --containerized \
       --hostname-override="127.0.0.1" \

cluster/images/etcd-empty-dir-cleanup/Makefile

@@ -15,7 +15,7 @@
 .PHONY:	build push
 
 ETCD_VERSION = 3.0.14
-IMAGE = gcr.io/google-containers/etcd-empty-dir-cleanup
+IMAGE = k8s.gcr.io/etcd-empty-dir-cleanup
 TAG = 3.0.14.0
 
 clean:
@@ -29,4 +29,4 @@ build: clean
 	rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
 
 push: build
-	gcloud docker -- push $(IMAGE):$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push $(IMAGE):$(TAG)

cluster/images/etcd-version-monitor/Makefile

@@ -15,11 +15,11 @@
 # Build the etcd-version-monitor image
 #
 # Usage:
-# 	[GOLANG_VERSION=1.8.3] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push)
+# 	[GOLANG_VERSION=1.8.3] [REGISTRY=k8s.gcr.io] [TAG=test] make (build|push)
 # TODO(shyamjvs): Support architectures other than amd64 if needed.
 ARCH:=amd64
 GOLANG_VERSION?=1.8.3
-REGISTRY?=gcr.io/google-containers
+REGISTRY?=k8s.gcr.io
 TAG?=0.1.1
 IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG)
 CURRENT_DIR:=$(pwd)
@@ -30,13 +30,17 @@ build:
 	cp etcd-version-monitor.go Dockerfile $(TEMP_DIR)
 
 	# Compile etcd-version-monitor.
-	docker run -it -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes -v $(TEMP_DIR):/build -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \
+	docker run -it \
-		/bin/bash -c "CGO_ENABLED=0 go build -o /build/etcd-version-monitor k8s.io/kubernetes/cluster/images/etcd-version-monitor"
+	    -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes \
+	    -v $(TEMP_DIR):/build \
+	    -e GOARCH=$(ARCH) \
+	    golang:$(GOLANG_VERSION) \
+	    /bin/bash -c "CGO_ENABLED=0 go build -o /build/etcd-version-monitor k8s.io/kubernetes/cluster/images/etcd-version-monitor"
 
 	docker build -t $(IMAGE) $(TEMP_DIR)
 
 push: build
-	gcloud docker -- push $(IMAGE)
+	gcloud docker --server=k8s.gcr.io -- push $(IMAGE)
 
 all: build
 

cluster/images/etcd-version-monitor/README.md

@@ -18,7 +18,7 @@ latency metrics (`etcd_grpc_unary_requests_duration_seconds`) to be exposed.
 
 To run this tool as a docker container:
 - make build
-- docker run --net=host -i -t gcr.io/google_containers/etcd-version-monitor:test /etcd-version-monitor --logtostderr
+- docker run --net=host -i -t k8s.gcr.io/etcd-version-monitor:test /etcd-version-monitor --logtostderr
 
 To run this as a pod on the kubernetes cluster:
 - Place the 'etcd-version-monitor.yaml' in the manifests directory of

cluster/images/etcd-version-monitor/etcd-version-monitor.yaml

@@ -7,7 +7,7 @@ spec:
   hostNetwork: true
   containers:
   - name: etcd-version-monitor
-    image: gcr.io/google-containers/etcd-version-monitor:0.1.0
+    image: k8s.gcr.io/etcd-version-monitor:0.1.0
     command:
     - /etcd-version-monitor
     - --logtostderr

cluster/images/etcd/Makefile

@@ -15,7 +15,7 @@
 # Build the etcd image
 #
 # Usage:
-# 	[TAGS=2.2.1 2.3.7 3.0.17 3.1.10] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
+# 	[TAGS=2.2.1 2.3.7 3.0.17 3.1.10] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
 
 # The image contains different etcd versions to simplify
 # upgrades. Thus be careful when removing any tag from here.
@@ -29,7 +29,7 @@
 TAGS?=2.2.1 2.3.7 3.0.17 3.1.10
 REGISTRY_TAG?=3.1.10
 ARCH?=amd64
-REGISTRY?=gcr.io/google_containers
+REGISTRY?=k8s.gcr.io
 GOLANG_VERSION?=1.7.6
 GOARM=7
 TEMP_DIR:=$(shell mktemp -d)
@@ -105,12 +105,12 @@ endif
 	docker build --pull -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR)
 
 push: build
-	gcloud docker -- push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)
+	gcloud docker --server=k8s.gcr.io -- push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)
 
 ifeq ($(ARCH),amd64)
 	# Backward compatibility. TODO: deprecate this image tag
 	docker tag $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(REGISTRY)/etcd:$(REGISTRY_TAG)
-	gcloud docker -- push $(REGISTRY)/etcd:$(REGISTRY_TAG)
+	gcloud docker --server=k8s.gcr.io -- push $(REGISTRY)/etcd:$(REGISTRY_TAG)
 endif
 
 all: build

cluster/images/etcd/README.md

@@ -10,20 +10,20 @@ For other architectures, `etcd` is cross-compiled from source. Arch-specific `bu
 ```console
 # Build for linux/amd64 (default)
 $ make push ARCH=amd64
-# ---> gcr.io/google_containers/etcd-amd64:TAG
+# ---> k8s.gcr.io/etcd-amd64:TAG
-# ---> gcr.io/google_containers/etcd:TAG
+# ---> k8s.gcr.io/etcd:TAG
 
 $ make push ARCH=arm
-# ---> gcr.io/google_containers/etcd-arm:TAG
+# ---> k8s.gcr.io/etcd-arm:TAG
 
 $ make push ARCH=arm64
-# ---> gcr.io/google_containers/etcd-arm64:TAG
+# ---> k8s.gcr.io/etcd-arm64:TAG
 
 $ make push ARCH=ppc64le
-# ---> gcr.io/google_containers/etcd-ppc64le:TAG
+# ---> k8s.gcr.io/etcd-ppc64le:TAG
 
 $ make push ARCH=s390x
-# ---> gcr.io/google_containers/etcd-s390x:TAG
+# ---> k8s.gcr.io/etcd-s390x:TAG
 ```
 
 If you don't want to push the images, run `make` or `make build` instead

cluster/images/hyperkube/BUILD

@@ -27,7 +27,7 @@ docker_build(
 
 docker_bundle(
     name = "hyperkube",
-    images = {"gcr.io/google-containers/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"},
+    images = {"k8s.gcr.io/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"},
     stamp = True,
 )
 

cluster/images/hyperkube/Dockerfile

@@ -16,7 +16,7 @@ FROM BASEIMAGE
 
 # Create symlinks for each hyperkube server
 # Also create symlinks to /usr/local/bin/ where the server image binaries live, so the hyperkube image may be
-# used instead of gcr.io/google_containers/kube-* without any modifications.
+# used instead of k8s.gcr.io/kube-* without any modifications.
 # TODO: replace manual symlink creation with --make-symlink command once
 # cross-building with qemu supports go binaries. See #28702
 # RUN /hyperkube --make-symlinks

cluster/images/hyperkube/Makefile

@@ -15,13 +15,13 @@
 # Build the hyperkube image.
 #
 # Usage:
-#   [ARCH=amd64] [REGISTRY="gcr.io/google-containers"] make (build|push) VERSION={some_released_version_of_kubernetes}
+#   [ARCH=amd64] [REGISTRY="k8s.gcr.io"] make (build|push) VERSION={some_released_version_of_kubernetes}
 
-REGISTRY?=gcr.io/google-containers
+REGISTRY?=k8s.gcr.io
 ARCH?=amd64
 HYPERKUBE_BIN?=_output/dockerized/bin/linux/$(ARCH)/hyperkube
 
-BASEIMAGE=gcr.io/google-containers/debian-hyperkube-base-$(ARCH):0.8
+BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.8
 TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
 
 all: build
@@ -44,11 +44,11 @@ endif
 	rm -rf "${TEMP_DIR}"
 
 push: build
-	gcloud docker -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
+	gcloud docker --server=k8s.gcr.io -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
 ifeq ($(ARCH),amd64)
 	docker rmi ${REGISTRY}/hyperkube:${VERSION} 2>/dev/null || true
 	docker tag ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION}
-	gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION}
+	gcloud docker --server=k8s.gcr.io -- push ${REGISTRY}/hyperkube:${VERSION}
 endif
 
 .PHONY: build push all

cluster/images/hyperkube/README.md

@@ -10,23 +10,23 @@
 $ build/run.sh make cross
 
 # Build for linux/amd64 (default)
-# export REGISTRY=$HOST/$ORG to switch from gcr.io/google_containers
+# export REGISTRY=$HOST/$ORG to switch from k8s.gcr.io
 
 $ make push VERSION={target_version} ARCH=amd64
-# ---> gcr.io/google_containers/hyperkube-amd64:VERSION
+# ---> k8s.gcr.io/hyperkube-amd64:VERSION
-# ---> gcr.io/google_containers/hyperkube:VERSION (image with backwards-compatible naming)
+# ---> k8s.gcr.io/hyperkube:VERSION (image with backwards-compatible naming)
 
 $ make push VERSION={target_version} ARCH=arm
-# ---> gcr.io/google_containers/hyperkube-arm:VERSION
+# ---> k8s.gcr.io/hyperkube-arm:VERSION
 
 $ make push VERSION={target_version} ARCH=arm64
-# ---> gcr.io/google_containers/hyperkube-arm64:VERSION
+# ---> k8s.gcr.io/hyperkube-arm64:VERSION
 
 $ make push VERSION={target_version} ARCH=ppc64le
-# ---> gcr.io/google_containers/hyperkube-ppc64le:VERSION
+# ---> k8s.gcr.io/hyperkube-ppc64le:VERSION
 
 $ make push VERSION={target_version} ARCH=s390x
-# ---> gcr.io/google_containers/hyperkube-s390x:VERSION
+# ---> k8s.gcr.io/hyperkube-s390x:VERSION
 ```
 
 If you don't want to push the images, run `make` or `make build` instead

cluster/images/kubemark/Makefile

@@ -15,8 +15,8 @@
 # build Kubemark image from currently built binaries containing both 'real' master and Hollow Node.
 # This makefile assumes that the kubemark binary is present in this directory.
 
-REGISTRY?=gcr.io
+REGISTRY ?= gcr.io
-PROJECT?=google_containers
+PROJECT ?=
 
 all: gcloudpush
 

cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py

@@ -635,10 +635,10 @@ def launch_default_ingress_controller():
     addon_path = '/root/cdk/addons/{}'
 
     context['defaultbackend_image'] = \
-        "gcr.io/google_containers/defaultbackend:1.4"
+        "k8s.gcr.io/defaultbackend:1.4"
     if arch() == 's390x':
         context['defaultbackend_image'] = \
-            "gcr.io/google_containers/defaultbackend-s390x:1.4"
+            "k8s.gcr.io/defaultbackend-s390x:1.4"
 
     # Render the default http backend (404) replicationcontroller manifest
     manifest = addon_path.format('default-http-backend.yaml')
@@ -655,7 +655,7 @@ def launch_default_ingress_controller():
 
     # Render the ingress replication controller manifest
     context['ingress_image'] = \
-        "gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.13"
+        "k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.13"
     if arch() == 's390x':
         context['ingress_image'] = \
             "docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13"

cluster/kubemark/gce/config-default.sh

@@ -61,7 +61,7 @@ RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
 TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
 KUBE_APISERVER_REQUEST_TIMEOUT=300
 
-# Set etcd image (e.g. gcr.io/google_containers/etcd) and version (e.g. 3.1.10) if you need
+# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. 3.1.10) if you need
 # non-default version.
 ETCD_IMAGE="${TEST_ETCD_IMAGE:-}"
 ETCD_VERSION="${TEST_ETCD_VERSION:-}"

cluster/log-dump/logexporter-daemonset.yaml

@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
       - name: logexporter-test
-        image: gcr.io/google-containers/logexporter:v0.1.1
+        image: k8s.gcr.io/logexporter:v0.1.1
         env:
         - name: NODE_NAME
           valueFrom:

cluster/restore-from-backup.sh

@@ -160,7 +160,7 @@ if [ "${ETCD_API}" == "etcd2" ]; then
   echo "Starting etcd ${ETCD_VERSION} to restore data"
   image=$(docker run -d -v ${BACKUP_DIR}:/var/etcd/data \
     --net=host -p ${etcd_port}:${etcd_port} \
-    "gcr.io/google_containers/etcd:${ETCD_VERSION}" /bin/sh -c \
+    "k8s.gcr.io/etcd:${ETCD_VERSION}" /bin/sh -c \
     "/usr/local/bin/etcd --data-dir /var/etcd/data --force-new-cluster")
   if [ "$?" -ne "0" ]; then
     echo "Docker container didn't started correctly"
@@ -191,7 +191,7 @@ elif [ "${ETCD_API}" == "etcd3" ]; then
   # Run etcdctl snapshot restore command and wait until it is finished.
   # setting with --name in the etcd manifest file and then it seems to work.
   docker run -v ${BACKUP_DIR}:/var/tmp/backup --env ETCDCTL_API=3 \
-    "gcr.io/google_containers/etcd:${ETCD_VERSION}" /bin/sh -c \
+    "k8s.gcr.io/etcd:${ETCD_VERSION}" /bin/sh -c \
     "/usr/local/bin/etcdctl snapshot restore ${BACKUP_DIR}/${snapshot} --name ${NAME} --initial-cluster ${INITIAL_CLUSTER} --initial-advertise-peer-urls ${INITIAL_ADVERTISE_PEER_URLS}; mv /${NAME}.etcd/member /var/tmp/backup/"
   if [ "$?" -ne "0" ]; then
     echo "Docker container didn't started correctly"

cluster/saltbase/install.sh

@@ -81,7 +81,7 @@ for docker_file in "${KUBE_DOCKER_WRAPPED_BINARIES[@]}"; do
 done
 
 cat <<EOF >>"${docker_images_sls_file}"
-kube_docker_registry: '$(echo ${KUBE_DOCKER_REGISTRY:-gcr.io/google_containers})'
+kube_docker_registry: '$(echo ${KUBE_DOCKER_REGISTRY:-k8s.gcr.io})'
 EOF
 
 # TODO(zmerlynn): Forgive me, this is really gross. But in order to
@@ -89,13 +89,13 @@ EOF
 # have to templatize a couple of the add-ons anyways, manually
 # templatize the addon registry for regional support. When we get
 # better templating, we can fix this.
-readonly kube_addon_registry="${KUBE_ADDON_REGISTRY:-gcr.io/google_containers}"
+readonly kube_addon_registry="${KUBE_ADDON_REGISTRY:-k8s.gcr.io}"
-if [[ "${kube_addon_registry}" != "gcr.io/google_containers" ]]; then
+if [[ "${kube_addon_registry}" != "k8s.gcr.io" ]]; then
   find /srv/salt-new -name \*.yaml -or -name \*.yaml.in | \
-    xargs sed -ri "s@(image:\s.*)gcr.io/google_containers@\1${kube_addon_registry}@"
+    xargs sed -ri "s@(image:\s.*)k8s.gcr.io@\1${kube_addon_registry}@"
   # All the legacy .manifest files with hardcoded gcr.io are JSON.
   find /srv/salt-new -name \*.manifest -or -name \*.json | \
-    xargs sed -ri "s@(image\":\s+\")gcr.io/google_containers@\1${kube_addon_registry}@"
+    xargs sed -ri "s@(image\":\s+\")k8s.gcr.io@\1${kube_addon_registry}@"
 fi
 
 echo "+++ Swapping in new configs"

cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest

@@ -25,15 +25,15 @@
         "containers": [
             {
                 "name": "cluster-autoscaler",
-                "image": "gcr.io/google_containers/cluster-autoscaler:v1.1.0",
+                "image": "k8s.gcr.io/cluster-autoscaler:v1.1.0",
                 "livenessProbe": {
                     "httpGet": {
                         "path": "/health-check",
                         "port": 8085
-		    },
+                    },
                     "initialDelaySeconds": 600,
                     "periodSeconds": 60
-		},
+                },
                 "command": [
                     "./run.sh",
                     "--kubernetes=http://127.0.0.1:8080?inClusterConfig=f",

cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest

@@ -14,13 +14,13 @@ spec:
         cpu: 100m
       limits:
         cpu: 100m
-    image: gcr.io/google_containers/busybox:1.24
+    image: k8s.gcr.io/busybox:1.24
     # TODO: Replace this with a go script that pulls in parallel?
     # Currently it takes ~5m to pull all e2e images, so this is OK, and
     # fewer moving parts is always better.
     # TODO: Replace the hardcoded image list with an autogen list; the list is
     # currently hard-coded for static verification. It was generated via:
-    # grep -Iiroh "gcr.io/google_.*" "${KUBE_ROOT}/test/e2e" | \
+    # grep -Iiroh "gcr.io/.*" "${KUBE_ROOT}/test/e2e" | \
     #     sed -e "s/[,\")}]//g" | awk '{print $1}' | sort | uniq | tr '\n' ' '
     # We always want the subshell to exit 0 so this pod doesn't end up
     # blocking tests in an Error state.
@@ -29,52 +29,52 @@ spec:
     - -c
     - >
       for i in
-      gcr.io/google_containers/alpine-with-bash:1.0
+      k8s.gcr.io/alpine-with-bash:1.0
-      gcr.io/google_containers/apparmor-loader:0.1
+      k8s.gcr.io/apparmor-loader:0.1
-      gcr.io/google_containers/busybox:1.24
+      k8s.gcr.io/busybox:1.24
-      gcr.io/google_containers/dnsutils:e2e
+      k8s.gcr.io/dnsutils:e2e
-      gcr.io/google_containers/e2e-net-amd64:1.0
+      k8s.gcr.io/e2e-net-amd64:1.0
-      gcr.io/google_containers/echoserver:1.6
+      k8s.gcr.io/echoserver:1.6
-      gcr.io/google_containers/eptest:0.1
+      k8s.gcr.io/eptest:0.1
-      gcr.io/google_containers/fakegitserver:0.1
+      k8s.gcr.io/fakegitserver:0.1
-      gcr.io/google_containers/galera-install:0.1
+      k8s.gcr.io/galera-install:0.1
-      gcr.io/google_containers/hostexec:1.2
+      k8s.gcr.io/hostexec:1.2
-      gcr.io/google_containers/invalid-image:invalid-tag
+      k8s.gcr.io/invalid-image:invalid-tag
-      gcr.io/google_containers/iperf:e2e
+      k8s.gcr.io/iperf:e2e
-      gcr.io/google_containers/jessie-dnsutils:e2e
+      k8s.gcr.io/jessie-dnsutils:e2e
-      gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
+      k8s.gcr.io/k8s-dns-dnsmasq-amd64:1.14.5
-      gcr.io/google_containers/liveness:e2e
+      k8s.gcr.io/liveness:e2e
-      gcr.io/google_containers/logs-generator:v0.1.0
+      k8s.gcr.io/logs-generator:v0.1.0
-      gcr.io/google_containers/mounttest:0.8
+      k8s.gcr.io/mounttest:0.8
-      gcr.io/google_containers/mounttest-user:0.5
+      k8s.gcr.io/mounttest-user:0.5
-      gcr.io/google_containers/mysql-galera:e2e
+      k8s.gcr.io/mysql-galera:e2e
-      gcr.io/google_containers/mysql-healthz:1.0
+      k8s.gcr.io/mysql-healthz:1.0
-      gcr.io/google_containers/netexec:1.4
+      k8s.gcr.io/netexec:1.4
-      gcr.io/google_containers/netexec:1.5
+      k8s.gcr.io/netexec:1.5
-      gcr.io/google_containers/netexec:1.7
+      k8s.gcr.io/netexec:1.7
-      gcr.io/google_containers/nettest:1.7
+      k8s.gcr.io/nettest:1.7
-      gcr.io/google_containers/nginx:1.7.9
+      k8s.gcr.io/nginx:1.7.9
-      gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.1
+      k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.1
-      gcr.io/google_containers/nginx-slim:0.7
+      k8s.gcr.io/nginx-slim:0.7
-      gcr.io/google_containers/nginx-slim:0.8
+      k8s.gcr.io/nginx-slim:0.8
-      gcr.io/google_containers/node-problem-detector:v0.3.0
+      k8s.gcr.io/node-problem-detector:v0.3.0
-      gcr.io/google_containers/pause
+      k8s.gcr.io/pause
-      gcr.io/google_containers/porter:4524579c0eb935c056c8e75563b4e1eda31587e0
+      k8s.gcr.io/porter:4524579c0eb935c056c8e75563b4e1eda31587e0
-      gcr.io/google_containers/portforwardtester:1.2
+      k8s.gcr.io/portforwardtester:1.2
-      gcr.io/google_containers/redis-install-3.2.0:e2e
+      k8s.gcr.io/redis-install-3.2.0:e2e
-      gcr.io/google_containers/resource_consumer:beta4
+      k8s.gcr.io/resource_consumer:beta4
-      gcr.io/google_containers/resource_consumer/controller:beta4
+      k8s.gcr.io/resource_consumer/controller:beta4
       gcr.io/kubernetes-e2e-test-images/serve-hostname-amd64:1.1
-      gcr.io/google_containers/servicelb:0.1
+      k8s.gcr.io/servicelb:0.1
-      gcr.io/google_containers/test-webserver:e2e
+      k8s.gcr.io/test-webserver:e2e
-      gcr.io/google_containers/update-demo:kitten
+      k8s.gcr.io/update-demo:kitten
-      gcr.io/google_containers/update-demo:nautilus
+      k8s.gcr.io/update-demo:nautilus
-      gcr.io/google_containers/volume-ceph:0.1
+      k8s.gcr.io/volume-ceph:0.1
-      gcr.io/google_containers/volume-gluster:0.2
+      k8s.gcr.io/volume-gluster:0.2
-      gcr.io/google_containers/volume-iscsi:0.1
+      k8s.gcr.io/volume-iscsi:0.1
-      gcr.io/google_containers/volume-nfs:0.8
+      k8s.gcr.io/volume-nfs:0.8
-      gcr.io/google_containers/volume-rbd:0.1
+      k8s.gcr.io/volume-rbd:0.1
-      gcr.io/google_containers/zookeeper-install-3.5.0-alpha:e2e
+      k8s.gcr.io/zookeeper-install-3.5.0-alpha:e2e
       gcr.io/google_samples/gb-redisslave:nonexistent
       ; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;
     securityContext:
@@ -91,7 +91,7 @@ spec:
         cpu: 100m
       limits:
         cpu: 100m
-    image:  gcr.io/google_containers/kube-nethealth-amd64:1.0
+    image:  k8s.gcr.io/kube-nethealth-amd64:1.0
     command:
     - /bin/sh
     - -c

cluster/saltbase/salt/etcd/etcd.manifest

@@ -39,7 +39,7 @@
 "containers":[
     {
     "name": "etcd-container",
-    "image": "{{ pillar.get('etcd_docker_repository', 'gcr.io/google_containers/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.1.10') }}",
+    "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.1.10') }}",
     "resources": {
       "requests": {
         "cpu": {{ cpulimit }}

cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml

@@ -13,7 +13,7 @@ spec:
   - name: kube-addon-manager
     # When updating version also bump it in:
     # - test/kubemark/resources/manifests/kube-addon-manager.yaml
-    image: gcr.io/google-containers/kube-addon-manager:v6.5
+    image: k8s.gcr.io/kube-addon-manager:v6.5
     command:
     - /bin/bash
     - -c

cluster/saltbase/salt/kube-registry-proxy/kube-registry-proxy.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: kube-registry-proxy
-        image: gcr.io/google_containers/kube-registry-proxy:0.4
+        image: k8s.gcr.io/kube-registry-proxy:0.4
         resources:
           limits:
             cpu: 100m

cluster/saltbase/salt/l7-gcp/glbc.manifest

@@ -13,7 +13,7 @@ spec:
   terminationGracePeriodSeconds: 600
   hostNetwork: true
   containers:
-  - image: gcr.io/google_containers/glbc:0.9.7
+  - image: k8s.gcr.io/glbc:0.9.7
     livenessProbe:
       httpGet:
         path: /healthz

cluster/saltbase/salt/rescheduler/rescheduler.manifest

@@ -13,7 +13,7 @@ metadata:
 spec:
   hostNetwork: true
   containers:
-  - image: gcr.io/google-containers/rescheduler:v0.3.1
+  - image: k8s.gcr.io/rescheduler:v0.3.1
     name: rescheduler
     volumeMounts:
     - mountPath: /var/log/rescheduler.log

cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go

@@ -47,7 +47,7 @@ const (
 	// DefaultCertificatesDir defines default certificate directory
 	DefaultCertificatesDir = "/etc/kubernetes/pki"
 	// DefaultImageRepository defines default image registry
-	DefaultImageRepository = "gcr.io/google_containers"
+	DefaultImageRepository = "k8s.gcr.io"
 	// DefaultManifestsDir defines default manifests directory
 	DefaultManifestsDir = "/etc/kubernetes/manifests"
 

cmd/kubeadm/app/images/images_test.go

@@ -27,7 +27,7 @@ import (
 const (
 	testversion = "v10.1.2-alpha.1.100+0123456789abcdef+SOMETHING"
 	expected    = "v10.1.2-alpha.1.100_0123456789abcdef_SOMETHING"
-	gcrPrefix   = "gcr.io/google_containers"
+	gcrPrefix   = "k8s.gcr.io"
 )
 
 func TestGetCoreImage(t *testing.T) {

cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go

@@ -66,7 +66,7 @@ spec:
     - --proxy-client-key-file=/etc/kubernetes/pki/front-proxy-client.key
     - --authorization-mode=Node,RBAC
     - --etcd-servers=http://127.0.0.1:2379
-    image: gcr.io/google_containers/kube-apiserver-amd64:v1.7.4
+    image: k8s.gcr.io/kube-apiserver-amd64:v1.7.4
     livenessProbe:
       failureThreshold: 8
       httpGet:
@@ -148,7 +148,7 @@ spec:
         - --proxy-client-key-file=/etc/kubernetes/pki/front-proxy-client.key
         - --authorization-mode=Node,RBAC
         - --etcd-servers=http://127.0.0.1:2379
-        image: gcr.io/google_containers/kube-apiserver-amd64:v1.7.4
+        image: k8s.gcr.io/kube-apiserver-amd64:v1.7.4
         livenessProbe:
           failureThreshold: 8
           httpGet:
@@ -220,7 +220,7 @@ spec:
     - --cluster-signing-key-file=/etc/kubernetes/pki/ca.key
     - --address=127.0.0.1
     - --use-service-account-credentials=true
-    image: gcr.io/google_containers/kube-controller-manager-amd64:v1.7.4
+    image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4
     livenessProbe:
       failureThreshold: 8
       httpGet:
@@ -295,7 +295,7 @@ spec:
         - --cluster-signing-key-file=/etc/kubernetes/pki/ca.key
         - --address=127.0.0.1
         - --use-service-account-credentials=true
-        image: gcr.io/google_containers/kube-controller-manager-amd64:v1.7.4
+        image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4
         livenessProbe:
           failureThreshold: 8
           httpGet:
@@ -368,7 +368,7 @@ spec:
     - --leader-elect=true
     - --kubeconfig=/etc/kubernetes/scheduler.conf
     - --address=127.0.0.1
-    image: gcr.io/google_containers/kube-scheduler-amd64:v1.7.4
+    image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4
     livenessProbe:
       failureThreshold: 8
       httpGet:
@@ -419,7 +419,7 @@ spec:
         - --leader-elect=true
         - --kubeconfig=/etc/kubernetes/scheduler.conf
         - --address=127.0.0.1
-        image: gcr.io/google_containers/kube-scheduler-amd64:v1.7.4
+        image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4
         livenessProbe:
           failureThreshold: 8
           httpGet:
@@ -521,7 +521,7 @@ metadata:
   name: testpod
 spec:
   containers:
-    - image: gcr.io/google_containers/busybox
+    - image: k8s.gcr.io/busybox
 `,
 			expectError: false,
 		},
@@ -537,7 +537,7 @@ spec:
   "spec": {
     "containers": [
       {
-        "image": "gcr.io/google_containers/busybox"
+        "image": "k8s.gcr.io/busybox"
       }
     ]
   }
@@ -552,7 +552,7 @@ kind: Pod
 metadata:
   name: testpod
 spec:
-  - image: gcr.io/google_containers/busybox
+  - image: k8s.gcr.io/busybox
 `,
 			expectError: true,
 		},

cmd/kubeadm/app/phases/upgrade/staticpods_test.go

@@ -61,7 +61,7 @@ etcd:
   image: ""
   keyFile: ""
 featureFlags: null
-imageRepository: gcr.io/google_containers
+imageRepository: k8s.gcr.io
 kubernetesVersion: %s
 networking:
   dnsDomain: cluster.local

cmd/kubeadm/app/util/template_test.go

@@ -22,8 +22,8 @@ import (
 
 const (
 	validTmpl    = "image: {{ .ImageRepository }}/pause-{{ .Arch }}:3.0"
-	validTmplOut = "image: gcr.io/google_containers/pause-amd64:3.0"
+	validTmplOut = "image: k8s.gcr.io/pause-amd64:3.0"
-	doNothing    = "image: gcr.io/google_containers/pause-amd64:3.0"
+	doNothing    = "image: k8s.gcr.io/pause-amd64:3.0"
 	invalidTmpl1 = "{{ .baz }/d}"
 	invalidTmpl2 = "{{ !foobar }}"
 )
@@ -39,7 +39,7 @@ func TestParseTemplate(t *testing.T) {
 		{
 			template: validTmpl,
 			data: struct{ ImageRepository, Arch string }{
-				ImageRepository: "gcr.io/google_containers",
+				ImageRepository: "k8s.gcr.io",
 				Arch:            "amd64",
 			},
 			output:      validTmplOut,
@@ -49,7 +49,7 @@ func TestParseTemplate(t *testing.T) {
 		{
 			template: doNothing,
 			data: struct{ ImageRepository, Arch string }{
-				ImageRepository: "gcr.io/google_containers",
+				ImageRepository: "k8s.gcr.io",
 				Arch:            "amd64",
 			},
 			output:      doNothing,

cmd/kubelet/app/options/container_runtime.go

@@ -27,7 +27,7 @@ import (
 
 const (
 	// When these values are updated, also update test/e2e/framework/util.go
-	defaultPodSandboxImageName    = "gcr.io/google_containers/pause"
+	defaultPodSandboxImageName    = "k8s.gcr.io/pause"
 	defaultPodSandboxImageVersion = "3.0"
 	// From pkg/kubelet/rkt/rkt.go to avoid circular import
 	defaultRktAPIServiceEndpoint = "localhost:15441"

docs/api-reference/v1/definitions.html

@@ -5194,7 +5194,7 @@ Examples:<br>
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">names</p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Names by which this image is known. e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">string array</p></td>
 <td class="tableblock halign-left valign-top"></td>

examples/cluster-dns/dns-backend-rc.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: dns-backend
-          image: gcr.io/google_containers/example-dns-backend:v1
+          image: k8s.gcr.io/example-dns-backend:v1
           ports:
             - name: backend-port
               containerPort: 8000

examples/cluster-dns/dns-frontend-pod.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
     - name: dns-frontend
-      image: gcr.io/google_containers/example-dns-frontend:v1
+      image: k8s.gcr.io/example-dns-frontend:v1
       command:
         - python
         - client.py

examples/cluster-dns/images/backend/Makefile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 TAG = v1
-PREFIX = gcr.io/google_containers
+PREFIX = k8s.gcr.io
 IMAGE = example-dns-backend
 
 all: push
@@ -22,6 +22,6 @@ image:
 	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
 
 push: image
-	gcloud docker -- push $(PREFIX)/$(IMAGE)
+	gcloud docker --server=k8s.gcr.io -- push $(PREFIX)/$(IMAGE)
 
 clean:

examples/cluster-dns/images/frontend/Makefile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 TAG = v1
-PREFIX = gcr.io/google_containers
+PREFIX = k8s.gcr.io
 IMAGE = example-dns-frontend
 
 all: push
@@ -22,6 +22,6 @@ image:
 	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
 
 push: image
-	gcloud docker -- push $(PREFIX)/$(IMAGE)
+	gcloud docker --server=k8s.gcr.io -- push $(PREFIX)/$(IMAGE)
 
 clean:

examples/explorer/Makefile

@@ -21,10 +21,10 @@ explorer: explorer.go
 	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./explorer.go
 
 container: explorer
-	docker build --pull -t gcr.io/google_containers/explorer:$(TAG) .
+	docker build --pull -t k8s.gcr.io/explorer:$(TAG) .
 
 push: container
-	gcloud docker -- push gcr.io/google_containers/explorer:$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push k8s.gcr.io/explorer:$(TAG)
 
 clean:
 	rm -f explorer

examples/explorer/pod.yaml

@@ -5,7 +5,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

examples/guestbook-go/Makefile

@@ -15,9 +15,9 @@
 # Build the guestbook-go example
 
 # Usage:
-#   [VERSION=v3] [REGISTRY="gcr.io/google_containers"] make build
+#   [VERSION=v3] [REGISTRY="k8s.gcr.io"] make build
 VERSION?=v3
-REGISTRY?=gcr.io/google_containers
+REGISTRY?=k8s.gcr.io
 
 release: clean build push clean
 
@@ -29,7 +29,7 @@ build:
 
 # push the image to an registry
 push:
-	gcloud docker -- push ${REGISTRY}/guestbook:${VERSION}
+	gcloud docker --server=k8s.gcr.io -- push ${REGISTRY}/guestbook:${VERSION}
 
 # remove previous images and containers
 clean:

examples/guestbook-go/guestbook-controller.json

@@ -22,7 +22,7 @@
             "containers":[
                {
                   "name":"guestbook",
-                  "image":"gcr.io/google_containers/guestbook:v3",
+                  "image":"k8s.gcr.io/guestbook:v3",
                   "ports":[
                      {
                         "name":"http-server",

examples/guestbook/all-in-one/guestbook-all-in-one.yaml

@@ -30,7 +30,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: gcr.io/google_containers/redis:e2e  # or just image: redis
+        image: k8s.gcr.io/redis:e2e  # or just image: redis
         resources:
           requests:
             cpu: 100m

examples/guestbook/legacy/redis-master-controller.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: gcr.io/google_containers/redis:e2e  # or just image: redis
+        image: k8s.gcr.io/redis:e2e  # or just image: redis
         resources:
           requests:
             cpu: 100m

examples/guestbook/redis-master-deployment.yaml

@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: gcr.io/google_containers/redis:e2e  # or just image: redis
+        image: k8s.gcr.io/redis:e2e  # or just image: redis
         resources:
           requests:
             cpu: 100m

examples/kubectl-container/Makefile

@@ -37,11 +37,11 @@ tag: .tag
 
 container:
 	$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
-	docker build --pull -t gcr.io/google_containers/kubectl:$(TAG) .
+	docker build --pull -t k8s.gcr.io/kubectl:$(TAG) .
 
 push: container
 	$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
-	gcloud docker -- push gcr.io/google_containers/kubectl:$(TAG)
+	gcloud docker --server=k8s.gcr.io -- push k8s.gcr.io/kubectl:$(TAG)
 
 clean:
 	rm -f kubectl