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

Signed-off-by: Davanum Srinivas <[email protected]>

api/openapi-spec/v3/api__v1_openapi.json

@@ -1230,7 +1230,7 @@
         "description": "Describe a container image",
         "properties": {
           "names": {
-            "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\"]",
+            "description": "Names by which this image is known. e.g. [\"kubernetes.example/hyperkube:v1.0.7\", \"cloud-vendor.registry.example/cloud-vendor/hyperkube:v1.0.7\"]",
             "items": {
               "default": "",
               "type": "string"

build/common.sh

@@ -40,8 +40,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 readonly KUBE_BUILD_IMAGE_REPO=kube-build
 readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat "${KUBE_ROOT}/build/build-image/cross/VERSION")"
 
-readonly KUBE_DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY:-k8s.gcr.io}"
-readonly KUBE_BASE_IMAGE_REGISTRY="${KUBE_BASE_IMAGE_REGISTRY:-k8s.gcr.io/build-image}"
+readonly KUBE_DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY:-registry.k8s.io}"
+readonly KUBE_BASE_IMAGE_REGISTRY="${KUBE_BASE_IMAGE_REGISTRY:-registry.k8s.io/build-image}"
 
 # This version number is used to cause everyone to rebuild their data containers
 # and build image.  This is especially useful for automated build systems like

build/dependencies.yaml

@@ -32,11 +32,11 @@ dependencies:
     version: 1.8.6
     refPaths:
     - path: cluster/addons/dns/coredns/coredns.yaml.base
-      match: k8s.gcr.io/coredns
+      match: registry.k8s.io/coredns
     - path: cluster/addons/dns/coredns/coredns.yaml.in
-      match: k8s.gcr.io/coredns
+      match: registry.k8s.io/coredns
     - path: cluster/addons/dns/coredns/coredns.yaml.sed
-      match: k8s.gcr.io/coredns
+      match: registry.k8s.io/coredns
 
   - name: "coredns-kubeadm"
     version: 1.8.6
@@ -109,57 +109,57 @@ dependencies:
     #- path: hack/lib/golang.sh
     #  match: minimum_go_version=go([0-9]+\.[0-9]+)
 
-  - name: "k8s.gcr.io/kube-cross: dependents"
+  - name: "registry.k8s.io/kube-cross: dependents"
     version: v1.25.0-go1.18.2-bullseye.0
     refPaths:
     - path: build/build-image/cross/VERSION
 
   # Base images
-  - name: "k8s.gcr.io/debian-base: dependents"
+  - name: "registry.k8s.io/debian-base: dependents"
     version: bullseye-v1.2.0
     refPaths:
     - path: cluster/images/etcd/Makefile
-      match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
+      match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
     - path: cluster/images/etcd/Makefile
-      match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-arm:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
+      match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base-arm:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
     - path: cluster/images/etcd/Makefile
-      match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-arm64:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
+      match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base-arm64:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
     - path: cluster/images/etcd/Makefile
-      match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-ppc64le:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
+      match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base-ppc64le:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
     - path: cluster/images/etcd/Makefile
-      match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-s390x:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
+      match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base-s390x:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
     - path: test/conformance/image/Makefile
       match: BASE_IMAGE_VERSION\?=
 
-  - name: "k8s.gcr.io/debian-iptables: dependents"
+  - name: "registry.k8s.io/debian-iptables: dependents"
     version: bullseye-v1.3.0
     refPaths:
     - path: build/common.sh
       match: __default_debian_iptables_version=
     - path: test/utils/image/manifest.go
       match: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"}
 
-  - name: "k8s.gcr.io/go-runner: dependents"
+  - name: "registry.k8s.io/go-runner: dependents"
     version: v2.3.1-go1.18.2-bullseye.0
     refPaths:
     - path: build/common.sh
       match: __default_go_runner_version=
 
-  - name: "k8s.gcr.io/pause"
+  - name: "registry.k8s.io/pause"
     version: 3.7
     refPaths:
     - path: build/pause/Makefile
       match: TAG\s*\?=
 
-  - name: "k8s.gcr.io/pause: dependents"
+  - name: "registry.k8s.io/pause: dependents"
     version: 3.7
     refPaths:
     - path: cluster/gce/config-common.sh
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: cluster/gce/gci/configure-helper.sh
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: cluster/gce/windows/smoke-test.sh
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: cmd/kubeadm/app/constants/constants.go
       match: PauseVersion\s+=
     - path: cmd/kubeadm/app/util/template_test.go
@@ -171,43 +171,43 @@ dependencies:
     - path: cmd/kubelet/app/options/container_runtime.go
       match: defaultPodSandboxImageVersion\s+=
     - path: hack/testdata/pod-with-precision.json
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/cmd/core.sh
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/integration/benchmark-controller.json
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/integration/scheduler_perf/config/pod-default.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/integration/scheduler_perf/config/pod-with-node-affinity.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/integration/scheduler_perf/config/pod-with-secret-volume.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/utils/runners.go
-      match: k8s.gcr.io\/pause:\d+\.\d+
+      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/utils/image/manifest.go
       match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
 
-  - name: "k8s.gcr.io/setcap: dependents"
+  - name: "registry.k8s.io/setcap: dependents"
     version: bullseye-v1.2.0
     refPaths:
     - path: build/common.sh

build/lib/release.sh

@@ -340,10 +340,10 @@ function kube::release::create_docker_images_for_server() {
     images_dir="${RELEASE_IMAGES}/${arch}"
     mkdir -p "${images_dir}"
 
-    # k8s.gcr.io is the constant tag in the docker archives, this is also the default for config scripts in GKE.
+    # registry.k8s.io is the constant tag in the docker archives, this is also the default for config scripts in GKE.
     # We can use KUBE_DOCKER_REGISTRY to include and extra registry in the docker archive.
-    # If we use KUBE_DOCKER_REGISTRY="k8s.gcr.io", then the extra tag (same) is ignored, see release_docker_image_tag below.
-    local -r docker_registry="k8s.gcr.io"
+    # If we use KUBE_DOCKER_REGISTRY="registry.k8s.io", then the extra tag (same) is ignored, see release_docker_image_tag below.
+    local -r docker_registry="registry.k8s.io"
     # Docker tags cannot contain '+'
     local docker_tag="${KUBE_GIT_VERSION/+/_}"
     if [[ -z "${docker_tag}" ]]; then

build/pause/Makefile

@@ -40,7 +40,7 @@ ALL_OS_ARCH.windows = $(foreach arch, $(ALL_ARCH.windows), $(foreach osversion,
 ALL_OS_ARCH = $(foreach os, $(ALL_OS), ${ALL_OS_ARCH.${os}})
 
 CFLAGS = -Os -Wall -Werror -static -DVERSION=v$(TAG)-$(REV)
-KUBE_CROSS_IMAGE ?= k8s.gcr.io/build-image/kube-cross
+KUBE_CROSS_IMAGE ?= registry.k8s.io/build-image/kube-cross
 KUBE_CROSS_VERSION ?= $(shell cat ../build-image/cross/VERSION)
 
 # NOTE(claudiub): The Windows pause image also requires the wincat binary we're compiling for the

build/root/Makefile

@@ -410,8 +410,8 @@ define RELEASE_SKIP_TESTS_HELP_INFO
 # Args:
 #   KUBE_RELEASE_RUN_TESTS: Whether to run tests. Set to 'y' to run tests anyways.
 #   KUBE_FASTBUILD: Whether to cross-compile for other architectures. Set to 'false' to do so.
-#   KUBE_DOCKER_REGISTRY: Registry of released images, default to k8s.gcr.io
-#   KUBE_BASE_IMAGE_REGISTRY: Registry of base images for controlplane binaries, default to k8s.gcr.io/build-image
+#   KUBE_DOCKER_REGISTRY: Registry of released images, default to registry.k8s.io
+#   KUBE_BASE_IMAGE_REGISTRY: Registry of base images for controlplane binaries, default to registry.k8s.io/build-image
 #
 # Example:
 #   make release-skip-tests

cluster/addons/addon-manager/Makefile

@@ -18,7 +18,7 @@ TEMP_DIR:=$(shell mktemp -d)
 VERSION=v9.1.6
 KUBECTL_VERSION?=v1.20.2
 
-BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):v1.0.1
+BASEIMAGE=registry.k8s.io/debian-base-$(ARCH):v1.0.1
 
 SUDO=$(if $(filter 0,$(shell id -u)),,sudo)
 

cluster/addons/addon-manager/README.md

@@ -25,7 +25,7 @@ Otherwise it will be omitted.
 
 #### Images
 
-addon-manager images are pushed to `k8s.gcr.io`. As addon-manager is built for multiple architectures, there is an image per architecture in the format - `k8s.gcr.io/addon-manager/kube-addon-manager-$(ARCH):$(VERSION)`.
+addon-manager images are pushed to `registry.k8s.io`. As addon-manager is built for multiple architectures, there is an image per architecture in the format - `registry.k8s.io/addon-manager/kube-addon-manager-$(ARCH):$(VERSION)`.
 
 #### How to release
 
@@ -56,4 +56,4 @@ $ make push ARCH=s390x
 # ---> staging-k8s.gcr.io/addon-manager/kube-addon-manager-s390x:VERSION
 ```
 
-If you don't want to push the images, run `make` or `make build` instead
+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

@@ -18,7 +18,7 @@ spec:
     spec:
       priorityClassName: system-cluster-critical
       containers:
-        - image: k8s.gcr.io/cpvpa-amd64:v0.8.3
+        - image: registry.k8s.io/cpvpa-amd64:v0.8.3
           name: autoscaler
           command:
             - /cpvpa

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

@@ -21,7 +21,7 @@ spec:
         supplementalGroups: [ 65534 ]
         fsGroup: 65534
       containers:
-      - image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.7.1
+      - image: registry.k8s.io/cluster-proportional-autoscaler-amd64:1.7.1
         name: autoscaler
         command:
           - /cluster-proportional-autoscaler

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

@@ -18,7 +18,7 @@ spec:
     spec:
       priorityClassName: system-cluster-critical
       containers:
-        - image: k8s.gcr.io/cpvpa-amd64:v0.8.3
+        - image: registry.k8s.io/cpvpa-amd64:v0.8.3
           name: autoscaler
           command:
             - /cpvpa

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

@@ -26,7 +26,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:  k8s.gcr.io/networking/ingress-gce-404-server-with-metrics-amd64:v1.10.11
+        image:  registry.k8s.io/networking/ingress-gce-404-server-with-metrics-amd64:v1.10.11
         livenessProbe:
           httpGet:
             path: /healthz

cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml

@@ -36,7 +36,7 @@ spec:
         hostPath:
           path: /dev
       containers:
-      - image: "k8s.gcr.io/nvidia-gpu-device-plugin@sha256:4b036e8844920336fa48f36edeb7d4398f426d6a934ba022848deed2edbf09aa"
+      - image: "registry.k8s.io/nvidia-gpu-device-plugin@sha256:4b036e8844920336fa48f36edeb7d4398f426d6a934ba022848deed2edbf09aa"
         command: ["/usr/bin/nvidia-gpu-device-plugin", "-logtostderr"]
         name: nvidia-gpu-device-plugin
         resources:

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

@@ -86,7 +86,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: autoscaler
-        image: k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.4
+        image: registry.k8s.io/cpa/cluster-proportional-autoscaler:1.8.4
         resources:
             requests:
                 cpu: "20m"

cluster/addons/dns/coredns/coredns.yaml.base

@@ -139,7 +139,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: k8s.gcr.io/coredns/coredns:v1.8.6
+        image: registry.k8s.io/coredns/coredns:v1.8.6
         imagePullPolicy: IfNotPresent
         resources:
           limits:

cluster/addons/dns/coredns/coredns.yaml.in

@@ -139,7 +139,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: k8s.gcr.io/coredns/coredns:v1.8.6
+        image: registry.k8s.io/coredns/coredns:v1.8.6
         imagePullPolicy: IfNotPresent
         resources:
           limits:

cluster/addons/dns/coredns/coredns.yaml.sed

@@ -139,7 +139,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: coredns
-        image: k8s.gcr.io/coredns/coredns:v1.8.6
+        image: registry.k8s.io/coredns/coredns:v1.8.6
         imagePullPolicy: IfNotPresent
         resources:
           limits:

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

@@ -114,7 +114,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: kubedns
-        image: k8s.gcr.io/dns/k8s-dns-kube-dns:1.21.1
+        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.21.1
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
           runAsUser: 1001
           runAsGroup: 1001
       - name: dnsmasq
-        image: k8s.gcr.io/dns/k8s-dns-dnsmasq-nanny:1.21.1
+        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.21.1
         livenessProbe:
           httpGet:
             path: /healthcheck/dnsmasq
@@ -217,7 +217,7 @@ spec:
               - NET_BIND_SERVICE
               - SETGID
       - name: sidecar
-        image: k8s.gcr.io/dns/k8s-dns-sidecar:1.21.1
+        image: registry.k8s.io/dns/k8s-dns-sidecar:1.21.1
         livenessProbe:
           httpGet:
             path: /metrics

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

@@ -114,7 +114,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: kubedns
-        image: k8s.gcr.io/dns/k8s-dns-kube-dns:1.21.1
+        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.21.1
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
           runAsUser: 1001
           runAsGroup: 1001
       - name: dnsmasq
-        image: k8s.gcr.io/dns/k8s-dns-dnsmasq-nanny:1.21.1
+        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.21.1
         livenessProbe:
           httpGet:
             path: /healthcheck/dnsmasq
@@ -217,7 +217,7 @@ spec:
               - NET_BIND_SERVICE
               - SETGID
       - name: sidecar
-        image: k8s.gcr.io/dns/k8s-dns-sidecar:1.21.1
+        image: registry.k8s.io/dns/k8s-dns-sidecar:1.21.1
         livenessProbe:
           httpGet:
             path: /metrics

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

@@ -114,7 +114,7 @@ spec:
         kubernetes.io/os: linux
       containers:
       - name: kubedns
-        image: k8s.gcr.io/dns/k8s-dns-kube-dns:1.21.1
+        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.21.1
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
           runAsUser: 1001
           runAsGroup: 1001
       - name: dnsmasq
-        image: k8s.gcr.io/dns/k8s-dns-dnsmasq-nanny:1.21.1
+        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.21.1
         livenessProbe:
           httpGet:
             path: /healthcheck/dnsmasq
@@ -217,7 +217,7 @@ spec:
               - NET_BIND_SERVICE
               - SETGID
       - name: sidecar
-        image: k8s.gcr.io/dns/k8s-dns-sidecar:1.21.1
+        image: registry.k8s.io/dns/k8s-dns-sidecar:1.21.1
         livenessProbe:
           httpGet:
             path: /metrics