Move from k8s.gcr.io to registry.k8s.io

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

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

@@ -7,6 +7,6 @@ spec:
   hostNetwork: true
   containers:
   - name: etcd-version-monitor
-    image: k8s.gcr.io/etcd-version-monitor:0.1.3
+    image: registry.k8s.io/etcd-version-monitor:0.1.3
     command:
     - /etcd-version-monitor

cluster/images/etcd/Makefile

@@ -15,7 +15,7 @@
 # Build the etcd image
 #
 # Usage:
-# 	[BUNDLED_ETCD_VERSIONS=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.4] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
+# 	[BUNDLED_ETCD_VERSIONS=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.4] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
 #
 # The image contains different etcd versions to simplify
 # upgrades. Thus be careful when removing any versions from here.
@@ -36,7 +36,7 @@ LATEST_ETCD_VERSION?=3.5.4
 # for each revision of this image at that etcd version.
 REVISION?=0
 
-# IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "<etcd-version>-<revision>".
+# IMAGE_TAG Uniquely identifies registry.k8s.io/etcd docker image with a tag of the form "<etcd-version>-<revision>".
 IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION)
 
 ARCH?=amd64
@@ -62,9 +62,9 @@ IMAGE_SUFFIX.linux = $(OS)-$(ARCH)
 IMAGE_SUFFIX.windows = $(OS)-$(ARCH)-$(OSVERSION)
 IMAGE_SUFFIX := ${IMAGE_SUFFIX.${OS}}
 
-# Image should be pulled from k8s.gcr.io, which will auto-detect
+# Image should be pulled from registry.k8s.io, which will auto-detect
 # region (us, eu, asia, ...) and pull from the closest.
-REGISTRY?=k8s.gcr.io
+REGISTRY?=registry.k8s.io
 # Images should be pushed to staging-k8s.gcr.io.
 PUSH_REGISTRY?=staging-k8s.gcr.io
 
@@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
 DOCKERFILE := ${DOCKERFILE.${OS}}
 
 ifeq ($(ARCH),amd64)
-    BASEIMAGE?=k8s.gcr.io/build-image/debian-base:bullseye-v1.2.0
+    BASEIMAGE?=registry.k8s.io/build-image/debian-base:bullseye-v1.2.0
 endif
 ifeq ($(ARCH),arm)
-    BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:bullseye-v1.2.0
+    BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bullseye-v1.2.0
 endif
 ifeq ($(ARCH),arm64)
-    BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:bullseye-v1.2.0
+    BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bullseye-v1.2.0
 endif
 ifeq ($(ARCH),ppc64le)
-    BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:bullseye-v1.2.0
+    BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bullseye-v1.2.0
 endif
 ifeq ($(ARCH),s390x)
-    BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:bullseye-v1.2.0
+    BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.2.0
 endif
 
 BASE.windows = mcr.microsoft.com/windows/nanoserver
@@ -240,8 +240,8 @@ unit-test:
 	docker run --rm --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \
 		/bin/bash -c "CGO_ENABLED=0 go test -v k8s.io/kubernetes/cluster/images/etcd/migrate"
 
-# Integration tests require both a golang build environment and all the etcd binaries from a `k8s.gcr.io/etcd` image (`/usr/local/bin/etcd-<version>`, ...).
-# Since the `k8s.gcr.io/etcd` image is for runtime only and does not have a build golang environment, we create a new docker image to run integration tests
+# Integration tests require both a golang build environment and all the etcd binaries from a `registry.k8s.io/etcd` image (`/usr/local/bin/etcd-<version>`, ...).
+# Since the `registry.k8s.io/etcd` image is for runtime only and does not have a build golang environment, we create a new docker image to run integration tests
 # with.
 build-integration-test-image: build
 	cp -r $(TEMP_DIR) $(TEMP_DIR)_integration_test

cluster/images/etcd/README.md

@@ -1,4 +1,4 @@
-### k8s.gcr.io/etcd docker image
+### registry.k8s.io/etcd docker image
 
 Provides docker images containing etcd and etcdctl binaries for multiple etcd
 version as well as a migration operator utility for upgrading and downgrading
@@ -6,14 +6,14 @@ etcd--it's data directory in particular--to a target version.
 
 #### Versioning
 
-Each `k8s.gcr.io/etcd` docker image is tagged with an version string of the form
+Each `registry.k8s.io/etcd` docker image is tagged with an version string of the form
 `<etcd-version>-<image-revision>`, e.g. `3.0.17-0`.  The etcd version is the
 SemVer of latest etcd version available in the image. The image revision
 distinguishes between docker images with the same lastest etcd version but
 changes (bug fixes and backward compatible improvements) to the migration
 utility bundled with the image.
 
-In addition to the latest etcd version, each `k8s.gcr.io/etcd` image contains
+In addition to the latest etcd version, each `registry.k8s.io/etcd` image contains
 etcd and etcdctl binaries for older versions of etcd. These are used by the
 migration operator utility when performing downgrades and multi-step upgrades,
 but can also be used as the etcd target version.
@@ -41,7 +41,7 @@ Downgrades to the previous minor version of the 3.x series is supported.
 
 By default, `migrate` will write data directory files with default permissions
 according to the umask it is run with. When run in the published
-`k8s.gcr.io/etcd` images the default umask is 0022 which will result in 0755
+`registry.k8s.io/etcd` images the default umask is 0022 which will result in 0755
 directory permissions and 0644 file permissions.
 
 #### Cross building

cluster/images/kubemark/Dockerfile

@@ -19,6 +19,6 @@
 # See https://console.cloud.google.com/gcr/images/k8s-staging-build-image/global/go-runner
 # for a list of available versions. This base image should be updated
 # periodically.
-FROM k8s.gcr.io/build-image/go-runner:v2.3.1-go1.17.2-bullseye.0
+FROM registry.k8s.io/build-image/go-runner:v2.3.1-go1.17.2-bullseye.0
 
 COPY kubemark /kubemark