diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index cebb58fd89f..9cf372ca68a 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -4932,7 +4932,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": { "type": "string" }, diff --git a/api/openapi-spec/v3/api__v1_openapi.json b/api/openapi-spec/v3/api__v1_openapi.json index a1a23c203aa..6a4a2e238d1 100644 --- a/api/openapi-spec/v3/api__v1_openapi.json +++ b/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" diff --git a/build/common.sh b/build/common.sh index 469b938e451..3373123c677 100755 --- a/build/common.sh +++ b/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 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 15b555baaa3..27c32416ac5 100644 --- a/build/dependencies.yaml +++ b/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,29 +109,29 @@ 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 @@ -139,27 +139,27 @@ dependencies: - 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 diff --git a/build/lib/release.sh b/build/lib/release.sh index 6bc6624951e..1ebceb27728 100644 --- a/build/lib/release.sh +++ b/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 diff --git a/build/pause/Makefile b/build/pause/Makefile index 82bb38dead7..feb3ad1fbc0 100644 --- a/build/pause/Makefile +++ b/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 diff --git a/build/root/Makefile b/build/root/Makefile index 8950263627b..97322007be5 100644 --- a/build/root/Makefile +++ b/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 diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile index 43c14ed1690..85667d6acb3 100644 --- a/cluster/addons/addon-manager/Makefile +++ b/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) diff --git a/cluster/addons/addon-manager/README.md b/cluster/addons/addon-manager/README.md index 22d067389f3..e6d82fb5e37 100644 --- a/cluster/addons/addon-manager/README.md +++ b/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 \ No newline at end of file +If you don't want to push the images, run `make` or `make build` instead diff --git a/cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml b/cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml index ee7201e8e32..90ca651ee8a 100644 --- a/cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml +++ b/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 diff --git a/cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml b/cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml index 2f36a44a1db..9def228ef13 100644 --- a/cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml +++ b/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 diff --git a/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml b/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml index e0fd7ce8064..bb636e58de1 100644 --- a/cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml +++ b/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 diff --git a/cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml b/cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml index e08f667d48c..01d77e6577d 100644 --- a/cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml +++ b/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 diff --git a/cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml b/cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml index b964cd43fad..02a62e39874 100644 --- a/cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml +++ b/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: diff --git a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml b/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml index bcc2407d34c..1f4df041cd0 100644 --- a/cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml +++ b/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" diff --git a/cluster/addons/dns/coredns/coredns.yaml.base b/cluster/addons/dns/coredns/coredns.yaml.base index dea3749f217..43eeb812958 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.base +++ b/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: diff --git a/cluster/addons/dns/coredns/coredns.yaml.in b/cluster/addons/dns/coredns/coredns.yaml.in index 808dd54b545..f471fab944e 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.in +++ b/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: diff --git a/cluster/addons/dns/coredns/coredns.yaml.sed b/cluster/addons/dns/coredns/coredns.yaml.sed index 8788f41d31c..53d2b7b9d03 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.sed +++ b/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: diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.base b/cluster/addons/dns/kube-dns/kube-dns.yaml.base index 5b660616ff9..e99a98aac7f 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.base +++ b/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 diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.in b/cluster/addons/dns/kube-dns/kube-dns.yaml.in index 7a61c9925f8..c9110b2a12c 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.in +++ b/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 diff --git a/cluster/addons/dns/kube-dns/kube-dns.yaml.sed b/cluster/addons/dns/kube-dns/kube-dns.yaml.sed index 654cba5ba96..935f15a7002 100644 --- a/cluster/addons/dns/kube-dns/kube-dns.yaml.sed +++ b/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 diff --git a/cluster/addons/dns/nodelocaldns/README.md b/cluster/addons/dns/nodelocaldns/README.md index c58c23fd334..4b0be07edbe 100644 --- a/cluster/addons/dns/nodelocaldns/README.md +++ b/cluster/addons/dns/nodelocaldns/README.md @@ -19,7 +19,7 @@ We have the following variables in the yaml: Note: The local listen IP address for NodeLocal DNSCache can be any address that can be guaranteed to not collide with any existing IP in your cluster. It's recommended to use an address with a local scope, per example, from the link-local range 169.254.0.0/16 for IPv4 or from the Unique Local Address range in IPv6 fd00::/8. -The following variables will be set by the node-cache images - k8s.gcr.io/k8s-dns-node-cache:1.15.6 or later. +The following variables will be set by the node-cache images - registry.k8s.io/k8s-dns-node-cache:1.15.6 or later. The values will be determined by reading the kube-dns configMap for custom Upstream server configuration. `__PILLAR__CLUSTER__DNS__` - Upstream server for in-cluster queries. diff --git a/cluster/addons/dns/nodelocaldns/nodelocaldns.yaml b/cluster/addons/dns/nodelocaldns/nodelocaldns.yaml index 086f92e5cb2..12fc5309395 100644 --- a/cluster/addons/dns/nodelocaldns/nodelocaldns.yaml +++ b/cluster/addons/dns/nodelocaldns/nodelocaldns.yaml @@ -138,7 +138,7 @@ spec: operator: "Exists" containers: - name: node-cache - image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1 + image: registry.k8s.io/dns/k8s-dns-node-cache:1.21.1 resources: requests: cpu: 25m diff --git a/cluster/addons/fluentd-gcp/scaler-deployment.yaml b/cluster/addons/fluentd-gcp/scaler-deployment.yaml index aed86a11a96..fa6ecf61b46 100644 --- a/cluster/addons/fluentd-gcp/scaler-deployment.yaml +++ b/cluster/addons/fluentd-gcp/scaler-deployment.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: fluentd-gcp-scaler containers: - name: fluentd-gcp-scaler - image: k8s.gcr.io/fluentd-gcp-scaler:0.5.2 + image: registry.k8s.io/fluentd-gcp-scaler:0.5.2 command: - /scaler.sh - --ds-name=fluentd-gcp-{{ fluentd_gcp_yaml_version }} diff --git a/cluster/addons/ip-masq-agent/ip-masq-agent.yaml b/cluster/addons/ip-masq-agent/ip-masq-agent.yaml index cdcd4520ec0..4c24ead6f23 100644 --- a/cluster/addons/ip-masq-agent/ip-masq-agent.yaml +++ b/cluster/addons/ip-masq-agent/ip-masq-agent.yaml @@ -29,7 +29,7 @@ spec: hostNetwork: true containers: - name: ip-masq-agent - image: k8s.gcr.io/networking/ip-masq-agent-amd64:v2.6.0 + image: registry.k8s.io/networking/ip-masq-agent-amd64:v2.6.0 args: - --masq-chain=IP-MASQ - --nomasq-all-reserved-ranges diff --git a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml index 5c578903de5..06b6a263ddb 100644 --- a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml +++ b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml @@ -43,7 +43,7 @@ spec: effect: "NoSchedule" containers: - name: metadata-proxy - image: k8s.gcr.io/metadata-proxy:v0.1.12 + image: registry.k8s.io/metadata-proxy:v0.1.12 args: ["--addr=0.0.0.0:988"] securityContext: privileged: true diff --git a/cluster/addons/metrics-server/metrics-server-deployment.yaml b/cluster/addons/metrics-server/metrics-server-deployment.yaml index 58a94e05a2c..c756c405445 100644 --- a/cluster/addons/metrics-server/metrics-server-deployment.yaml +++ b/cluster/addons/metrics-server/metrics-server-deployment.yaml @@ -50,7 +50,7 @@ spec: kubernetes.io/os: linux containers: - name: metrics-server - image: k8s.gcr.io/metrics-server/metrics-server:v0.5.2 + image: registry.k8s.io/metrics-server/metrics-server:v0.5.2 command: - /metrics-server - --metric-resolution=30s @@ -81,7 +81,7 @@ spec: - mountPath: /tmp name: tmp-dir - name: metrics-server-nanny - image: k8s.gcr.io/autoscaling/addon-resizer:1.8.14 + image: registry.k8s.io/autoscaling/addon-resizer:1.8.14 resources: limits: cpu: 100m diff --git a/cluster/addons/node-problem-detector/npd.yaml b/cluster/addons/node-problem-detector/npd.yaml index dc6b852af07..df4e189f147 100644 --- a/cluster/addons/node-problem-detector/npd.yaml +++ b/cluster/addons/node-problem-detector/npd.yaml @@ -47,7 +47,7 @@ spec: spec: containers: - name: node-problem-detector - image: k8s.gcr.io/node-problem-detector/node-problem-detector:v0.8.9 + image: registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.9 command: - "/bin/sh" - "-c" diff --git a/cluster/addons/volumesnapshots/volume-snapshot-controller/volume-snapshot-controller-deployment.yaml b/cluster/addons/volumesnapshots/volume-snapshot-controller/volume-snapshot-controller-deployment.yaml index e583dadb025..2a9a0ac9f99 100644 --- a/cluster/addons/volumesnapshots/volume-snapshot-controller/volume-snapshot-controller-deployment.yaml +++ b/cluster/addons/volumesnapshots/volume-snapshot-controller/volume-snapshot-controller-deployment.yaml @@ -22,7 +22,7 @@ spec: serviceAccount: volume-snapshot-controller containers: - name: volume-snapshot-controller - image: k8s.gcr.io/sig-storage/snapshot-controller:v4.0.0 + image: registry.k8s.io/sig-storage/snapshot-controller:v4.0.0 args: - "--v=5" - "--metrics-path=/metrics" diff --git a/cluster/gce/addons/konnectivity-agent/konnectivity-agent-ds.yaml b/cluster/gce/addons/konnectivity-agent/konnectivity-agent-ds.yaml index 4399c6713d7..4e24e2b173e 100644 --- a/cluster/gce/addons/konnectivity-agent/konnectivity-agent-ds.yaml +++ b/cluster/gce/addons/konnectivity-agent/konnectivity-agent-ds.yaml @@ -27,7 +27,7 @@ spec: nodeSelector: kubernetes.io/os: linux containers: - - image: k8s.gcr.io/kas-network-proxy/proxy-agent:v0.0.30 + - image: registry.k8s.io/kas-network-proxy/proxy-agent:v0.0.30 name: konnectivity-agent command: ["/proxy-agent"] args: [ diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh index 535aa174b15..a9aa221d0cb 100644 --- a/cluster/gce/config-common.sh +++ b/cluster/gce/config-common.sh @@ -160,7 +160,7 @@ export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfi # Path for kube-proxy kubeconfig file on Windows nodes. export WINDOWS_NODEPROBLEMDETECTOR_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\node-problem-detector.kubeconfig" # Pause container image for Windows container. -export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.7" +export WINDOWS_INFRA_CONTAINER="registry.k8s.io/pause:3.7" # Storage Path for csi-proxy. csi-proxy only needs to be installed for Windows. export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy" # Version for csi-proxy diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 2498262326d..0e2a956a33b 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -200,7 +200,7 @@ HEAPSTER_MACHINE_TYPE=${HEAPSTER_MACHINE_TYPE:-} NUM_ADDITIONAL_NODES=${NUM_ADDITIONAL_NODES:-} ADDITIONAL_MACHINE_TYPE=${ADDITIONAL_MACHINE_TYPE:-} -# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. v3.5.1-0) if you need +# Set etcd image (e.g. registry.k8s.io/etcd) and version (e.g. v3.5.1-0) if you need # non-default version. export ETCD_IMAGE=${TEST_ETCD_IMAGE:-} export ETCD_DOCKER_REPOSITORY=${TEST_ETCD_DOCKER_REPOSITORY:-} diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 16a9be9c7c0..3997d3897a7 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1720,7 +1720,7 @@ function prepare-kube-proxy-manifest-variables { local -r src_file=$1; local -r kubeconfig="--kubeconfig=/var/lib/kube-proxy/kubeconfig" - local kube_docker_registry="k8s.gcr.io" + local kube_docker_registry="registry.k8s.io" if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then kube_docker_registry=${KUBE_DOCKER_REGISTRY} fi @@ -2057,7 +2057,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="k8s.gcr.io" + DOCKER_REGISTRY="registry.k8s.io" if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY}" fi @@ -2989,7 +2989,7 @@ spec: - name: vol containers: - name: pv-recycler - image: k8s.gcr.io/debian-base:v2.0.0 + image: registry.k8s.io/debian-base:v2.0.0 command: - /bin/sh args: @@ -3002,7 +3002,7 @@ EOF # fixup the alternate registry if specified if [[ -n "${KUBE_ADDON_REGISTRY:-}" ]]; then - sed -i -e "s@k8s.gcr.io@${KUBE_ADDON_REGISTRY}@g" "${PV_RECYCLER_OVERRIDE_TEMPLATE}" + sed -i -e "s@registry.k8s.io@${KUBE_ADDON_REGISTRY}@g" "${PV_RECYCLER_OVERRIDE_TEMPLATE}" fi } @@ -3074,7 +3074,7 @@ oom_score = -999 [plugins."io.containerd.grpc.v1.cri"] stream_server_address = "127.0.0.1" max_container_log_line_size = ${CONTAINERD_MAX_CONTAINER_LOG_LINE:-262144} - sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"k8s.gcr.io/pause:3.7"}" + sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.7"}" [plugins."io.containerd.grpc.v1.cri".cni] bin_dir = "${KUBE_HOME}/bin" conf_dir = "/etc/cni/net.d" @@ -3085,10 +3085,10 @@ oom_score = -999 runtime_type = "io.containerd.runc.v2" [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] endpoint = ["https://mirror.gcr.io","https://registry-1.docker.io"] -# Enable registry.k8s.io as the primary mirror for k8s.gcr.io +# Enable registry.k8s.io as the primary mirror for registry.k8s.io # See: https://github.com/kubernetes/k8s.io/issues/3411 -[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"] - endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",] +[plugins."io.containerd.grpc.v1.cri".registry.mirrors."registry.k8s.io"] + endpoint = ["https://registry.k8s.io", "https://registry.k8s.io",] EOF if [[ "${CONTAINER_RUNTIME_TEST_HANDLER:-}" == "true" ]]; then diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index 4f1e240db07..eee1f65cedb 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -399,12 +399,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:-k8s.gcr.io}" - if [[ "${kube_addon_registry}" != "k8s.gcr.io" ]]; then + local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-registry.k8s.io}" + if [[ "${kube_addon_registry}" != "registry.k8s.io" ]]; then find "${dst_dir}" \( -name '*.yaml' -or -name '*.yaml.in' \) -print0 | \ - xargs -0 sed -ri "s@(image:\s.*)k8s.gcr.io@\1${kube_addon_registry}@" + xargs -0 sed -ri "s@(image:\s.*)registry.k8s.io@\1${kube_addon_registry}@" find "${dst_dir}" \( -name '*.manifest' -or -name '*.json' \) -print0 | \ - xargs -0 sed -ri "s@(image\":\s+\")k8s.gcr.io@\1${kube_addon_registry}@" + xargs -0 sed -ri "s@(image\":\s+\")registry.k8s.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/configure-kubeapiserver.sh" "${KUBE_BIN}/configure-kubeapiserver.sh" @@ -454,8 +454,8 @@ function try-load-docker-image { container=${img##*/} container=${container%.tar} # find the right one for which we will need an additional tag - container=$(ctr -n k8s.io images ls | grep "k8s.gcr.io/${container}" | awk '{print $1}' | cut -f 2 -d '/') - ${tag_image_command} "k8s.gcr.io/${container}" "${KUBE_ADDON_REGISTRY}/${container}" + container=$(ctr -n k8s.io images ls | grep "registry.k8s.io/${container}" | awk '{print $1}' | cut -f 2 -d '/') + ${tag_image_command} "registry.k8s.io/${container}" "${KUBE_ADDON_REGISTRY}/${container}" fi # Re-enable errexit. set -e diff --git a/cluster/gce/gci/testdata/kube-apiserver/base.template b/cluster/gce/gci/testdata/kube-apiserver/base.template index 3ec566991a7..99b07c43ded 100644 --- a/cluster/gce/gci/testdata/kube-apiserver/base.template +++ b/cluster/gce/gci/testdata/kube-apiserver/base.template @@ -10,7 +10,7 @@ readonly APISERVER_CLIENT_CERT_PATH=/foo/bar readonly CLOUD_CONFIG_MOUNT="{\"name\": \"cloudconfigmount\",\"mountPath\": \"/etc/gce.conf\", \"readOnly\": true}," readonly CLOUD_CONFIG_VOLUME="{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"/etc/gce.conf\", \"type\": \"FileOrCreate\"}}," readonly INSECURE_PORT_MAPPING="{ \"name\": \"local\", \"containerPort\": 8080, \"hostPort\": 8080}," -readonly DOCKER_REGISTRY="k8s.gcr.io" +readonly DOCKER_REGISTRY="registry.k8s.io" readonly ENABLE_LEGACY_ABAC=false readonly ETC_MANIFESTS=${KUBE_HOME}/etc/kubernetes/manifests readonly KUBE_API_SERVER_DOCKER_TAG=v1.11.0-alpha.0.1808_3c7452dc11645d-dirty diff --git a/cluster/gce/manifests/cluster-autoscaler.manifest b/cluster/gce/manifests/cluster-autoscaler.manifest index ab1ead59213..390d5e71b7c 100644 --- a/cluster/gce/manifests/cluster-autoscaler.manifest +++ b/cluster/gce/manifests/cluster-autoscaler.manifest @@ -19,7 +19,7 @@ "containers": [ { "name": "cluster-autoscaler", - "image": "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.0", + "image": "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.0", "livenessProbe": { "httpGet": { "path": "/health-check", diff --git a/cluster/gce/manifests/etcd.manifest b/cluster/gce/manifests/etcd.manifest index 3be6ed9a0e7..3504861135e 100644 --- a/cluster/gce/manifests/etcd.manifest +++ b/cluster/gce/manifests/etcd.manifest @@ -18,7 +18,7 @@ { "name": "etcd-container", {{security_context}} - "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.3-0') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.3-0') }}", "resources": { "requests": { "cpu": {{ cpulimit }} diff --git a/cluster/gce/manifests/konnectivity-server.yaml b/cluster/gce/manifests/konnectivity-server.yaml index d66e0a644a8..24d7d74fad9 100644 --- a/cluster/gce/manifests/konnectivity-server.yaml +++ b/cluster/gce/manifests/konnectivity-server.yaml @@ -20,7 +20,7 @@ spec: {{ disallow_privilege_escalation}} {{ capabilities }} {{ drop_capabilities }} - image: k8s.gcr.io/kas-network-proxy/proxy-server:v0.0.30 + image: registry.k8s.io/kas-network-proxy/proxy-server:v0.0.30 resources: requests: cpu: 25m diff --git a/cluster/gce/manifests/kube-addon-manager.yaml b/cluster/gce/manifests/kube-addon-manager.yaml index fb64eb4924f..f93570d6bcb 100644 --- a/cluster/gce/manifests/kube-addon-manager.yaml +++ b/cluster/gce/manifests/kube-addon-manager.yaml @@ -23,7 +23,7 @@ spec: - all # When updating version also bump it in: # - test/kubemark/resources/manifests/kube-addon-manager.yaml - image: k8s.gcr.io/addon-manager/kube-addon-manager:v9.1.6 + image: registry.k8s.io/addon-manager/kube-addon-manager:v9.1.6 command: - /bin/bash - -c diff --git a/cluster/gce/windows/smoke-test.sh b/cluster/gce/windows/smoke-test.sh index 49664f6f6e3..3fee4a2a8ff 100755 --- a/cluster/gce/windows/smoke-test.sh +++ b/cluster/gce/windows/smoke-test.sh @@ -358,7 +358,7 @@ spec: spec: containers: - name: pause-win - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 nodeSelector: kubernetes.io/os: windows tolerations: diff --git a/cluster/images/etcd-version-monitor/etcd-version-monitor.yaml b/cluster/images/etcd-version-monitor/etcd-version-monitor.yaml index 1653e01afd2..67371e9f5b3 100644 --- a/cluster/images/etcd-version-monitor/etcd-version-monitor.yaml +++ b/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 diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index bcae0e6be90..076eb876f64 100644 --- a/cluster/images/etcd/Makefile +++ b/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 "-". +# IMAGE_TAG Uniquely identifies registry.k8s.io/etcd docker image with a tag of the form "-". 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-`, ...). -# 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-`, ...). +# 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 diff --git a/cluster/images/etcd/README.md b/cluster/images/etcd/README.md index 324a24fa395..4b98709f611 100644 --- a/cluster/images/etcd/README.md +++ b/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 `-`, 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 diff --git a/cluster/images/kubemark/Dockerfile b/cluster/images/kubemark/Dockerfile index 81d7b55893e..229116d32a6 100644 --- a/cluster/images/kubemark/Dockerfile +++ b/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 diff --git a/cmd/kubeadm/app/apis/kubeadm/types.go b/cmd/kubeadm/app/apis/kubeadm/types.go index d0b90f7c5b6..0e30c483106 100644 --- a/cmd/kubeadm/app/apis/kubeadm/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/types.go @@ -116,8 +116,8 @@ type ClusterConfiguration struct { CertificatesDir string // ImageRepository sets the container registry to pull images from. - // If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/`) - // `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` + // If empty, `registry.k8s.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/`) + // `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `registry.k8s.io` // will be used for all the other images. ImageRepository string diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go index 06bf93761fc..318c69d8190 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go @@ -40,7 +40,8 @@ const ( // DefaultCertificatesDir defines default certificate directory DefaultCertificatesDir = "/etc/kubernetes/pki" // DefaultImageRepository defines default image registry - DefaultImageRepository = "k8s.gcr.io" + // (previously this defaulted to k8s.gcr.io) + DefaultImageRepository = "registry.k8s.io" // DefaultManifestsDir defines default manifests directory DefaultManifestsDir = "/etc/kubernetes/manifests" // DefaultClusterName defines the default cluster name diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta2/doc.go b/cmd/kubeadm/app/apis/kubeadm/v1beta2/doc.go index 64ae2bb8f7c..fd1fa48d34c 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta2/doc.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta2/doc.go @@ -188,7 +188,7 @@ limitations under the License. // etcd: // # one of local or external // local: -// imageRepository: "k8s.gcr.io" +// imageRepository: "registry.k8s.io" // imageTag: "3.2.24" // dataDir: "/var/lib/etcd" // extraArgs: @@ -242,7 +242,7 @@ limitations under the License. // readOnly: false // pathType: File // certificatesDir: "/etc/kubernetes/pki" -// imageRepository: "k8s.gcr.io" +// imageRepository: "registry.k8s.io" // useHyperKubeImage: false // clusterName: "example-cluster" // --- diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go b/cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go index a5cf40c513a..b13a85e64a7 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go @@ -96,8 +96,8 @@ type ClusterConfiguration struct { CertificatesDir string `json:"certificatesDir,omitempty"` // ImageRepository sets the container registry to pull images from. - // If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/`) - // `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` + // If empty, `registry.k8s.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/`) + // `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `registry.k8s.io` // will be used for all the other images. ImageRepository string `json:"imageRepository,omitempty"` diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go index 193686b0981..77ff4aca6b0 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go @@ -42,7 +42,8 @@ const ( // DefaultCertificatesDir defines default certificate directory DefaultCertificatesDir = "/etc/kubernetes/pki" // DefaultImageRepository defines default image registry - DefaultImageRepository = "k8s.gcr.io" + // (previously this defaulted to k8s.gcr.io) + DefaultImageRepository = "registry.k8s.io" // DefaultManifestsDir defines default manifests directory DefaultManifestsDir = "/etc/kubernetes/manifests" // DefaultClusterName defines the default cluster name diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go index 8353359f91a..eb9eb6469f4 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go @@ -195,7 +195,7 @@ limitations under the License. // etcd: // # one of local or external // local: -// imageRepository: "k8s.gcr.io" +// imageRepository: "registry.k8s.io" // imageTag: "3.2.24" // dataDir: "/var/lib/etcd" // extraArgs: @@ -249,7 +249,7 @@ limitations under the License. // readOnly: false // pathType: File // certificatesDir: "/etc/kubernetes/pki" -// imageRepository: "k8s.gcr.io" +// imageRepository: "registry.k8s.io" // clusterName: "example-cluster" // --- // apiVersion: kubelet.config.k8s.io/v1beta1 diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go index 5a5151bf64b..525e2046925 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go @@ -122,8 +122,8 @@ type ClusterConfiguration struct { CertificatesDir string `json:"certificatesDir,omitempty"` // ImageRepository sets the container registry to pull images from. - // If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/`) - // `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` + // If empty, `registry.k8s.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/`) + // `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `registry.k8s.io` // will be used for all the other images. // +optional ImageRepository string `json:"imageRepository,omitempty"` diff --git a/cmd/kubeadm/app/cmd/config_test.go b/cmd/kubeadm/app/cmd/config_test.go index 17b470428aa..0b4f10eb558 100644 --- a/cmd/kubeadm/app/cmd/config_test.go +++ b/cmd/kubeadm/app/cmd/config_test.go @@ -235,13 +235,13 @@ func TestConfigImagesListOutput(t *testing.T) { KubernetesVersion: dummyKubernetesVersionStr, }, outputFormat: "text", - expectedOutput: `k8s.gcr.io/kube-apiserver:{{.KubeVersion}} -k8s.gcr.io/kube-controller-manager:{{.KubeVersion}} -k8s.gcr.io/kube-scheduler:{{.KubeVersion}} -k8s.gcr.io/kube-proxy:{{.KubeVersion}} -k8s.gcr.io/pause:{{.PauseVersion}} -k8s.gcr.io/etcd:{{.EtcdVersion}} -k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} + expectedOutput: `registry.k8s.io/kube-apiserver:{{.KubeVersion}} +registry.k8s.io/kube-controller-manager:{{.KubeVersion}} +registry.k8s.io/kube-scheduler:{{.KubeVersion}} +registry.k8s.io/kube-proxy:{{.KubeVersion}} +registry.k8s.io/pause:{{.PauseVersion}} +registry.k8s.io/etcd:{{.EtcdVersion}} +registry.k8s.io/coredns/coredns:{{.CoreDNSVersion}} `, }, { @@ -254,13 +254,13 @@ k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} "kind": "Images", "apiVersion": "output.kubeadm.k8s.io/v1alpha2", "images": [ - "k8s.gcr.io/kube-apiserver:{{.KubeVersion}}", - "k8s.gcr.io/kube-controller-manager:{{.KubeVersion}}", - "k8s.gcr.io/kube-scheduler:{{.KubeVersion}}", - "k8s.gcr.io/kube-proxy:{{.KubeVersion}}", - "k8s.gcr.io/pause:{{.PauseVersion}}", - "k8s.gcr.io/etcd:{{.EtcdVersion}}", - "k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}}" + "registry.k8s.io/kube-apiserver:{{.KubeVersion}}", + "registry.k8s.io/kube-controller-manager:{{.KubeVersion}}", + "registry.k8s.io/kube-scheduler:{{.KubeVersion}}", + "registry.k8s.io/kube-proxy:{{.KubeVersion}}", + "registry.k8s.io/pause:{{.PauseVersion}}", + "registry.k8s.io/etcd:{{.EtcdVersion}}", + "registry.k8s.io/coredns/coredns:{{.CoreDNSVersion}}" ] } `, @@ -273,13 +273,13 @@ k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} outputFormat: "yaml", expectedOutput: `apiVersion: output.kubeadm.k8s.io/v1alpha2 images: -- k8s.gcr.io/kube-apiserver:{{.KubeVersion}} -- k8s.gcr.io/kube-controller-manager:{{.KubeVersion}} -- k8s.gcr.io/kube-scheduler:{{.KubeVersion}} -- k8s.gcr.io/kube-proxy:{{.KubeVersion}} -- k8s.gcr.io/pause:{{.PauseVersion}} -- k8s.gcr.io/etcd:{{.EtcdVersion}} -- k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} +- registry.k8s.io/kube-apiserver:{{.KubeVersion}} +- registry.k8s.io/kube-controller-manager:{{.KubeVersion}} +- registry.k8s.io/kube-scheduler:{{.KubeVersion}} +- registry.k8s.io/kube-proxy:{{.KubeVersion}} +- registry.k8s.io/pause:{{.PauseVersion}} +- registry.k8s.io/etcd:{{.EtcdVersion}} +- registry.k8s.io/coredns/coredns:{{.CoreDNSVersion}} kind: Images `, }, @@ -289,13 +289,13 @@ kind: Images KubernetesVersion: dummyKubernetesVersionStr, }, outputFormat: `go-template={{range .images}}{{.}}{{"\n"}}{{end}}`, - expectedOutput: `k8s.gcr.io/kube-apiserver:{{.KubeVersion}} -k8s.gcr.io/kube-controller-manager:{{.KubeVersion}} -k8s.gcr.io/kube-scheduler:{{.KubeVersion}} -k8s.gcr.io/kube-proxy:{{.KubeVersion}} -k8s.gcr.io/pause:{{.PauseVersion}} -k8s.gcr.io/etcd:{{.EtcdVersion}} -k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} + expectedOutput: `registry.k8s.io/kube-apiserver:{{.KubeVersion}} +registry.k8s.io/kube-controller-manager:{{.KubeVersion}} +registry.k8s.io/kube-scheduler:{{.KubeVersion}} +registry.k8s.io/kube-proxy:{{.KubeVersion}} +registry.k8s.io/pause:{{.PauseVersion}} +registry.k8s.io/etcd:{{.EtcdVersion}} +registry.k8s.io/coredns/coredns:{{.CoreDNSVersion}} `, }, { @@ -304,8 +304,8 @@ k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} KubernetesVersion: dummyKubernetesVersionStr, }, outputFormat: `jsonpath={range.images[*]}{@} {end}`, - expectedOutput: "k8s.gcr.io/kube-apiserver:{{.KubeVersion}} k8s.gcr.io/kube-controller-manager:{{.KubeVersion}} k8s.gcr.io/kube-scheduler:{{.KubeVersion}} " + - "k8s.gcr.io/kube-proxy:{{.KubeVersion}} k8s.gcr.io/pause:{{.PauseVersion}} k8s.gcr.io/etcd:{{.EtcdVersion}} k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} ", + expectedOutput: "registry.k8s.io/kube-apiserver:{{.KubeVersion}} registry.k8s.io/kube-controller-manager:{{.KubeVersion}} registry.k8s.io/kube-scheduler:{{.KubeVersion}} " + + "registry.k8s.io/kube-proxy:{{.KubeVersion}} registry.k8s.io/pause:{{.PauseVersion}} registry.k8s.io/etcd:{{.EtcdVersion}} registry.k8s.io/coredns/coredns:{{.CoreDNSVersion}} ", }, } diff --git a/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go b/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go index df6b3fff383..72267b968cb 100644 --- a/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go +++ b/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go @@ -218,7 +218,7 @@ var ( etcd: local: dataDir: /var/lib/etcd - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io kind: ClusterConfiguration kubernetesVersion: 1.2.3 networking: @@ -234,7 +234,7 @@ var ( ClusterName: "LeCluster", KubernetesVersion: "1.2.3", CertificatesDir: "/etc/kubernetes/pki", - ImageRepository: "k8s.gcr.io", + ImageRepository: "registry.k8s.io", Networking: kubeadmapiv1.Networking{ DNSDomain: "cluster.local", ServiceSubnet: "10.96.0.0/12", diff --git a/cmd/kubeadm/app/images/images.go b/cmd/kubeadm/app/images/images.go index ee55eb6c995..4c2982d9f6d 100644 --- a/cmd/kubeadm/app/images/images.go +++ b/cmd/kubeadm/app/images/images.go @@ -48,7 +48,7 @@ func GetDNSImage(cfg *kubeadmapi.ClusterConfiguration) string { if cfg.DNS.ImageRepository != "" { dnsImageRepository = cfg.DNS.ImageRepository } - // Handle the renaming of the official image from "k8s.gcr.io/coredns" to "k8s.gcr.io/coredns/coredns + // Handle the renaming of the official image from "registry.k8s.io/coredns" to "registry.k8s.io/coredns/coredns if dnsImageRepository == kubeadmapiv1beta2.DefaultImageRepository { dnsImageRepository = fmt.Sprintf("%s/coredns", dnsImageRepository) } diff --git a/cmd/kubeadm/app/images/images_test.go b/cmd/kubeadm/app/images/images_test.go index 2b8affce236..816a03e9d76 100644 --- a/cmd/kubeadm/app/images/images_test.go +++ b/cmd/kubeadm/app/images/images_test.go @@ -29,7 +29,7 @@ import ( const ( testversion = "v10.1.2-alpha.1.100+0123456789abcdef+SOMETHING" expected = "v10.1.2-alpha.1.100_0123456789abcdef_SOMETHING" - gcrPrefix = "k8s.gcr.io" + gcrPrefix = "registry.k8s.io" ) func TestGetGenericImage(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/kubelet/flags_test.go b/cmd/kubeadm/app/phases/kubelet/flags_test.go index bb21e9622fe..167a2fa1861 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags_test.go +++ b/cmd/kubeadm/app/phases/kubelet/flags_test.go @@ -77,12 +77,12 @@ func TestBuildKubeletArgMap(t *testing.T) { nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{ CRISocket: "unix:///var/run/containerd/containerd.sock", }, - pauseImage: "k8s.gcr.io/pause:3.7", + pauseImage: "registry.k8s.io/pause:3.7", }, expected: map[string]string{ "container-runtime": "remote", "container-runtime-endpoint": "unix:///var/run/containerd/containerd.sock", - "pod-infra-container-image": "k8s.gcr.io/pause:3.7", + "pod-infra-container-image": "registry.k8s.io/pause:3.7", }, }, } diff --git a/cmd/kubeadm/app/phases/upgrade/compute_test.go b/cmd/kubeadm/app/phases/upgrade/compute_test.go index aef4af9a361..2b0296bb7fd 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute_test.go +++ b/cmd/kubeadm/app/phases/upgrade/compute_test.go @@ -83,7 +83,7 @@ metadata: spec: containers: - name: etcd - image: k8s.gcr.io/etcd:` + fakeCurrentEtcdVersion + image: registry.k8s.io/etcd:` + fakeCurrentEtcdVersion func getEtcdVersion(v *versionutil.Version) string { etcdVer, _, _ := constants.EtcdSupportedVersion(constants.SupportedEtcdVersion, v.String()) diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go index a48739f3011..e293d6b375e 100644 --- a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go +++ b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go @@ -80,7 +80,7 @@ etcd: local: dataDir: %%s image: "" -imageRepository: k8s.gcr.io +imageRepository: registry.k8s.io kubernetesVersion: %%s networking: dnsDomain: cluster.local @@ -997,7 +997,7 @@ metadata: spec: containers: - name: etcd - image: k8s.gcr.io/etcd:` + expectedEtcdVersion + image: registry.k8s.io/etcd:` + expectedEtcdVersion manifestsDir, err := os.MkdirTemp("", "GetEtcdImageTagFromStaticPod-test-manifests") if err != nil { diff --git a/cmd/kubeadm/app/util/template_test.go b/cmd/kubeadm/app/util/template_test.go index 943774ceb32..75c6cdff5aa 100644 --- a/cmd/kubeadm/app/util/template_test.go +++ b/cmd/kubeadm/app/util/template_test.go @@ -22,8 +22,8 @@ import ( const ( validTmpl = "image: {{ .ImageRepository }}/pause:3.7" - validTmplOut = "image: k8s.gcr.io/pause:3.7" - doNothing = "image: k8s.gcr.io/pause:3.7" + validTmplOut = "image: registry.k8s.io/pause:3.7" + doNothing = "image: registry.k8s.io/pause:3.7" invalidTmpl1 = "{{ .baz }/d}" invalidTmpl2 = "{{ !foobar }}" ) @@ -40,7 +40,7 @@ func TestParseTemplate(t *testing.T) { name: "should parse a valid template and set the right values", template: validTmpl, data: struct{ ImageRepository, Arch string }{ - ImageRepository: "k8s.gcr.io", + ImageRepository: "registry.k8s.io", Arch: "amd64", }, output: validTmplOut, @@ -50,7 +50,7 @@ func TestParseTemplate(t *testing.T) { name: "should noop if there aren't any {{ .foo }} present", template: doNothing, data: struct{ ImageRepository, Arch string }{ - ImageRepository: "k8s.gcr.io", + ImageRepository: "registry.k8s.io", Arch: "amd64", }, output: doNothing, diff --git a/cmd/kubelet/app/options/container_runtime.go b/cmd/kubelet/app/options/container_runtime.go index 5c8b5e04eb7..19538c1246c 100644 --- a/cmd/kubelet/app/options/container_runtime.go +++ b/cmd/kubelet/app/options/container_runtime.go @@ -23,7 +23,7 @@ import ( const ( // When these values are updated, also update test/utils/image/manifest.go - defaultPodSandboxImageName = "k8s.gcr.io/pause" + defaultPodSandboxImageName = "registry.k8s.io/pause" defaultPodSandboxImageVersion = "3.7" ) diff --git a/hack/print-workspace-status.sh b/hack/print-workspace-status.sh index a3de7742b29..e4b024100da 100755 --- a/hack/print-workspace-status.sh +++ b/hack/print-workspace-status.sh @@ -43,7 +43,7 @@ STABLE_BUILD_SCM_REVISION ${KUBE_GIT_VERSION-} STABLE_BUILD_MAJOR_VERSION ${KUBE_GIT_MAJOR-} STABLE_BUILD_MINOR_VERSION ${KUBE_GIT_MINOR-} STABLE_DOCKER_TAG ${KUBE_GIT_VERSION/+/_} -STABLE_DOCKER_REGISTRY ${KUBE_DOCKER_REGISTRY:-k8s.gcr.io} +STABLE_DOCKER_REGISTRY ${KUBE_DOCKER_REGISTRY:-registry.k8s.io} STABLE_DOCKER_PUSH_REGISTRY ${KUBE_DOCKER_PUSH_REGISTRY:-${KUBE_DOCKER_REGISTRY:-staging-k8s.gcr.io}} gitCommit ${KUBE_GIT_COMMIT-} gitTreeState ${KUBE_GIT_TREE_STATE-} diff --git a/hack/testdata/deployment-label-change1.yaml b/hack/testdata/deployment-label-change1.yaml index 2f74c64d2d4..6cf98cefb2f 100644 --- a/hack/testdata/deployment-label-change1.yaml +++ b/hack/testdata/deployment-label-change1.yaml @@ -16,6 +16,6 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:test-cmd + image: registry.k8s.io/nginx:test-cmd ports: - containerPort: 80 diff --git a/hack/testdata/deployment-label-change2.yaml b/hack/testdata/deployment-label-change2.yaml index aff8c971de6..087cf10dbe5 100644 --- a/hack/testdata/deployment-label-change2.yaml +++ b/hack/testdata/deployment-label-change2.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:test-cmd + image: registry.k8s.io/nginx:test-cmd ports: - containerPort: 80 diff --git a/hack/testdata/deployment-label-change3.yaml b/hack/testdata/deployment-label-change3.yaml index 92a4dd87f94..7f862078d83 100644 --- a/hack/testdata/deployment-label-change3.yaml +++ b/hack/testdata/deployment-label-change3.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:test-cmd + image: registry.k8s.io/nginx:test-cmd ports: - containerPort: 80 diff --git a/hack/testdata/deployment-multicontainer-resources.yaml b/hack/testdata/deployment-multicontainer-resources.yaml index f574bcac000..0a6defbb5e6 100644 --- a/hack/testdata/deployment-multicontainer-resources.yaml +++ b/hack/testdata/deployment-multicontainer-resources.yaml @@ -16,9 +16,9 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:test-cmd + image: registry.k8s.io/nginx:test-cmd ports: - containerPort: 80 - name: perl - image: k8s.gcr.io/perl + image: registry.k8s.io/perl terminationGracePeriodSeconds: 0 diff --git a/hack/testdata/deployment-multicontainer.yaml b/hack/testdata/deployment-multicontainer.yaml index 47f0ceeb270..fe03193f95a 100644 --- a/hack/testdata/deployment-multicontainer.yaml +++ b/hack/testdata/deployment-multicontainer.yaml @@ -16,8 +16,8 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:test-cmd + image: registry.k8s.io/nginx:test-cmd ports: - containerPort: 80 - name: perl - image: k8s.gcr.io/perl + image: registry.k8s.io/perl diff --git a/hack/testdata/deployment-revision1.yaml b/hack/testdata/deployment-revision1.yaml index d60e08de2b0..8d826ca032c 100644 --- a/hack/testdata/deployment-revision1.yaml +++ b/hack/testdata/deployment-revision1.yaml @@ -16,6 +16,6 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:test-cmd + image: registry.k8s.io/nginx:test-cmd ports: - containerPort: 80 diff --git a/hack/testdata/deployment-revision2.yaml b/hack/testdata/deployment-revision2.yaml index 935e0e146d3..4f98a9dcf6e 100644 --- a/hack/testdata/deployment-revision2.yaml +++ b/hack/testdata/deployment-revision2.yaml @@ -16,6 +16,6 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:1.7.9 + image: registry.k8s.io/nginx:1.7.9 ports: - containerPort: 80 diff --git a/hack/testdata/filter/pod-apply-selector.yaml b/hack/testdata/filter/pod-apply-selector.yaml index b53d7989366..4d647daad5e 100644 --- a/hack/testdata/filter/pod-apply-selector.yaml +++ b/hack/testdata/filter/pod-apply-selector.yaml @@ -8,4 +8,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/hack/testdata/filter/pod-dont-apply.yaml b/hack/testdata/filter/pod-dont-apply.yaml index 442d07a21eb..e73e0d4c62f 100644 --- a/hack/testdata/filter/pod-dont-apply.yaml +++ b/hack/testdata/filter/pod-dont-apply.yaml @@ -8,4 +8,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/hack/testdata/multi-resource-1.yaml b/hack/testdata/multi-resource-1.yaml index e85c092664d..53940ecf909 100644 --- a/hack/testdata/multi-resource-1.yaml +++ b/hack/testdata/multi-resource-1.yaml @@ -11,7 +11,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 --- apiVersion: v1 kind: Namespace diff --git a/hack/testdata/multi-resource-3.yaml b/hack/testdata/multi-resource-3.yaml index f5b7b1c51a5..a612f835959 100644 --- a/hack/testdata/multi-resource-3.yaml +++ b/hack/testdata/multi-resource-3.yaml @@ -8,7 +8,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 --- apiVersion: v1 kind: Pod @@ -17,7 +17,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 --- apiVersion: v1 kind: Pod @@ -26,5 +26,5 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/hack/testdata/multi-resource-json-modify.json b/hack/testdata/multi-resource-json-modify.json index cb803d22e26..5be38c6bee8 100644 --- a/hack/testdata/multi-resource-json-modify.json +++ b/hack/testdata/multi-resource-json-modify.json @@ -43,7 +43,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.7", + "image": "registry.k8s.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-json.json b/hack/testdata/multi-resource-json.json index 0f144431b90..dc9d8f56e01 100644 --- a/hack/testdata/multi-resource-json.json +++ b/hack/testdata/multi-resource-json.json @@ -41,7 +41,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.7", + "image": "registry.k8s.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list-modify.json b/hack/testdata/multi-resource-list-modify.json index 2c4ae0e73f1..b72d53318d0 100644 --- a/hack/testdata/multi-resource-list-modify.json +++ b/hack/testdata/multi-resource-list-modify.json @@ -47,7 +47,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.7", + "image": "registry.k8s.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list.json b/hack/testdata/multi-resource-list.json index 8e9c46e1e9c..02d3af1b9b8 100644 --- a/hack/testdata/multi-resource-list.json +++ b/hack/testdata/multi-resource-list.json @@ -45,7 +45,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.7", + "image": "registry.k8s.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json index 9e18c42ae61..3810049d497 100644 --- a/hack/testdata/multi-resource-rclist-modify.json +++ b/hack/testdata/multi-resource-rclist-modify.json @@ -26,7 +26,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.7", + "image": "registry.k8s.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.7", + "image": "registry.k8s.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json index 9e18c42ae61..3810049d497 100644 --- a/hack/testdata/multi-resource-rclist.json +++ b/hack/testdata/multi-resource-rclist.json @@ -26,7 +26,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.7", + "image": "registry.k8s.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.7", + "image": "registry.k8s.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml index 99a57b8e6ba..88e6cf6d1ee 100644 --- a/hack/testdata/multi-resource-yaml-modify.yaml +++ b/hack/testdata/multi-resource-yaml-modify.yaml @@ -29,7 +29,7 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml index 6082685cf7f..97b8aa43329 100644 --- a/hack/testdata/multi-resource-yaml.yaml +++ b/hack/testdata/multi-resource-yaml.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/null-propagation/deployment-l1.yaml b/hack/testdata/null-propagation/deployment-l1.yaml index e57a6fe9c13..73fb774759f 100644 --- a/hack/testdata/null-propagation/deployment-l1.yaml +++ b/hack/testdata/null-propagation/deployment-l1.yaml @@ -15,4 +15,4 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:1.7.9 + image: registry.k8s.io/nginx:1.7.9 diff --git a/hack/testdata/null-propagation/deployment-l2.yaml b/hack/testdata/null-propagation/deployment-l2.yaml index 19b97127eee..19dbd7d142e 100644 --- a/hack/testdata/null-propagation/deployment-l2.yaml +++ b/hack/testdata/null-propagation/deployment-l2.yaml @@ -14,5 +14,5 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:1.7.9 + image: registry.k8s.io/nginx:1.7.9 terminationMessagePolicy: null diff --git a/hack/testdata/pod-apply.yaml b/hack/testdata/pod-apply.yaml index 5d4dbf61ea9..b476b9a8dcd 100644 --- a/hack/testdata/pod-apply.yaml +++ b/hack/testdata/pod-apply.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/hack/testdata/pod-changed.yaml b/hack/testdata/pod-changed.yaml index f08c34cf095..a5738ccc541 100644 --- a/hack/testdata/pod-changed.yaml +++ b/hack/testdata/pod-changed.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.4 + image: registry.k8s.io/pause:3.4 diff --git a/hack/testdata/pod-with-api-env.yaml b/hack/testdata/pod-with-api-env.yaml index 3f76d210dfb..97fb291d8d2 100644 --- a/hack/testdata/pod-with-api-env.yaml +++ b/hack/testdata/pod-with-api-env.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox + image: registry.k8s.io/busybox command: [ "/bin/sh", "-c", "env" ] env: - name: TEST_CMD_1 diff --git a/hack/testdata/pod-with-large-name.yaml b/hack/testdata/pod-with-large-name.yaml index afe73591816..5c98ab81970 100644 --- a/hack/testdata/pod-with-large-name.yaml +++ b/hack/testdata/pod-with-large-name.yaml @@ -8,5 +8,5 @@ metadata: spec: containers: - name: kubernetes-serve-hostname - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + image: registry.k8s.io/e2e-test-images/agnhost:2.32 command: ["/agnhost", "serve-hostname"] diff --git a/hack/testdata/pod-with-precision.json b/hack/testdata/pod-with-precision.json index 7aa39ad1a78..fd37eeb8261 100644 --- a/hack/testdata/pod-with-precision.json +++ b/hack/testdata/pod-with-precision.json @@ -9,7 +9,7 @@ "containers": [ { "name": "kubernetes-pause", - "image": "k8s.gcr.io/pause:3.7" + "image": "registry.k8s.io/pause:3.7" } ], "restartPolicy": "Never", diff --git a/hack/testdata/pod.yaml b/hack/testdata/pod.yaml index 53fda9c2ad5..305688c5907 100644 --- a/hack/testdata/pod.yaml +++ b/hack/testdata/pod.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/hack/testdata/prune/a.yaml b/hack/testdata/prune/a.yaml index 94290bf67b3..283e24da81f 100644 --- a/hack/testdata/prune/a.yaml +++ b/hack/testdata/prune/a.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/hack/testdata/prune/b.yaml b/hack/testdata/prune/b.yaml index 67a5e7076ee..aa26e3e531d 100644 --- a/hack/testdata/prune/b.yaml +++ b/hack/testdata/prune/b.yaml @@ -8,4 +8,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml b/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml index c516dfdc8f4..3e89c982b94 100644 --- a/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml +++ b/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml @@ -16,6 +16,6 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:1.7.9 + image: registry.k8s.io/nginx:1.7.9 ports: - containerPort: 80 diff --git a/hack/testdata/recursive/deployment/deployment/nginx.yaml b/hack/testdata/recursive/deployment/deployment/nginx.yaml index f4dde6d609d..c207efbdac7 100644 --- a/hack/testdata/recursive/deployment/deployment/nginx.yaml +++ b/hack/testdata/recursive/deployment/deployment/nginx.yaml @@ -16,6 +16,6 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:1.7.9 + image: registry.k8s.io/nginx:1.7.9 ports: - containerPort: 80 diff --git a/hack/testdata/recursive/deployment/nginx.yaml b/hack/testdata/recursive/deployment/nginx.yaml index 7c83f9654a6..9362dd12482 100644 --- a/hack/testdata/recursive/deployment/nginx.yaml +++ b/hack/testdata/recursive/deployment/nginx.yaml @@ -16,6 +16,6 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx:1.7.9 + image: registry.k8s.io/nginx:1.7.9 ports: - containerPort: 80 diff --git a/hack/testdata/rollingupdate-daemonset-rv2.yaml b/hack/testdata/rollingupdate-daemonset-rv2.yaml index f3023834c6a..e57a3361b8b 100644 --- a/hack/testdata/rollingupdate-daemonset-rv2.yaml +++ b/hack/testdata/rollingupdate-daemonset-rv2.yaml @@ -29,6 +29,6 @@ spec: namespaces: [] containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:latest + image: registry.k8s.io/pause:latest - name: app - image: k8s.gcr.io/nginx:test-cmd + image: registry.k8s.io/nginx:test-cmd diff --git a/hack/testdata/rollingupdate-daemonset.yaml b/hack/testdata/rollingupdate-daemonset.yaml index d4ced8044a0..0661fdfe442 100644 --- a/hack/testdata/rollingupdate-daemonset.yaml +++ b/hack/testdata/rollingupdate-daemonset.yaml @@ -29,4 +29,4 @@ spec: namespaces: [] containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:2.0 + image: registry.k8s.io/pause:2.0 diff --git a/hack/testdata/rollingupdate-statefulset-rv2.yaml b/hack/testdata/rollingupdate-statefulset-rv2.yaml index 86eec2f2fc2..8efa58e5fbb 100644 --- a/hack/testdata/rollingupdate-statefulset-rv2.yaml +++ b/hack/testdata/rollingupdate-statefulset-rv2.yaml @@ -20,7 +20,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: nginx - image: k8s.gcr.io/nginx-slim:0.8 + image: registry.k8s.io/nginx-slim:0.8 ports: - containerPort: 80 name: web @@ -29,7 +29,7 @@ spec: - -c - 'while true; do sleep 1; done' - name: pause - image: k8s.gcr.io/pause:2.0 + image: registry.k8s.io/pause:2.0 ports: - containerPort: 81 name: web-2 diff --git a/hack/testdata/rollingupdate-statefulset.yaml b/hack/testdata/rollingupdate-statefulset.yaml index c3c1a51bba1..3278caecc3a 100644 --- a/hack/testdata/rollingupdate-statefulset.yaml +++ b/hack/testdata/rollingupdate-statefulset.yaml @@ -20,7 +20,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: nginx - image: k8s.gcr.io/nginx-slim:0.7 + image: registry.k8s.io/nginx-slim:0.7 ports: - containerPort: 80 name: web diff --git a/hack/testdata/sorted-pods/sorted-pod1.yaml b/hack/testdata/sorted-pods/sorted-pod1.yaml index f937090b02e..401e077538b 100644 --- a/hack/testdata/sorted-pods/sorted-pod1.yaml +++ b/hack/testdata/sorted-pods/sorted-pod1.yaml @@ -8,7 +8,7 @@ metadata: spec: containers: - name: kubernetes-pause2 - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 resources: requests: memory: "64Mi" diff --git a/hack/testdata/sorted-pods/sorted-pod2.yaml b/hack/testdata/sorted-pods/sorted-pod2.yaml index 71cfe229b7b..d4a27eef8a0 100644 --- a/hack/testdata/sorted-pods/sorted-pod2.yaml +++ b/hack/testdata/sorted-pods/sorted-pod2.yaml @@ -8,7 +8,7 @@ metadata: spec: containers: - name: kubernetes-pause1 - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 resources: requests: memory: "1G" diff --git a/hack/testdata/sorted-pods/sorted-pod3.yaml b/hack/testdata/sorted-pods/sorted-pod3.yaml index 9f3386ba630..d3e7520fde1 100644 --- a/hack/testdata/sorted-pods/sorted-pod3.yaml +++ b/hack/testdata/sorted-pods/sorted-pod3.yaml @@ -8,4 +8,4 @@ metadata: spec: containers: - name: kubernetes-pause3 - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/pkg/api/testing/deep_copy_test.go b/pkg/api/testing/deep_copy_test.go index b3bb453e24a..84049738689 100644 --- a/pkg/api/testing/deep_copy_test.go +++ b/pkg/api/testing/deep_copy_test.go @@ -64,7 +64,7 @@ var benchmarkPod = api.Pod{ Containers: []api.Container{ { Name: "etcd-container", - Image: "k8s.gcr.io/etcd:2.0.9", + Image: "registry.k8s.io/etcd:2.0.9", Command: []string{ "/usr/local/bin/etcd", "--addr", @@ -120,7 +120,7 @@ var benchmarkPod = api.Pod{ }, Ready: true, RestartCount: 0, - Image: "k8s.gcr.io/etcd:2.0.9", + Image: "registry.k8s.io/etcd:2.0.9", ImageID: "docker://b6b9a86dc06aa1361357ca1b105feba961f6a4145adca6c54e142c0be0fe87b0", ContainerID: "docker://3cbbf818f1addfc252957b4504f56ef2907a313fe6afc47fc75373674255d46d", }, diff --git a/pkg/api/testing/replication_controller_example.json b/pkg/api/testing/replication_controller_example.json index 18bc181a59b..52e15c2e200 100644 --- a/pkg/api/testing/replication_controller_example.json +++ b/pkg/api/testing/replication_controller_example.json @@ -46,7 +46,7 @@ "containers": [ { "name": "elasticsearch-logging", - "image": "k8s.gcr.io/elasticsearch:1.0", + "image": "registry.k8s.io/elasticsearch:1.0", "ports": [ { "name": "db", diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index a2dc407f3c1..4bb2b7b0832 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -15922,7 +15922,7 @@ func schema_k8sio_api_core_v1_ContainerImage(ref common.ReferenceCallback) commo Properties: map[string]spec.Schema{ "names": { SchemaProps: spec.SchemaProps{ - 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\"]", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ diff --git a/pkg/kubelet/images/image_gc_manager_test.go b/pkg/kubelet/images/image_gc_manager_test.go index 24d16d497b3..ed65d79d81e 100644 --- a/pkg/kubelet/images/image_gc_manager_test.go +++ b/pkg/kubelet/images/image_gc_manager_test.go @@ -35,7 +35,7 @@ import ( ) var zero time.Time -var sandboxImage = "k8s.gcr.io/pause-amd64:latest" +var sandboxImage = "registry.k8s.io/pause-amd64:latest" func newRealImageGCManager(policy ImageGCPolicy, mockStatsProvider stats.Provider) (*realImageGCManager, *containertest.FakeRuntime) { fakeRuntime := &containertest.FakeRuntime{} diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index 4ca030dabba..9495e633c3b 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -109,7 +109,7 @@ func generateImageTags() []string { // that kubelet report up to MaxNamesPerImageInNodeStatus tags. count := rand.IntnRange(nodestatus.MaxNamesPerImageInNodeStatus+1, maxImageTagsForTest+1) for ; count > 0; count-- { - tagList = append(tagList, "k8s.gcr.io:v"+strconv.Itoa(count)) + tagList = append(tagList, "registry.k8s.io:v"+strconv.Itoa(count)) } return tagList } @@ -463,11 +463,11 @@ func TestUpdateExistingNodeStatus(t *testing.T) { // images will be sorted from max to min in node status. Images: []v1.ContainerImage{ { - Names: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"}, + Names: []string{"registry.k8s.io:v1", "registry.k8s.io:v2"}, SizeBytes: 123, }, { - Names: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"}, + Names: []string{"registry.k8s.io:v3", "registry.k8s.io:v4"}, SizeBytes: 456, }, }, @@ -661,11 +661,11 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) { }, Images: []v1.ContainerImage{ { - Names: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"}, + Names: []string{"registry.k8s.io:v1", "registry.k8s.io:v2"}, SizeBytes: 123, }, { - Names: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"}, + Names: []string{"registry.k8s.io:v3", "registry.k8s.io:v4"}, SizeBytes: 456, }, }, @@ -890,11 +890,11 @@ func TestUpdateNodeStatusWithLease(t *testing.T) { // images will be sorted from max to min in node status. Images: []v1.ContainerImage{ { - Names: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"}, + Names: []string{"registry.k8s.io:v1", "registry.k8s.io:v2"}, SizeBytes: 123, }, { - Names: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"}, + Names: []string{"registry.k8s.io:v3", "registry.k8s.io:v4"}, SizeBytes: 456, }, }, diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index f1d48a1d524..eb8269be2c2 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -132,12 +132,12 @@ func newTestKubelet(t *testing.T, controllerAttachDetachEnabled bool) *TestKubel imageList := []kubecontainer.Image{ { ID: "abc", - RepoTags: []string{"k8s.gcr.io:v1", "k8s.gcr.io:v2"}, + RepoTags: []string{"registry.k8s.io:v1", "registry.k8s.io:v2"}, Size: 123, }, { ID: "efg", - RepoTags: []string{"k8s.gcr.io:v3", "k8s.gcr.io:v4"}, + RepoTags: []string{"registry.k8s.io:v3", "registry.k8s.io:v4"}, Size: 456, }, } diff --git a/pkg/kubelet/nodestatus/setters_test.go b/pkg/kubelet/nodestatus/setters_test.go index da339907eb2..246ddfcd992 100644 --- a/pkg/kubelet/nodestatus/setters_test.go +++ b/pkg/kubelet/nodestatus/setters_test.go @@ -1811,7 +1811,7 @@ func makeExpectedImageList(imageList []kubecontainer.Image, maxImages, maxNames func makeImageTags(num int32) []string { tags := make([]string, num) for i := range tags { - tags[i] = "k8s.gcr.io:v" + strconv.Itoa(i) + tags[i] = "registry.k8s.io:v" + strconv.Itoa(i) } return tags } diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index 85d5767858d..6de244f3728 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -1074,7 +1074,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod { Containers: []v1.Container{ { Name: "pv-recycler", - Image: "k8s.gcr.io/debian-base:v2.0.0", + Image: "registry.k8s.io/debian-base:v2.0.0", Command: []string{"/bin/sh"}, Args: []string{"-c", "test -e /scrub && rm -rf /scrub/..?* /scrub/.[!.]* /scrub/* && test -z \"$(ls -A /scrub)\" || exit 1"}, VolumeMounts: []v1.VolumeMount{ diff --git a/pkg/volume/util/operationexecutor/operation_executor.go b/pkg/volume/util/operationexecutor/operation_executor.go index 3a88fe052b6..de301bd7014 100644 --- a/pkg/volume/util/operationexecutor/operation_executor.go +++ b/pkg/volume/util/operationexecutor/operation_executor.go @@ -629,7 +629,7 @@ type MountedVolume struct { // name: test-pd // spec: // containers: - // - image: k8s.gcr.io/test-webserver + // - image: registry.k8s.io/test-webserver // name: test-container // volumeMounts: // - mountPath: /test-pd @@ -667,7 +667,7 @@ type MountedVolume struct { // name: test-pd // spec: // containers: - // - image: k8s.gcr.io/test-webserver + // - image: registry.k8s.io/test-webserver // name: test-container // volumeMounts: // - mountPath: /test-pd diff --git a/pkg/volume/util/operationexecutor/operation_executor_test.go b/pkg/volume/util/operationexecutor/operation_executor_test.go index 59f985de964..b219224946c 100644 --- a/pkg/volume/util/operationexecutor/operation_executor_test.go +++ b/pkg/volume/util/operationexecutor/operation_executor_test.go @@ -751,7 +751,7 @@ func getTestPodWithSecret(podName, secretName string) *v1.Pod { Containers: []v1.Container{ { Name: "secret-volume-test", - Image: "k8s.gcr.io/mounttest:0.8", + Image: "registry.k8s.io/mounttest:0.8", Args: []string{ "--file_content=/etc/secret-volume/data-1", "--file_mode=/etc/secret-volume/data-1"}, @@ -790,7 +790,7 @@ func getTestPodWithGCEPD(podName, pdName string) *v1.Pod { Containers: []v1.Container{ { Name: "pd-volume-test", - Image: "k8s.gcr.io/mounttest:0.8", + Image: "registry.k8s.io/mounttest:0.8", Args: []string{ "--file_content=/etc/pd-volume/data-1", }, diff --git a/pkg/volume/util/recyclerclient/recycler_client_test.go b/pkg/volume/util/recyclerclient/recycler_client_test.go index c352113b456..cd15152a1e6 100644 --- a/pkg/volume/util/recyclerclient/recycler_client_test.go +++ b/pkg/volume/util/recyclerclient/recycler_client_test.go @@ -88,8 +88,8 @@ func TestRecyclerPod(t *testing.T) { // Pod gets Running and Succeeded newPodEvent(watch.Added, "podRecyclerSuccess", v1.PodPending, ""), newEvent(v1.EventTypeNormal, "Successfully assigned recycler-for-podRecyclerSuccess to 127.0.0.1"), - newEvent(v1.EventTypeNormal, "Pulling image \"k8s.gcr.io/busybox\""), - newEvent(v1.EventTypeNormal, "Successfully pulled image \"k8s.gcr.io/busybox\""), + newEvent(v1.EventTypeNormal, "Pulling image \"registry.k8s.io/busybox\""), + newEvent(v1.EventTypeNormal, "Successfully pulled image \"registry.k8s.io/busybox\""), newEvent(v1.EventTypeNormal, "Created container with docker id 83d929aeac82"), newEvent(v1.EventTypeNormal, "Started container with docker id 83d929aeac82"), newPodEvent(watch.Modified, "podRecyclerSuccess", v1.PodRunning, ""), @@ -97,8 +97,8 @@ func TestRecyclerPod(t *testing.T) { }, expectedEvents: []mockEvent{ {v1.EventTypeNormal, "Successfully assigned recycler-for-podRecyclerSuccess to 127.0.0.1"}, - {v1.EventTypeNormal, "Pulling image \"k8s.gcr.io/busybox\""}, - {v1.EventTypeNormal, "Successfully pulled image \"k8s.gcr.io/busybox\""}, + {v1.EventTypeNormal, "Pulling image \"registry.k8s.io/busybox\""}, + {v1.EventTypeNormal, "Successfully pulled image \"registry.k8s.io/busybox\""}, {v1.EventTypeNormal, "Created container with docker id 83d929aeac82"}, {v1.EventTypeNormal, "Started container with docker id 83d929aeac82"}, }, diff --git a/pkg/volume/util/util_test.go b/pkg/volume/util/util_test.go index 50758c3758d..715838c5e31 100644 --- a/pkg/volume/util/util_test.go +++ b/pkg/volume/util/util_test.go @@ -52,7 +52,7 @@ metadata: name: testpod spec: containers: - - image: k8s.gcr.io/busybox + - image: registry.k8s.io/busybox `, false, }, @@ -69,7 +69,7 @@ spec: "spec": { "containers": [ { - "image": "k8s.gcr.io/busybox" + "image": "registry.k8s.io/busybox" } ] } @@ -85,7 +85,7 @@ kind: Pod metadata: name: testpod spec: - - image: k8s.gcr.io/busybox + - image: registry.k8s.io/busybox `, true, }, diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index a94ffa94c92..bb6f8b17c51 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -794,7 +794,7 @@ message Container { // Describe a container image message ContainerImage { // Names by which this image is known. - // e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] + // e.g. ["kubernetes.example/hyperkube:v1.0.7", "cloud-vendor.registry.example/cloud-vendor/hyperkube:v1.0.7"] // +optional repeated string names = 1; diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index f405e7975e9..73c605fb5bf 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -5110,7 +5110,7 @@ type PodSignature struct { // Describe a container image type ContainerImage struct { // Names by which this image is known. - // e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] + // e.g. ["kubernetes.example/hyperkube:v1.0.7", "cloud-vendor.registry.example/cloud-vendor/hyperkube:v1.0.7"] // +optional Names []string `json:"names" protobuf:"bytes,1,rep,name=names"` // The size of the image in bytes. diff --git a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go index cd0cfabc78a..cb898881f24 100644 --- a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go @@ -357,7 +357,7 @@ func (Container) SwaggerDoc() map[string]string { var map_ContainerImage = map[string]string{ "": "Describe a container image", - "names": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", + "names": "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\"]", "sizeBytes": "The size of the image in bytes.", } diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/node.yaml b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/node.yaml index de69de83e63..66e849f23fb 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/node.yaml +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/node.yaml @@ -133,8 +133,8 @@ status: - grafana/grafana:4.4.2 sizeBytes: 287008013 - names: - - k8s.gcr.io/node-problem-detector@sha256:f95cab985c26b2f46e9bd43283e0bfa88860c14e0fb0649266babe8b65e9eb2b - - k8s.gcr.io/node-problem-detector:v0.4.1 + - registry.k8s.io/node-problem-detector@sha256:f95cab985c26b2f46e9bd43283e0bfa88860c14e0fb0649266babe8b65e9eb2b + - registry.k8s.io/node-problem-detector:v0.4.1 sizeBytes: 286572743 - names: - grafana/grafana@sha256:7ff7f9b2501a5d55b55ce3f58d21771b1c5af1f2a4ab7dbf11bef7142aae7033 @@ -153,76 +153,76 @@ status: - nginx:1.10.1 sizeBytes: 180708613 - names: - - k8s.gcr.io/fluentd-elasticsearch@sha256:b8c94527b489fb61d3d81ce5ad7f3ddbb7be71e9620a3a36e2bede2f2e487d73 - - k8s.gcr.io/fluentd-elasticsearch:v2.0.4 + - registry.k8s.io/fluentd-elasticsearch@sha256:b8c94527b489fb61d3d81ce5ad7f3ddbb7be71e9620a3a36e2bede2f2e487d73 + - registry.k8s.io/fluentd-elasticsearch:v2.0.4 sizeBytes: 135716379 - names: - nginx@sha256:00be67d6ba53d5318cd91c57771530f5251cfbe028b7be2c4b70526f988cfc9f - nginx:latest sizeBytes: 109357355 - names: - - k8s.gcr.io/kubernetes-dashboard-amd64@sha256:dc4026c1b595435ef5527ca598e1e9c4343076926d7d62b365c44831395adbd0 - - k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.3 + - registry.k8s.io/kubernetes-dashboard-amd64@sha256:dc4026c1b595435ef5527ca598e1e9c4343076926d7d62b365c44831395adbd0 + - registry.k8s.io/kubernetes-dashboard-amd64:v1.8.3 sizeBytes: 102319441 - names: - gcr.io/google_containers/kube-proxy:v1.11.10-gke.5 - - k8s.gcr.io/kube-proxy:v1.11.10-gke.5 + - registry.k8s.io/kube-proxy:v1.11.10-gke.5 sizeBytes: 102279340 - names: - - k8s.gcr.io/event-exporter@sha256:7f9cd7cb04d6959b0aa960727d04fa86759008048c785397b7b0d9dff0007516 - - k8s.gcr.io/event-exporter:v0.2.3 + - registry.k8s.io/event-exporter@sha256:7f9cd7cb04d6959b0aa960727d04fa86759008048c785397b7b0d9dff0007516 + - registry.k8s.io/event-exporter:v0.2.3 sizeBytes: 94171943 - names: - - k8s.gcr.io/prometheus-to-sd@sha256:6c0c742475363d537ff059136e5d5e4ab1f512ee0fd9b7ca42ea48bc309d1662 - - k8s.gcr.io/prometheus-to-sd:v0.3.1 + - registry.k8s.io/prometheus-to-sd@sha256:6c0c742475363d537ff059136e5d5e4ab1f512ee0fd9b7ca42ea48bc309d1662 + - registry.k8s.io/prometheus-to-sd:v0.3.1 sizeBytes: 88077694 - names: - - k8s.gcr.io/fluentd-gcp-scaler@sha256:a5ace7506d393c4ed65eb2cbb6312c64ab357fcea16dff76b9055bc6e498e5ff - - k8s.gcr.io/fluentd-gcp-scaler:0.5.1 + - registry.k8s.io/fluentd-gcp-scaler@sha256:a5ace7506d393c4ed65eb2cbb6312c64ab357fcea16dff76b9055bc6e498e5ff + - registry.k8s.io/fluentd-gcp-scaler:0.5.1 sizeBytes: 86637208 - names: - - k8s.gcr.io/heapster-amd64@sha256:9fae0af136ce0cf4f88393b3670f7139ffc464692060c374d2ae748e13144521 - - k8s.gcr.io/heapster-amd64:v1.6.0-beta.1 + - registry.k8s.io/heapster-amd64@sha256:9fae0af136ce0cf4f88393b3670f7139ffc464692060c374d2ae748e13144521 + - registry.k8s.io/heapster-amd64:v1.6.0-beta.1 sizeBytes: 76016169 - names: - - k8s.gcr.io/ingress-glbc-amd64@sha256:31d36bbd9c44caffa135fc78cf0737266fcf25e3cf0cd1c2fcbfbc4f7309cc52 - - k8s.gcr.io/ingress-glbc-amd64:v1.1.1 + - registry.k8s.io/ingress-glbc-amd64@sha256:31d36bbd9c44caffa135fc78cf0737266fcf25e3cf0cd1c2fcbfbc4f7309cc52 + - registry.k8s.io/ingress-glbc-amd64:v1.1.1 sizeBytes: 67801919 - names: - - k8s.gcr.io/kube-addon-manager@sha256:d53486c3a0b49ebee019932878dc44232735d5622a51dbbdcec7124199020d09 - - k8s.gcr.io/kube-addon-manager:v8.7 + - registry.k8s.io/kube-addon-manager@sha256:d53486c3a0b49ebee019932878dc44232735d5622a51dbbdcec7124199020d09 + - registry.k8s.io/kube-addon-manager:v8.7 sizeBytes: 63322109 - names: - nginx@sha256:4aacdcf186934dcb02f642579314075910f1855590fd3039d8fa4c9f96e48315 - nginx:1.10-alpine sizeBytes: 54042627 - names: - - k8s.gcr.io/cpvpa-amd64@sha256:cfe7b0a11c9c8e18c87b1eb34fef9a7cbb8480a8da11fc2657f78dbf4739f869 - - k8s.gcr.io/cpvpa-amd64:v0.6.0 + - registry.k8s.io/cpvpa-amd64@sha256:cfe7b0a11c9c8e18c87b1eb34fef9a7cbb8480a8da11fc2657f78dbf4739f869 + - registry.k8s.io/cpvpa-amd64:v0.6.0 sizeBytes: 51785854 - names: - - k8s.gcr.io/cluster-proportional-autoscaler-amd64@sha256:003f98d9f411ddfa6ff6d539196355e03ddd69fa4ed38c7ffb8fec6f729afe2d - - k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.2-r2 + - registry.k8s.io/cluster-proportional-autoscaler-amd64@sha256:003f98d9f411ddfa6ff6d539196355e03ddd69fa4ed38c7ffb8fec6f729afe2d + - registry.k8s.io/cluster-proportional-autoscaler-amd64:1.1.2-r2 sizeBytes: 49648481 - names: - - k8s.gcr.io/ip-masq-agent-amd64@sha256:1ffda57d87901bc01324c82ceb2145fe6a0448d3f0dd9cb65aa76a867cd62103 - - k8s.gcr.io/ip-masq-agent-amd64:v2.1.1 + - registry.k8s.io/ip-masq-agent-amd64@sha256:1ffda57d87901bc01324c82ceb2145fe6a0448d3f0dd9cb65aa76a867cd62103 + - registry.k8s.io/ip-masq-agent-amd64:v2.1.1 sizeBytes: 49612505 - names: - - k8s.gcr.io/k8s-dns-kube-dns-amd64@sha256:b99fc3eee2a9f052f7eb4cc00f15eb12fc405fa41019baa2d6b79847ae7284a8 - - k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10 + - registry.k8s.io/k8s-dns-kube-dns-amd64@sha256:b99fc3eee2a9f052f7eb4cc00f15eb12fc405fa41019baa2d6b79847ae7284a8 + - registry.k8s.io/k8s-dns-kube-dns-amd64:1.14.10 sizeBytes: 49549457 - names: - - k8s.gcr.io/rescheduler@sha256:156cfbfd05a5a815206fd2eeb6cbdaf1596d71ea4b415d3a6c43071dd7b99450 - - k8s.gcr.io/rescheduler:v0.4.0 + - registry.k8s.io/rescheduler@sha256:156cfbfd05a5a815206fd2eeb6cbdaf1596d71ea4b415d3a6c43071dd7b99450 + - registry.k8s.io/rescheduler:v0.4.0 sizeBytes: 48973149 - names: - - k8s.gcr.io/event-exporter@sha256:16ca66e2b5dc7a1ce6a5aafcb21d0885828b75cdfc08135430480f7ad2364adc - - k8s.gcr.io/event-exporter:v0.2.4 + - registry.k8s.io/event-exporter@sha256:16ca66e2b5dc7a1ce6a5aafcb21d0885828b75cdfc08135430480f7ad2364adc + - registry.k8s.io/event-exporter:v0.2.4 sizeBytes: 47261019 - names: - - k8s.gcr.io/coredns@sha256:db2bf53126ed1c761d5a41f24a1b82a461c85f736ff6e90542e9522be4757848 - - k8s.gcr.io/coredns:1.1.3 + - registry.k8s.io/coredns@sha256:db2bf53126ed1c761d5a41f24a1b82a461c85f736ff6e90542e9522be4757848 + - registry.k8s.io/coredns:1.1.3 sizeBytes: 45587362 - names: - prom/prometheus@sha256:483f4c9d7733699ba79facca9f8bcce1cef1af43dfc3e7c5a1882aa85f53cb74 diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/testdata/swagger.json b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/testdata/swagger.json index 92c625225a5..ec26723c745 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/testdata/swagger.json +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/testdata/swagger.json @@ -1146,7 +1146,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. [\"registry.k8s.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", "items": { "type": "string" }, diff --git a/staging/src/k8s.io/apiserver/pkg/server/egressselector/config_test.go b/staging/src/k8s.io/apiserver/pkg/server/egressselector/config_test.go index 83aec339e5d..b6b17f56592 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/egressselector/config_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/egressselector/config_test.go @@ -244,7 +244,7 @@ spec: hostPath: path: /etc/srv/kubernetes/pki/konnectivity-agent containers: - - image: k8s.gcr.io/proxy-agent:v0.0.3 + - image: registry.k8s.io/proxy-agent:v0.0.3 name: proxy-agent command: ["/proxy-agent"] args: ["--caCert=/etc/srv/kubernetes/pki/proxy-agent/ca.crt", "--agentCert=/etc/srv/kubernetes/pki/proxy-agent/client.crt", "--agentKey=/etc/srv/kubernetes/pki/proxy-agent/client.key", "--proxyServerHost=127.0.0.1", "--proxyServerPort=8132"] diff --git a/staging/src/k8s.io/apiserver/pkg/tracing/config_test.go b/staging/src/k8s.io/apiserver/pkg/tracing/config_test.go index 055b8e3421f..ec8171cb4c4 100644 --- a/staging/src/k8s.io/apiserver/pkg/tracing/config_test.go +++ b/staging/src/k8s.io/apiserver/pkg/tracing/config_test.go @@ -114,7 +114,7 @@ spec: k8s-app: agent spec: containers: - - image: k8s.gcr.io/busybox + - image: registry.k8s.io/busybox name: agent `, expectedResult: nil, diff --git a/staging/src/k8s.io/cli-runtime/artifacts/guestbook/redis-master-controller.yaml b/staging/src/k8s.io/cli-runtime/artifacts/guestbook/redis-master-controller.yaml index 28208103b43..5872cec0a5c 100644 --- a/staging/src/k8s.io/cli-runtime/artifacts/guestbook/redis-master-controller.yaml +++ b/staging/src/k8s.io/cli-runtime/artifacts/guestbook/redis-master-controller.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e # or just image: redis + image: registry.k8s.io/redis:e2e # or just image: redis resources: requests: cpu: 100m diff --git a/staging/src/k8s.io/cli-runtime/artifacts/kitten-rc.yaml b/staging/src/k8s.io/cli-runtime/artifacts/kitten-rc.yaml index 48b15cc190c..6ebe6cc58e9 100644 --- a/staging/src/k8s.io/cli-runtime/artifacts/kitten-rc.yaml +++ b/staging/src/k8s.io/cli-runtime/artifacts/kitten-rc.yaml @@ -13,7 +13,7 @@ spec: version: kitten spec: containers: - - image: k8s.gcr.io/update-demo:kitten + - image: registry.k8s.io/update-demo:kitten name: update-demo ports: - containerPort: 80 diff --git a/staging/src/k8s.io/cli-runtime/artifacts/openapi/swagger.json b/staging/src/k8s.io/cli-runtime/artifacts/openapi/swagger.json index 296c43c1672..f3ea9fc8ec1 100644 --- a/staging/src/k8s.io/cli-runtime/artifacts/openapi/swagger.json +++ b/staging/src/k8s.io/cli-runtime/artifacts/openapi/swagger.json @@ -5623,7 +5623,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. [\"registry.k8s.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", "items": { "type": "string" }, diff --git a/staging/src/k8s.io/cli-runtime/artifacts/redis-master-controller.yaml b/staging/src/k8s.io/cli-runtime/artifacts/redis-master-controller.yaml index 28208103b43..5872cec0a5c 100644 --- a/staging/src/k8s.io/cli-runtime/artifacts/redis-master-controller.yaml +++ b/staging/src/k8s.io/cli-runtime/artifacts/redis-master-controller.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e # or just image: redis + image: registry.k8s.io/redis:e2e # or just image: redis resources: requests: cpu: 100m diff --git a/staging/src/k8s.io/component-base/logs/kube-log-runner/README.md b/staging/src/k8s.io/component-base/logs/kube-log-runner/README.md index 2d16e193369..eed219fbbaf 100644 --- a/staging/src/k8s.io/component-base/logs/kube-log-runner/README.md +++ b/staging/src/k8s.io/component-base/logs/kube-log-runner/README.md @@ -56,7 +56,7 @@ kube-log-runner -log-file=/tmp/log -redirect-stderr=false echo "hello world" # Container base image The Kubernetes -[`k8s.gcr.io/build-image/go-runner`](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/build-image/go-runner) +[`registry.k8s.io/build-image/go-runner`](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/build-image/go-runner) image wraps the `gcr.io/distroless/static` image and provides `kube-log-runner` under its traditional name as `/go-runner`. It gets maintained in https://github.com/kubernetes/release/tree/master/images/build/go-runner. diff --git a/staging/src/k8s.io/kubectl/testdata/openapi/swagger.json b/staging/src/k8s.io/kubectl/testdata/openapi/swagger.json index 28a332a299e..eb44785cdf9 100644 --- a/staging/src/k8s.io/kubectl/testdata/openapi/swagger.json +++ b/staging/src/k8s.io/kubectl/testdata/openapi/swagger.json @@ -5976,7 +5976,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. [\"registry.k8s.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", "items": { "type": "string" }, diff --git a/staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml b/staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml index 32a0c06fece..d2465bbd656 100644 --- a/staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml +++ b/staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml b/staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml index b2253c8c5d1..290e548abe7 100644 --- a/staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml +++ b/staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml @@ -14,4 +14,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/staging/src/k8s.io/pod-security-admission/webhook/manifests/50-deployment.yaml b/staging/src/k8s.io/pod-security-admission/webhook/manifests/50-deployment.yaml index 14561adabcc..c8ab0e54512 100644 --- a/staging/src/k8s.io/pod-security-admission/webhook/manifests/50-deployment.yaml +++ b/staging/src/k8s.io/pod-security-admission/webhook/manifests/50-deployment.yaml @@ -28,7 +28,7 @@ spec: secretName: pod-security-webhook containers: - name: pod-security-webhook - image: k8s.gcr.io/sig-auth/pod-security-webhook:v1.23-beta.0 + image: registry.k8s.io/sig-auth/pod-security-webhook:v1.23-beta.0 terminationMessagePolicy: FallbackToLogsOnError ports: - name: webhook diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml index cc485b99d0d..cd48d3b0754 100644 --- a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml +++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml @@ -20,8 +20,8 @@ spec: - name: wardle-server # build from staging/src/k8s.io/sample-apiserver/artifacts/simple-image/Dockerfile # or - # docker pull k8s.gcr.io/e2e-test-images/sample-apiserver:1.17.4 - # docker tag k8s.gcr.io/e2e-test-images/sample-apiserver:1.17.4 kube-sample-apiserver:latest + # docker pull registry.k8s.io/e2e-test-images/sample-apiserver:1.17.4 + # docker tag registry.k8s.io/e2e-test-images/sample-apiserver:1.17.4 kube-sample-apiserver:latest image: kube-sample-apiserver:latest imagePullPolicy: Never args: [ "--etcd-servers=http://localhost:2379" ] diff --git a/test/cmd/apps.sh b/test/cmd/apps.sh index e8ab6f8c670..0e799323c30 100755 --- a/test/cmd/apps.sh +++ b/test/cmd/apps.sh @@ -36,7 +36,7 @@ run_daemonset_tests() { # Template Generation should stay 1 kube::test::get_object_assert 'daemonsets bind' "{{${generation_field:?}}}" '1' # Test set commands - kubectl set image daemonsets/bind "${kube_flags[@]:?}" "*=k8s.gcr.io/pause:test-cmd" + kubectl set image daemonsets/bind "${kube_flags[@]:?}" "*=registry.k8s.io/pause:test-cmd" kube::test::get_object_assert 'daemonsets bind' "{{${generation_field:?}}}" '2' kubectl set env daemonsets/bind "${kube_flags[@]:?}" foo=bar kube::test::get_object_assert 'daemonsets bind' "{{${generation_field:?}}}" '3' @@ -186,7 +186,7 @@ run_deployment_tests() { create_and_use_new_namespace kube::log::status "Testing deployments" # Test kubectl create deployment (using default - old generator) - kubectl create deployment test-nginx-extensions --image=k8s.gcr.io/nginx:test-cmd + kubectl create deployment test-nginx-extensions --image=registry.k8s.io/nginx:test-cmd # Post-Condition: Deployment "nginx" is created. kube::test::get_object_assert 'deploy test-nginx-extensions' "{{${container_name_field:?}}}" 'nginx' # and old generator was used, iow. old defaults are applied @@ -199,7 +199,7 @@ run_deployment_tests() { kubectl delete deployment test-nginx-extensions "${kube_flags[@]:?}" # Test kubectl create deployment - kubectl create deployment test-nginx-apps --image=k8s.gcr.io/nginx:test-cmd + kubectl create deployment test-nginx-apps --image=registry.k8s.io/nginx:test-cmd # Post-Condition: Deployment "nginx" is created. kube::test::get_object_assert 'deploy test-nginx-apps' "{{${container_name_field:?}}}" 'nginx' # and new generator was used, iow. new defaults are applied @@ -221,11 +221,11 @@ run_deployment_tests() { # Pre-Condition: No deployment exists. kube::test::get_object_assert deployment "{{range.items}}{{${id_field:?}}}:{{end}}" '' # Dry-run command - kubectl create deployment nginx-with-command --dry-run=client --image=k8s.gcr.io/nginx:test-cmd -- /bin/sleep infinity - kubectl create deployment nginx-with-command --dry-run=server --image=k8s.gcr.io/nginx:test-cmd -- /bin/sleep infinity + kubectl create deployment nginx-with-command --dry-run=client --image=registry.k8s.io/nginx:test-cmd -- /bin/sleep infinity + kubectl create deployment nginx-with-command --dry-run=server --image=registry.k8s.io/nginx:test-cmd -- /bin/sleep infinity kube::test::get_object_assert deployment "{{range.items}}{{${id_field:?}}}:{{end}}" '' # Command - kubectl create deployment nginx-with-command --image=k8s.gcr.io/nginx:test-cmd -- /bin/sleep infinity + kubectl create deployment nginx-with-command --image=registry.k8s.io/nginx:test-cmd -- /bin/sleep infinity # Post-Condition: Deployment "nginx" is created. kube::test::get_object_assert 'deploy nginx-with-command' "{{${container_name_field:?}}}" 'nginx' # Clean up @@ -259,7 +259,7 @@ run_deployment_tests() { kube::test::get_object_assert deployment "{{range.items}}{{${id_field:?}}}:{{end}}" '' kube::test::get_object_assert rs "{{range.items}}{{${id_field:?}}}:{{end}}" '' # Create deployment - kubectl create deployment nginx-deployment --image=k8s.gcr.io/nginx:test-cmd + kubectl create deployment nginx-deployment --image=registry.k8s.io/nginx:test-cmd # Wait for rs to come up. kube::test::wait_object_assert rs "{{range.items}}{{${rs_replicas_field:?}}}{{end}}" '1' # Delete the deployment with cascading strategy set to orphan. @@ -656,7 +656,7 @@ run_rs_tests() { # Test set commands # Pre-condition: frontend replica set exists at generation 1 kube::test::get_object_assert 'rs frontend' "{{${generation_field:?}}}" '1' - kubectl set image rs/frontend "${kube_flags[@]:?}" "*=k8s.gcr.io/pause:test-cmd" + kubectl set image rs/frontend "${kube_flags[@]:?}" "*=registry.k8s.io/pause:test-cmd" kube::test::get_object_assert 'rs frontend' "{{${generation_field:?}}}" '2' kubectl set env rs/frontend "${kube_flags[@]:?}" foo=bar kube::test::get_object_assert 'rs frontend' "{{${generation_field:?}}}" '3' diff --git a/test/cmd/core.sh b/test/cmd/core.sh index 4ac781fce70..8d4b84f73ac 100755 --- a/test/cmd/core.sh +++ b/test/cmd/core.sh @@ -537,9 +537,9 @@ run_pod_tests() { kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'changed-with-yaml:' ## Patch pod from JSON can change image # Command - kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "k8s.gcr.io/pause:3.7"}]}}' + kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "registry.k8s.io/pause:3.7"}]}}' # Post-condition: valid-pod POD has expected image - kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.7:' + kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.7:' # pod has field for kubectl patch field manager output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1) @@ -656,13 +656,13 @@ __EOF__ kubectl delete node node-v1-test "${kube_flags[@]}" ## kubectl edit can update the image field of a POD. tmp-editor.sh is a fake editor - echo -e "#!/usr/bin/env bash\n${SED} -i \"s/nginx/k8s.gcr.io\/serve_hostname/g\" \$1" > /tmp/tmp-editor.sh + echo -e "#!/usr/bin/env bash\n${SED} -i \"s/nginx/registry.k8s.io\/serve_hostname/g\" \$1" > /tmp/tmp-editor.sh chmod +x /tmp/tmp-editor.sh # Pre-condition: valid-pod POD has image nginx kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'nginx:' grep -q 'Patch:' <<< "$(EDITOR=/tmp/tmp-editor.sh kubectl edit "${kube_flags[@]}" pods/valid-pod --output-patch=true)" - # Post-condition: valid-pod POD has image k8s.gcr.io/serve_hostname - kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/serve_hostname:' + # Post-condition: valid-pod POD has image registry.k8s.io/serve_hostname + kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/serve_hostname:' # pod has field for kubectl edit field manager output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1) kube::test::if_has_string "${output_message}" 'kubectl-edit' diff --git a/test/cmd/create.sh b/test/cmd/create.sh index 77cfe25fea9..da2bce54044 100755 --- a/test/cmd/create.sh +++ b/test/cmd/create.sh @@ -89,9 +89,9 @@ run_create_job_tests() { create_and_use_new_namespace # Test kubectl create job - kubectl create job test-job --image=k8s.gcr.io/nginx:test-cmd + kubectl create job test-job --image=registry.k8s.io/nginx:test-cmd # Post-Condition: job nginx is created - kube::test::get_object_assert 'job test-job' "{{${image_field0:?}}}" 'k8s.gcr.io/nginx:test-cmd' + kube::test::get_object_assert 'job test-job' "{{${image_field0:?}}}" 'registry.k8s.io/nginx:test-cmd' # Clean up kubectl delete job test-job "${kube_flags[@]}" diff --git a/test/cmd/diff.sh b/test/cmd/diff.sh index 7c5debba766..fe743275840 100755 --- a/test/cmd/diff.sh +++ b/test/cmd/diff.sh @@ -47,7 +47,7 @@ run_kubectl_diff_tests() { # 1. the exit code for diff is 1 because it found a difference # 2. the difference contains the changed image output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml || test $? -eq 1) - kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4' + kube::test::if_has_string "${output_message}" 'registry.k8s.io/pause:3.4' # Ensure diff only dry-runs and doesn't persist change resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}') @@ -55,7 +55,7 @@ run_kubectl_diff_tests() { # Test found diff with server-side apply output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml --server-side || test $? -eq 1) - kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4' + kube::test::if_has_string "${output_message}" 'registry.k8s.io/pause:3.4' # Ensure diff --server-side only dry-runs and doesn't persist change resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}') @@ -86,7 +86,7 @@ run_kubectl_diff_tests() { # 1. the exit code for diff is 1 because it found a difference # 2. the difference contains the changed image output_message=$(kubectl diff --server-side -f hack/testdata/pod-changed.yaml || test $? -eq 1) - kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4' + kube::test::if_has_string "${output_message}" 'registry.k8s.io/pause:3.4' ## kubectl diff --prune kubectl create ns nsb diff --git a/test/cmd/legacy-script.sh b/test/cmd/legacy-script.sh index 40a02920fb4..d0544ffe4fd 100755 --- a/test/cmd/legacy-script.sh +++ b/test/cmd/legacy-script.sh @@ -67,15 +67,15 @@ KUBELET_HEALTHZ_PORT=${KUBELET_HEALTHZ_PORT:-10248} SECURE_CTLRMGR_PORT=${SECURE_CTLRMGR_PORT:-10257} PROXY_HOST=127.0.0.1 # kubectl only serves on localhost. -IMAGE_NGINX="k8s.gcr.io/nginx:1.7.9" -export IMAGE_DEPLOYMENT_R1="k8s.gcr.io/nginx:test-cmd" # deployment-revision1.yaml +IMAGE_NGINX="registry.k8s.io/nginx:1.7.9" +export IMAGE_DEPLOYMENT_R1="registry.k8s.io/nginx:test-cmd" # deployment-revision1.yaml export IMAGE_DEPLOYMENT_R2="$IMAGE_NGINX" # deployment-revision2.yaml -export IMAGE_PERL="k8s.gcr.io/perl" -export IMAGE_PAUSE_V2="k8s.gcr.io/pause:2.0" -export IMAGE_DAEMONSET_R2="k8s.gcr.io/pause:latest" -export IMAGE_DAEMONSET_R2_2="k8s.gcr.io/nginx:test-cmd" # rollingupdate-daemonset-rv2.yaml -export IMAGE_STATEFULSET_R1="k8s.gcr.io/nginx-slim:0.7" -export IMAGE_STATEFULSET_R2="k8s.gcr.io/nginx-slim:0.8" +export IMAGE_PERL="registry.k8s.io/perl" +export IMAGE_PAUSE_V2="registry.k8s.io/pause:2.0" +export IMAGE_DAEMONSET_R2="registry.k8s.io/pause:latest" +export IMAGE_DAEMONSET_R2_2="registry.k8s.io/nginx:test-cmd" # rollingupdate-daemonset-rv2.yaml +export IMAGE_STATEFULSET_R1="registry.k8s.io/nginx-slim:0.7" +export IMAGE_STATEFULSET_R2="registry.k8s.io/nginx-slim:0.8" # Expose kubectl directly for readability PATH="${KUBE_OUTPUT_HOSTBIN}":$PATH diff --git a/test/conformance/image/Makefile b/test/conformance/image/Makefile index 4f11139ccde..9771d7ffd9c 100644 --- a/test/conformance/image/Makefile +++ b/test/conformance/image/Makefile @@ -15,9 +15,9 @@ # Build the conformance image. # # Usage: -# [ARCH=amd64] [REGISTRY="k8s.gcr.io"] make (build|push) VERSION={some_released_version_of_kubernetes} +# [ARCH=amd64] [REGISTRY="registry.k8s.io"] make (build|push) VERSION={some_released_version_of_kubernetes} -REGISTRY?=k8s.gcr.io +REGISTRY?=registry.k8s.io ARCH?=amd64 OUT_DIR?=_output @@ -32,7 +32,7 @@ E2E_GO_RUNNER_BIN?=$(shell test -f $(LOCAL_OUTPUT_PATH)/go-runner && echo $(LOCA CLUSTER_DIR?=$(shell pwd)/../../../cluster/ # This is defined in root Makefile, but some build contexts do not refer to them -KUBE_BASE_IMAGE_REGISTRY?=k8s.gcr.io +KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io BASE_IMAGE_VERSION?=bullseye-v1.2.0 BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION} diff --git a/test/conformance/image/README.md b/test/conformance/image/README.md index 14e7b493993..d93607bf4ee 100644 --- a/test/conformance/image/README.md +++ b/test/conformance/image/README.md @@ -10,23 +10,23 @@ $ make WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/ginkgo cmd/kubectl test/conformance/image/go-runner" # Build for linux/amd64 (default) -# export REGISTRY=$HOST/$ORG to switch from k8s.gcr.io +# export REGISTRY=$HOST/$ORG to switch from registry.k8s.io $ make push VERSION={target_version} ARCH=amd64 -# ---> k8s.gcr.io/conformance-amd64:VERSION -# ---> k8s.gcr.io/conformance:VERSION (image with backwards-compatible naming) +# ---> registry.k8s.io/conformance-amd64:VERSION +# ---> registry.k8s.io/conformance:VERSION (image with backwards-compatible naming) $ make push VERSION={target_version} ARCH=arm -# ---> k8s.gcr.io/conformance-arm:VERSION +# ---> registry.k8s.io/conformance-arm:VERSION $ make push VERSION={target_version} ARCH=arm64 -# ---> k8s.gcr.io/conformance-arm64:VERSION +# ---> registry.k8s.io/conformance-arm64:VERSION $ make push VERSION={target_version} ARCH=ppc64le -# ---> k8s.gcr.io/conformance-ppc64le:VERSION +# ---> registry.k8s.io/conformance-ppc64le:VERSION $ make push VERSION={target_version} ARCH=s390x -# ---> k8s.gcr.io/conformance-s390x:VERSION +# ---> registry.k8s.io/conformance-s390x:VERSION ``` If you don't want to push the images, run `make` or `make build` instead diff --git a/test/conformance/image/conformance-e2e.yaml b/test/conformance/image/conformance-e2e.yaml index c290b61aac5..d06c29d46a3 100644 --- a/test/conformance/image/conformance-e2e.yaml +++ b/test/conformance/image/conformance-e2e.yaml @@ -55,7 +55,7 @@ metadata: spec: containers: - name: conformance-container - image: k8s.gcr.io/conformance-amd64:v1.14 + image: registry.k8s.io/conformance-amd64:v1.14 imagePullPolicy: IfNotPresent env: - name: E2E_FOCUS diff --git a/test/e2e/testing-manifests/cluster-dns/dns-backend-rc.yaml b/test/e2e/testing-manifests/cluster-dns/dns-backend-rc.yaml index 4af1b0dcbaa..8aad9aadf38 100644 --- a/test/e2e/testing-manifests/cluster-dns/dns-backend-rc.yaml +++ b/test/e2e/testing-manifests/cluster-dns/dns-backend-rc.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: dns-backend - image: k8s.gcr.io/example-dns-backend:v1 + image: registry.k8s.io/example-dns-backend:v1 ports: - name: backend-port containerPort: 8000 diff --git a/test/e2e/testing-manifests/cluster-dns/dns-frontend-pod.yaml b/test/e2e/testing-manifests/cluster-dns/dns-frontend-pod.yaml index 4a7695f1138..5e0514108c9 100644 --- a/test/e2e/testing-manifests/cluster-dns/dns-frontend-pod.yaml +++ b/test/e2e/testing-manifests/cluster-dns/dns-frontend-pod.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: dns-frontend - image: k8s.gcr.io/example-dns-frontend:v1 + image: registry.k8s.io/example-dns-frontend:v1 command: - python - client.py diff --git a/test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml b/test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml index 3d23b8c7e02..90464c1e7b7 100644 --- a/test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml +++ b/test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: k8s.gcr.io/e2e-test-images/echoserver:2.3 + image: registry.k8s.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/ingress/http/rc.yaml b/test/e2e/testing-manifests/ingress/http/rc.yaml index 23f45425490..ed66c01e182 100644 --- a/test/e2e/testing-manifests/ingress/http/rc.yaml +++ b/test/e2e/testing-manifests/ingress/http/rc.yaml @@ -11,7 +11,7 @@ spec: spec: containers: - name: echoheaders - image: k8s.gcr.io/e2e-test-images/echoserver:2.3 + image: registry.k8s.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8080 readinessProbe: diff --git a/test/e2e/testing-manifests/ingress/http2/rc.yaml b/test/e2e/testing-manifests/ingress/http2/rc.yaml index 1ae32186ab7..79651c07718 100644 --- a/test/e2e/testing-manifests/ingress/http2/rc.yaml +++ b/test/e2e/testing-manifests/ingress/http2/rc.yaml @@ -14,6 +14,6 @@ spec: spec: containers: - name: echoheaders - image: k8s.gcr.io/e2e-test-images/echoserver:2.3 + image: registry.k8s.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8443 diff --git a/test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml b/test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml index 3d23b8c7e02..90464c1e7b7 100644 --- a/test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml +++ b/test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: k8s.gcr.io/e2e-test-images/echoserver:2.3 + image: registry.k8s.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml b/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml index 479c5aaf4ed..1b18ea82f55 100644 --- a/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml +++ b/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml @@ -15,7 +15,7 @@ spec: run: hostname spec: containers: - - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + - image: registry.k8s.io/e2e-test-images/agnhost:2.32 command: ["/agnhost", "serve-hostname"] imagePullPolicy: IfNotPresent name: hostname diff --git a/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml b/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml index 462abb98871..5cf7d19df60 100644 --- a/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml +++ b/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml @@ -14,13 +14,13 @@ spec: run: hostname spec: containers: - - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + - image: registry.k8s.io/e2e-test-images/agnhost:2.32 name: host1 args: ["serve-hostname", "--http=true", "--udp=false", "--port=8000"] ports: - protocol: TCP containerPort: 8000 - - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + - image: registry.k8s.io/e2e-test-images/agnhost:2.32 name: host2 args: ["serve-hostname", "--http=true", "--udp=false", "--port=8080"] ports: diff --git a/test/e2e/testing-manifests/ingress/neg/rc.yaml b/test/e2e/testing-manifests/ingress/neg/rc.yaml index 479c5aaf4ed..1b18ea82f55 100644 --- a/test/e2e/testing-manifests/ingress/neg/rc.yaml +++ b/test/e2e/testing-manifests/ingress/neg/rc.yaml @@ -15,7 +15,7 @@ spec: run: hostname spec: containers: - - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + - image: registry.k8s.io/e2e-test-images/agnhost:2.32 command: ["/agnhost", "serve-hostname"] imagePullPolicy: IfNotPresent name: hostname diff --git a/test/e2e/testing-manifests/ingress/nginx/rc.yaml b/test/e2e/testing-manifests/ingress/nginx/rc.yaml index 0c8c88d4bf6..ab39cddbd6e 100644 --- a/test/e2e/testing-manifests/ingress/nginx/rc.yaml +++ b/test/e2e/testing-manifests/ingress/nginx/rc.yaml @@ -17,7 +17,7 @@ spec: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/ingress-nginx/controller:v0.46.0 + - image: registry.k8s.io/ingress-nginx/controller:v0.46.0 args: - /nginx-ingress-controller - --election-id=ingress-controller-leader diff --git a/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml b/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml index 3d23b8c7e02..90464c1e7b7 100644 --- a/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml +++ b/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: k8s.gcr.io/e2e-test-images/echoserver:2.3 + image: registry.k8s.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/ingress/static-ip/rc.yaml b/test/e2e/testing-manifests/ingress/static-ip/rc.yaml index 3d23b8c7e02..90464c1e7b7 100644 --- a/test/e2e/testing-manifests/ingress/static-ip/rc.yaml +++ b/test/e2e/testing-manifests/ingress/static-ip/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: k8s.gcr.io/e2e-test-images/echoserver:2.3 + image: registry.k8s.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/kubectl/agnhost-primary-pod.yaml b/test/e2e/testing-manifests/kubectl/agnhost-primary-pod.yaml index 9194e944ba6..9b54660865d 100644 --- a/test/e2e/testing-manifests/kubectl/agnhost-primary-pod.yaml +++ b/test/e2e/testing-manifests/kubectl/agnhost-primary-pod.yaml @@ -8,7 +8,7 @@ metadata: spec: containers: - name: primary - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + image: registry.k8s.io/e2e-test-images/agnhost:2.32 env: - name: PRIMARY value: "true" @@ -21,7 +21,7 @@ spec: - mountPath: /agnhost-primary-data name: data - name: sentinel - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + image: registry.k8s.io/e2e-test-images/agnhost:2.32 env: - name: SENTINEL value: "true" diff --git a/test/e2e/testing-manifests/sample-device-plugin.yaml b/test/e2e/testing-manifests/sample-device-plugin.yaml index e27b91153c8..8960f3b0080 100644 --- a/test/e2e/testing-manifests/sample-device-plugin.yaml +++ b/test/e2e/testing-manifests/sample-device-plugin.yaml @@ -32,7 +32,7 @@ spec: hostPath: path: /dev containers: - - image: k8s.gcr.io/e2e-test-images/sample-device-plugin:1.3 + - image: registry.k8s.io/e2e-test-images/sample-device-plugin:1.3 name: sample-device-plugin env: - name: PLUGIN_SOCK_DIR diff --git a/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml b/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml index 006ea283783..048e1305da3 100644 --- a/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml +++ b/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml @@ -81,6 +81,6 @@ spec: - name: root-mount mountPath: /root containers: - - image: "k8s.gcr.io/pause:3.7" + - image: "registry.k8s.io/pause:3.7" name: pause diff --git a/test/e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml b/test/e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml index b1ce4229cb0..f38b9517622 100644 --- a/test/e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml +++ b/test/e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml @@ -17,7 +17,7 @@ spec: version: v1 spec: containers: - - image: k8s.gcr.io/servicelb:0.1 + - image: registry.k8s.io/servicelb:0.1 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml b/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml index 4c1fd8fae96..51734a3aeaa 100644 --- a/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml +++ b/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml @@ -12,7 +12,7 @@ spec: spec: containers: - name: netexec - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + image: registry.k8s.io/e2e-test-images/agnhost:2.32 command: ["/agnhost", "netexec"] ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml b/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml index b0a2f4e2f10..c0b3ec23c9c 100644 --- a/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml +++ b/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: test-server - image: k8s.gcr.io/cassandra-e2e-test:0.1 + image: registry.k8s.io/cassandra-e2e-test:0.1 imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml b/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml index d553eaa7f11..ccaa4bab6ed 100644 --- a/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml +++ b/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: etcd - image: k8s.gcr.io/etcd:3.2.24 + image: registry.k8s.io/etcd:3.2.24 imagePullPolicy: Always ports: - containerPort: 2380 diff --git a/test/e2e/testing-manifests/statefulset/etcd/tester.yaml b/test/e2e/testing-manifests/statefulset/etcd/tester.yaml index e172d50ef50..cf4eb9583cc 100644 --- a/test/e2e/testing-manifests/statefulset/etcd/tester.yaml +++ b/test/e2e/testing-manifests/statefulset/etcd/tester.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: test-server - image: k8s.gcr.io/etcd-statefulset-e2e-test:0.0 + image: registry.k8s.io/etcd-statefulset-e2e-test:0.0 imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml b/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml index 4e0271f449e..376522716c5 100644 --- a/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml +++ b/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml @@ -15,7 +15,7 @@ spec: spec: initContainers: - name: install - image: k8s.gcr.io/galera-install:0.1 + image: registry.k8s.io/galera-install:0.1 imagePullPolicy: Always args: - "--work-dir=/work-dir" @@ -44,7 +44,7 @@ spec: mountPath: "/etc/mysql" containers: - name: mysql - image: k8s.gcr.io/mysql-galera:e2e + image: registry.k8s.io/mysql-galera:e2e ports: - containerPort: 3306 name: mysql @@ -58,7 +58,7 @@ spec: - --defaults-file=/etc/mysql/my-galera.cnf - --user=root readinessProbe: - # TODO: If docker exec is buggy just use k8s.gcr.io/mysql-healthz:1.0 + # TODO: If docker exec is buggy just use registry.k8s.io/mysql-healthz:1.0 exec: command: - sh diff --git a/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml b/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml index 3b61080ad96..0cd5e92fc7e 100644 --- a/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml +++ b/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: test-server - image: k8s.gcr.io/mysql-e2e-test:0.1 + image: registry.k8s.io/mysql-e2e-test:0.1 imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml index 70dce20a9da..84e0a82bc40 100644 --- a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml +++ b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml @@ -15,7 +15,7 @@ spec: spec: initContainers: - name: install - image: k8s.gcr.io/e2e-test-images/pets/redis-installer:1.5 + image: registry.k8s.io/e2e-test-images/pets/redis-installer:1.5 imagePullPolicy: Always args: - "--install-into=/opt" diff --git a/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml index bb11dbce4b9..259e774a71a 100644 --- a/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml +++ b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml @@ -15,7 +15,7 @@ spec: spec: initContainers: - name: install - image: k8s.gcr.io/e2e-test-images/pets/zookeeper-installer:1.5 + image: registry.k8s.io/e2e-test-images/pets/zookeeper-installer:1.5 imagePullPolicy: Always args: - "--install-into=/opt" diff --git a/test/e2e/testing-manifests/storage-csi/any-volume-datasource/hello-populator-deploy.yaml b/test/e2e/testing-manifests/storage-csi/any-volume-datasource/hello-populator-deploy.yaml index 256d087235d..95aa553b819 100644 --- a/test/e2e/testing-manifests/storage-csi/any-volume-datasource/hello-populator-deploy.yaml +++ b/test/e2e/testing-manifests/storage-csi/any-volume-datasource/hello-populator-deploy.yaml @@ -56,11 +56,11 @@ spec: serviceAccount: hello-account containers: - name: hello - image: k8s.gcr.io/sig-storage/hello-populator:v1.0.1 + image: registry.k8s.io/sig-storage/hello-populator:v1.0.1 imagePullPolicy: IfNotPresent args: - --mode=controller - - --image-name=k8s.gcr.io/sig-storage/hello-populator:v1.0.1 + - --image-name=registry.k8s.io/sig-storage/hello-populator:v1.0.1 - --http-endpoint=:8080 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/storage-csi/any-volume-datasource/volume-data-source-validator/setup-data-source-validator.yaml b/test/e2e/testing-manifests/storage-csi/any-volume-datasource/volume-data-source-validator/setup-data-source-validator.yaml index ca081407977..a6219f903da 100644 --- a/test/e2e/testing-manifests/storage-csi/any-volume-datasource/volume-data-source-validator/setup-data-source-validator.yaml +++ b/test/e2e/testing-manifests/storage-csi/any-volume-datasource/volume-data-source-validator/setup-data-source-validator.yaml @@ -17,7 +17,7 @@ spec: serviceAccount: volume-data-source-validator containers: - name: volume-data-source-validator - image: k8s.gcr.io/sig-storage/volume-data-source-validator:v1.0.0 + image: registry.k8s.io/sig-storage/volume-data-source-validator:v1.0.0 args: - "--v=5" - "--leader-election=false" diff --git a/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml b/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml index 8eace45e964..a34c8d112ae 100644 --- a/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml +++ b/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml @@ -21,7 +21,7 @@ spec: serviceAccountName: csi-gce-pd-controller-sa containers: - name: csi-snapshotter - image: k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v5.0.1 args: - "--v=5" - "--csi-address=/csi/csi.sock" @@ -39,7 +39,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0 args: - "--v=5" - "--csi-address=/csi/csi.sock" @@ -73,7 +73,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-attacher - image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0 + image: registry.k8s.io/sig-storage/csi-attacher:v3.4.0 args: - "--v=5" - "--csi-address=/csi/csi.sock" @@ -102,7 +102,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-resizer - image: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.4.0 args: - "--v=5" - "--csi-address=/csi/csi.sock" @@ -131,7 +131,7 @@ spec: - name: socket-dir mountPath: /csi - name: gce-pd-driver - image: k8s.gcr.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.4.0 + image: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.4.0 args: - "--v=5" - "--endpoint=unix:/csi/csi.sock" diff --git a/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml b/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml index b2b5b98a2c3..454edc7fa61 100644 --- a/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml +++ b/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: csi-driver-registrar - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.1.0 args: - "--v=5" - "--csi-address=/csi/csi.sock" @@ -48,7 +48,7 @@ spec: - name: gce-pd-driver securityContext: privileged: true - image: k8s.gcr.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.2.2 + image: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.2.2 args: - "--v=5" - "--endpoint=unix:/csi/csi.sock" diff --git a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml index 8ccc2d36ee0..907528a1083 100644 --- a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml +++ b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml @@ -218,7 +218,7 @@ spec: serviceAccountName: csi-hostpathplugin-sa containers: - name: hostpath - image: k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3 + image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3 args: - "--drivername=hostpath.csi.k8s.io" - "--v=5" @@ -261,7 +261,7 @@ spec: name: dev-dir - name: csi-external-health-monitor-controller - image: k8s.gcr.io/sig-storage/csi-external-health-monitor-controller:v0.4.0 + image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.4.0 args: - "--v=5" - "--csi-address=$(ADDRESS)" @@ -275,7 +275,7 @@ spec: mountPath: /csi - name: node-driver-registrar - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.3.0 args: - --v=5 - --csi-address=/csi/csi.sock @@ -303,13 +303,13 @@ spec: volumeMounts: - mountPath: /csi name: socket-dir - image: k8s.gcr.io/sig-storage/livenessprobe:v2.4.0 + image: registry.k8s.io/sig-storage/livenessprobe:v2.4.0 args: - --csi-address=/csi/csi.sock - --health-port=9898 - name: csi-attacher - image: k8s.gcr.io/sig-storage/csi-attacher:v3.3.0 + image: registry.k8s.io/sig-storage/csi-attacher:v3.3.0 args: - --v=5 - --csi-address=/csi/csi.sock @@ -323,7 +323,7 @@ spec: name: socket-dir - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0 args: - -v=5 - --csi-address=/csi/csi.sock @@ -338,7 +338,7 @@ spec: name: socket-dir - name: csi-resizer - image: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.3.0 args: - -v=5 - -csi-address=/csi/csi.sock @@ -352,7 +352,7 @@ spec: name: socket-dir - name: csi-snapshotter - image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v4.2.1 args: - -v=5 - --csi-address=/csi/csi.sock diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml index 57f8226da7a..67446f051fa 100644 --- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml +++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: csi-mock containers: - name: csi-attacher - image: k8s.gcr.io/sig-storage/csi-attacher:v3.3.0 + image: registry.k8s.io/sig-storage/csi-attacher:v3.3.0 args: - --v=5 - --csi-address=$(ADDRESS) diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-resizer.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-resizer.yaml index 4573884e36d..6785cc5d093 100644 --- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-resizer.yaml +++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-resizer.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: csi-mock containers: - name: csi-resizer - image: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.3.0 args: - "--v=5" - "--csi-address=$(ADDRESS)" diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-snapshotter.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-snapshotter.yaml index 6d5db053429..7d01689a5b9 100644 --- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-snapshotter.yaml +++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-snapshotter.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: csi-mock containers: - name: csi-snapshotter - image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v4.2.1 args: - "--v=5" - "--csi-address=$(ADDRESS)" diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml index 7424b3b656a..248001ca970 100644 --- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml +++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: csi-mock containers: - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0 args: - "--csi-address=$(ADDRESS)" # Topology support is needed for the pod rescheduling test @@ -34,7 +34,7 @@ spec: - mountPath: /csi name: socket-dir - name: driver-registrar - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.3.0 args: - --v=5 - --csi-address=/csi/csi.sock @@ -53,7 +53,7 @@ spec: - mountPath: /registration name: registration-dir - name: mock - image: k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3 + image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3 args: - "--drivername=mock.storage.k8s.io" - "--nodeid=$(KUBE_NODE_NAME)" diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml index 8d93f08db58..d91afd9f2e1 100644 --- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml +++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-proxy.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: csi-mock containers: - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0 args: - "--csi-address=$(ADDRESS)" # Topology support is needed for the pod rescheduling test @@ -35,7 +35,7 @@ spec: - mountPath: /csi name: socket-dir - name: driver-registrar - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.3.0 args: - --v=5 - --csi-address=/csi/csi.sock @@ -53,7 +53,7 @@ spec: - mountPath: /registration name: registration-dir - name: mock - image: k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3 + image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3 args: - -v=5 - -nodeid=$(KUBE_NODE_NAME) @@ -77,7 +77,7 @@ spec: # test for directories or create them. It needs additional privileges # for that. - name: busybox - image: k8s.gcr.io/e2e-test-images/busybox:1.29-1 + image: registry.k8s.io/e2e-test-images/busybox:1.29-1 securityContext: privileged: true command: diff --git a/test/e2e_node/conformance/run_test.sh b/test/e2e_node/conformance/run_test.sh index f4037049925..99dff344b49 100755 --- a/test/e2e_node/conformance/run_test.sh +++ b/test/e2e_node/conformance/run_test.sh @@ -52,7 +52,7 @@ SKIP=${SKIP:-""} TEST_ARGS=${TEST_ARGS:-""} # REGISTRY is the image registry for node test image. -REGISTRY=${REGISTRY:-"k8s.gcr.io"} +REGISTRY=${REGISTRY:-"registry.k8s.io"} # ARCH is the architecture of current machine, the script will use this to # select corresponding test container image. diff --git a/test/e2e_node/eviction_test.go b/test/e2e_node/eviction_test.go index 03fe45a393b..6a5644aea2c 100644 --- a/test/e2e_node/eviction_test.go +++ b/test/e2e_node/eviction_test.go @@ -1000,7 +1000,7 @@ func getMemhogPod(podName string, ctnName string, res v1.ResourceRequirements) * Containers: []v1.Container{ { Name: ctnName, - Image: "k8s.gcr.io/stress:v1", + Image: "registry.k8s.io/stress:v1", ImagePullPolicy: "Always", Env: env, // 60 min timeout * 60s / tick per 10s = 360 ticks before timeout => ~11.11Mi/tick diff --git a/test/e2e_node/gcp/gke_environment_test.go b/test/e2e_node/gcp/gke_environment_test.go index e87d580f321..e2d37edda61 100644 --- a/test/e2e_node/gcp/gke_environment_test.go +++ b/test/e2e_node/gcp/gke_environment_test.go @@ -81,7 +81,7 @@ func checkIPTables() (err error) { // checkPublicGCR checks the access to the public Google Container Registry by // pulling the busybox image. func checkPublicGCR() error { - const image = "k8s.gcr.io/busybox" + const image = "registry.k8s.io/busybox" output, err := runCommand("docker", "images", "-q", image) if err != nil { return err diff --git a/test/e2e_node/image_id_test.go b/test/e2e_node/image_id_test.go index 42d47b547b2..92aed21eac8 100644 --- a/test/e2e_node/image_id_test.go +++ b/test/e2e_node/image_id_test.go @@ -31,7 +31,7 @@ import ( var _ = SIGDescribe("ImageID [NodeFeature: ImageID]", func() { - busyBoxImage := "k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff" + busyBoxImage := "registry.k8s.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff" f := framework.NewDefaultFramework("image-id-test") f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go index 0b3e16db57c..b3af2d47ed9 100644 --- a/test/e2e_node/image_list.go +++ b/test/e2e_node/image_list.go @@ -55,9 +55,9 @@ const ( var NodePrePullImageList = sets.NewString( imageutils.GetE2EImage(imageutils.Agnhost), "gcr.io/cadvisor/cadvisor:v0.43.0", - "k8s.gcr.io/stress:v1", + "registry.k8s.io/stress:v1", busyboxImage, - "k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff", + "registry.k8s.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff", imageutils.GetE2EImage(imageutils.Nginx), imageutils.GetE2EImage(imageutils.Perl), imageutils.GetE2EImage(imageutils.Nonewprivs), @@ -100,7 +100,7 @@ func updateImageAllowList() { } func getNodeProblemDetectorImage() string { - const defaultImage string = "k8s.gcr.io/node-problem-detector/node-problem-detector:v0.8.7" + const defaultImage string = "registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.7" image := os.Getenv("NODE_PROBLEM_DETECTOR_IMAGE") if image == "" { image = defaultImage diff --git a/test/e2e_node/remote/node_conformance.go b/test/e2e_node/remote/node_conformance.go index 48d99ca9438..e34a15ec98e 100644 --- a/test/e2e_node/remote/node_conformance.go +++ b/test/e2e_node/remote/node_conformance.go @@ -56,7 +56,7 @@ func commandToString(c *exec.Cmd) string { // Image path constants. const ( - conformanceRegistry = "k8s.gcr.io" + conformanceRegistry = "registry.k8s.io" conformanceArch = runtime.GOARCH conformanceTarfile = "node_conformance.tar" conformanceTestBinary = "e2e_node.test" diff --git a/test/fixtures/doc-yaml/admin/high-availability/etcd.yaml b/test/fixtures/doc-yaml/admin/high-availability/etcd.yaml index d9f2b8e64d2..809af663c65 100644 --- a/test/fixtures/doc-yaml/admin/high-availability/etcd.yaml +++ b/test/fixtures/doc-yaml/admin/high-availability/etcd.yaml @@ -5,7 +5,7 @@ metadata: spec: hostNetwork: true containers: - - image: k8s.gcr.io/etcd:2.0.9 + - image: registry.k8s.io/etcd:2.0.9 name: etcd-container command: - /usr/local/bin/etcd diff --git a/test/fixtures/doc-yaml/admin/high-availability/kube-apiserver.yaml b/test/fixtures/doc-yaml/admin/high-availability/kube-apiserver.yaml index 308e106f319..472677b4f4c 100644 --- a/test/fixtures/doc-yaml/admin/high-availability/kube-apiserver.yaml +++ b/test/fixtures/doc-yaml/admin/high-availability/kube-apiserver.yaml @@ -6,7 +6,7 @@ spec: hostNetwork: true containers: - name: kube-apiserver - image: k8s.gcr.io/kube-apiserver:9680e782e08a1a1c94c656190011bd02 + image: registry.k8s.io/kube-apiserver:9680e782e08a1a1c94c656190011bd02 command: - /bin/sh - -c diff --git a/test/fixtures/doc-yaml/admin/high-availability/kube-controller-manager.yaml b/test/fixtures/doc-yaml/admin/high-availability/kube-controller-manager.yaml index 79851929788..c0a825149c3 100644 --- a/test/fixtures/doc-yaml/admin/high-availability/kube-controller-manager.yaml +++ b/test/fixtures/doc-yaml/admin/high-availability/kube-controller-manager.yaml @@ -10,7 +10,7 @@ spec: - /usr/local/bin/kube-controller-manager --master=127.0.0.1:8080 --cluster-name=e2e-test-bburns --cluster-cidr=10.245.0.0/16 --allocate-node-cidrs=true --cloud-provider=gce --service-account-private-key-file=/srv/kubernetes/server.key --v=2 1>>/var/log/kube-controller-manager.log --leader-elect 2>&1 - image: k8s.gcr.io/kube-controller-manager:fda24638d51a48baa13c35337fcd4793 + image: registry.k8s.io/kube-controller-manager:fda24638d51a48baa13c35337fcd4793 livenessProbe: httpGet: path: /healthz diff --git a/test/fixtures/doc-yaml/admin/high-availability/kube-scheduler.yaml b/test/fixtures/doc-yaml/admin/high-availability/kube-scheduler.yaml index 1da30918598..97a6ae91d0f 100644 --- a/test/fixtures/doc-yaml/admin/high-availability/kube-scheduler.yaml +++ b/test/fixtures/doc-yaml/admin/high-availability/kube-scheduler.yaml @@ -6,7 +6,7 @@ spec: hostNetwork: true containers: - name: kube-scheduler - image: k8s.gcr.io/kube-scheduler:34d0b8f8b31e27937327961528739bc9 + image: registry.k8s.io/kube-scheduler:34d0b8f8b31e27937327961528739bc9 command: - /bin/sh - -c diff --git a/test/fixtures/doc-yaml/admin/limitrange/invalid-pod.yaml b/test/fixtures/doc-yaml/admin/limitrange/invalid-pod.yaml index ecb45dd95fe..c5eb22fd031 100644 --- a/test/fixtures/doc-yaml/admin/limitrange/invalid-pod.yaml +++ b/test/fixtures/doc-yaml/admin/limitrange/invalid-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: kubernetes-serve-hostname - image: k8s.gcr.io/serve_hostname + image: registry.k8s.io/serve_hostname resources: limits: cpu: "3" diff --git a/test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml b/test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml index d83e91267a4..96c45f966af 100644 --- a/test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml +++ b/test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: kubernetes-serve-hostname - image: k8s.gcr.io/serve_hostname + image: registry.k8s.io/serve_hostname resources: limits: cpu: "1" diff --git a/test/fixtures/doc-yaml/user-guide/multi-pod.yaml b/test/fixtures/doc-yaml/user-guide/multi-pod.yaml index d05f08949c8..9115a823cac 100644 --- a/test/fixtures/doc-yaml/user-guide/multi-pod.yaml +++ b/test/fixtures/doc-yaml/user-guide/multi-pod.yaml @@ -10,7 +10,7 @@ metadata: spec: containers: - name: master - image: k8s.gcr.io/e2e-test-images/redis:5.0.5-alpine + image: registry.k8s.io/e2e-test-images/redis:5.0.5-alpine env: - name: MASTER value: "true" @@ -23,7 +23,7 @@ spec: - mountPath: /redis-master-data name: data - name: sentinel - image: k8s.gcr.io/e2e-test-images/redis:5.0.5-alpine + image: registry.k8s.io/e2e-test-images/redis:5.0.5-alpine env: - name: SENTINEL value: "true" @@ -42,7 +42,7 @@ metadata: spec: containers: - name: kubernetes-serve-hostname - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + image: registry.k8s.io/e2e-test-images/agnhost:2.32 command: ["/agnhost", "serve-hostname"] resources: limits: diff --git a/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml b/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml index eae01d40857..8189f907d4e 100644 --- a/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml +++ b/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml @@ -30,7 +30,7 @@ items: spec: containers: - name: kubernetes-serve-hostname - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + image: registry.k8s.io/e2e-test-images/agnhost:2.32 command: ["/agnhost", "serve-hostname"] resources: limits: diff --git a/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml b/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml index 32a0c06fece..d2465bbd656 100644 --- a/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml +++ b/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml index b2253c8c5d1..290e548abe7 100644 --- a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml +++ b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml @@ -14,4 +14,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.7 + image: registry.k8s.io/pause:3.7 diff --git a/test/images/Makefile b/test/images/Makefile index 1d56c4292da..e60536f9833 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -REGISTRY ?= k8s.gcr.io/e2e-test-images +REGISTRY ?= registry.k8s.io/e2e-test-images GOARM ?= 7 DOCKER_CERT_BASE_PATH ?= QEMUVERSION=v5.1.0-2 diff --git a/test/images/README.md b/test/images/README.md index 4941f29bc1e..927c88f861a 100644 --- a/test/images/README.md +++ b/test/images/README.md @@ -130,7 +130,7 @@ To build AND push an image, the following command can be used: make all-push WHAT=agnhost ``` -By default, the images will be tagged and pushed under the `k8s.gcr.io/e2e-test-images` +By default, the images will be tagged and pushed under the `registry.k8s.io/e2e-test-images` registry. That can changed by running this command instead: ```bash @@ -141,7 +141,7 @@ REGISTRY=foo_registry make all-push WHAT=agnhost require the `agnhost` image to be published in an authenticated repo as well: ```bash -REGISTRY=k8s.gcr.io/e2e-test-images make all-push WHAT=agnhost +REGISTRY=registry.k8s.io/e2e-test-images make all-push WHAT=agnhost REGISTRY=gcr.io/k8s-authenticated-test make all-push WHAT=agnhost ``` @@ -191,8 +191,8 @@ https://testgrid.k8s.io/sig-testing-images#post-kubernetes-push-e2e-agnhost-test will be triggered. The postsubmit job will push the images to the `gcr.io/k8s-staging-e2e-test-images` registry. You can use the image from the staging registry to do more testing if required. All the postsubmit jobs and their logs for all the images can be seen in [testgrid](https://testgrid.k8s.io/sig-testing-images) which is helpful for troubleshooting. Note that these images are not the same as used by the e2e jobs and still need to be promoted to the final registry. -1. The next step is to promote the image to the `k8s.gcr.io/e2e-test-images` registry by adding a line in -[kubernetes/k8s.io](https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/images/k8s-staging-e2e-test-images/images.yaml). See this [pull request](https://github.com/kubernetes/k8s.io/pull/1804) for an example You will need the image manifest list's digest, which can be obtained by using [manifest-tool](https://github.com/estesp/manifest-tool): +1. The next step is to promote the image to the `registry.k8s.io/e2e-test-images` registry by adding a line in +[kubernetes/k8s.io](https://github.com/kubernetes/k8s.io/blob/main/registry.k8s.io/images/k8s-staging-e2e-test-images/images.yaml). See this [pull request](https://github.com/kubernetes/k8s.io/pull/1804) for an example You will need the image manifest list's digest, which can be obtained by using [manifest-tool](https://github.com/estesp/manifest-tool): ```bash manifest-tool inspect --raw gcr.io/k8s-staging-e2e-test-images/${IMAGE_NAME}:${VERSION} | jq '.[0].Digest' diff --git a/test/images/agnhost/README.md b/test/images/agnhost/README.md index e32bff544b8..ffaac0556e6 100644 --- a/test/images/agnhost/README.md +++ b/test/images/agnhost/README.md @@ -32,7 +32,7 @@ For example, let's consider the following `pod.yaml` file: containers: - args: - dns-suffix - image: k8s.gcr.io/e2e-test-images/agnhost:2.14 + image: registry.k8s.io/e2e-test-images/agnhost:2.14 name: agnhost dnsConfig: nameservers: @@ -201,7 +201,7 @@ Usage: ```console guestbook="test/e2e/testing-manifests/guestbook" -sed_expr="s|{{.AgnhostImage}}|k8s.gcr.io/e2e-test-images/agnhost:2.14|" +sed_expr="s|{{.AgnhostImage}}|registry.k8s.io/e2e-test-images/agnhost:2.14|" # create the services. kubectl create -f ${guestbook}/frontend-service.yaml @@ -306,14 +306,14 @@ Examples: ```console docker run -i \ - k8s.gcr.io/e2e-test-images/agnhost:2.29 \ + registry.k8s.io/e2e-test-images/agnhost:2.29 \ logs-generator --log-lines-total 10 --run-duration 1s ``` ```console kubectl run logs-generator \ --generator=run-pod/v1 \ - --image=k8s.gcr.io/e2e-test-images/agnhost:2.29 \ + --image=registry.k8s.io/e2e-test-images/agnhost:2.29 \ --restart=Never \ -- logs-generator -t 10 -d 1s ``` @@ -492,7 +492,7 @@ Usage: ```console kubectl run test-agnhost \ --generator=run-pod/v1 \ - --image=k8s.gcr.io/e2e-test-images/agnhost:2.14 \ + --image=registry.k8s.io/e2e-test-images/agnhost:2.14 \ --restart=Never \ --env "POD_IP=" \ --env "NODE_IP=" \ @@ -547,7 +547,7 @@ Usage: ```console kubectl run test-agnhost \ --generator=run-pod/v1 \ - --image=k8s.gcr.io/e2e-test-images/agnhost:2.21 \ + --image=registry.k8s.io/e2e-test-images/agnhost:2.21 \ --restart=Never \ --env "BIND_ADDRESS=localhost" \ --env "BIND_PORT=8080" \ @@ -667,6 +667,6 @@ The Windows `agnhost` image includes a `nc` binary that is 100% compliant with i ## Image -The image can be found at `k8s.gcr.io/e2e-test-images/agnhost:2.35` for both Linux and +The image can be found at `registry.k8s.io/e2e-test-images/agnhost:2.35` for both Linux and Windows containers (based on `mcr.microsoft.com/windows/nanoserver:1809`, `mcr.microsoft.com/windows/nanoserver:20H2`, and `mcr.microsoft.com/windows/nanoserver:ltsc2022`). diff --git a/test/images/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE index 5857e18a14a..51be60a5e3c 100644 --- a/test/images/nonroot/BASEIMAGE +++ b/test/images/nonroot/BASEIMAGE @@ -1,8 +1,8 @@ -linux/amd64=k8s.gcr.io/debian-base-amd64:v1.0.0 -linux/arm=k8s.gcr.io/debian-base-arm:v1.0.0 -linux/arm64=k8s.gcr.io/debian-base-arm64:v1.0.0 -linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:v1.0.0 -linux/s390x=k8s.gcr.io/debian-base-s390x:v1.0.0 +linux/amd64=registry.k8s.io/debian-base-amd64:v1.0.0 +linux/arm=registry.k8s.io/debian-base-arm:v1.0.0 +linux/arm64=registry.k8s.io/debian-base-arm64:v1.0.0 +linux/ppc64le=registry.k8s.io/debian-base-ppc64le:v1.0.0 +linux/s390x=registry.k8s.io/debian-base-s390x:v1.0.0 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/pets/peer-finder/BASEIMAGE b/test/images/pets/peer-finder/BASEIMAGE index 277470c0baf..fc3cc7c5f2a 100644 --- a/test/images/pets/peer-finder/BASEIMAGE +++ b/test/images/pets/peer-finder/BASEIMAGE @@ -1,5 +1,5 @@ -linux/amd64=k8s.gcr.io/debian-base-amd64:0.4.1 -linux/arm=k8s.gcr.io/debian-base-arm:0.4.1 -linux/arm64=k8s.gcr.io/debian-base-arm64:0.4.1 -linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1 -linux/s390x=k8s.gcr.io/debian-base-s390x:0.4.1 +linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1 +linux/arm=registry.k8s.io/debian-base-arm:0.4.1 +linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1 +linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1 +linux/s390x=registry.k8s.io/debian-base-s390x:0.4.1 diff --git a/test/images/pets/redis-installer/BASEIMAGE b/test/images/pets/redis-installer/BASEIMAGE index 87b14bc1130..b4d573c09f8 100644 --- a/test/images/pets/redis-installer/BASEIMAGE +++ b/test/images/pets/redis-installer/BASEIMAGE @@ -1,4 +1,4 @@ -linux/amd64=k8s.gcr.io/debian-base-amd64:0.4.1 -linux/arm=k8s.gcr.io/debian-base-arm:0.4.1 -linux/arm64=k8s.gcr.io/debian-base-arm64:0.4.1 -linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1 +linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1 +linux/arm=registry.k8s.io/debian-base-arm:0.4.1 +linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1 +linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1 diff --git a/test/images/pets/redis-installer/README.md b/test/images/pets/redis-installer/README.md index f0f0279fea2..bb00e826046 100644 --- a/test/images/pets/redis-installer/README.md +++ b/test/images/pets/redis-installer/README.md @@ -4,7 +4,7 @@ The image in this directory is the init container for contrib/pets/redis but for You can execute the image locally via: ``` -docker run -it k8s.gcr.io/redis-install-3.2.0:e2e --cmd --install-into=/opt --work-dir=/work-dir +docker run -it registry.k8s.io/redis-install-3.2.0:e2e --cmd --install-into=/opt --work-dir=/work-dir ``` To share the installation with other containers mount the appropriate volumes as `--install-into` and `--work-dir`, where `install-into` is the directory to install redis into, and `work-dir` is the directory to install the user/admin supplied on-{start,change} hook scripts. diff --git a/test/images/pets/zookeeper-installer/BASEIMAGE b/test/images/pets/zookeeper-installer/BASEIMAGE index 87b14bc1130..b4d573c09f8 100644 --- a/test/images/pets/zookeeper-installer/BASEIMAGE +++ b/test/images/pets/zookeeper-installer/BASEIMAGE @@ -1,4 +1,4 @@ -linux/amd64=k8s.gcr.io/debian-base-amd64:0.4.1 -linux/arm=k8s.gcr.io/debian-base-arm:0.4.1 -linux/arm64=k8s.gcr.io/debian-base-arm64:0.4.1 -linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1 +linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1 +linux/arm=registry.k8s.io/debian-base-arm:0.4.1 +linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1 +linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1 diff --git a/test/images/pets/zookeeper-installer/README.md b/test/images/pets/zookeeper-installer/README.md index 1948b17a5f0..4bedeec0e05 100644 --- a/test/images/pets/zookeeper-installer/README.md +++ b/test/images/pets/zookeeper-installer/README.md @@ -4,7 +4,7 @@ The image in this directory is the init container for contrib/pets/zookeeper but You can execute the image locally via: ``` -docker run -it k8s.gcr.io/zookeeper-install-3.5.0-alpha:e2e --cmd --install-into=/opt --work-dir=/work-dir +docker run -it registry.k8s.io/zookeeper-install-3.5.0-alpha:e2e --cmd --install-into=/opt --work-dir=/work-dir ``` To share the installation with other containers mount the appropriate volumes as `--install-into` and `--work-dir`, where `install-into` is the directory to install zookeeper into, and `work-dir` is the directory to install the user/admin supplied on-{start,change} hook scripts. diff --git a/test/images/regression-issue-74839/BASEIMAGE b/test/images/regression-issue-74839/BASEIMAGE index da1cc2e96a9..4115c154df2 100644 --- a/test/images/regression-issue-74839/BASEIMAGE +++ b/test/images/regression-issue-74839/BASEIMAGE @@ -1,5 +1,5 @@ -linux/amd64=k8s.gcr.io/debian-base-amd64:v1.0.0 -linux/arm=k8s.gcr.io/debian-base-arm:v1.0.0 -linux/arm64=k8s.gcr.io/debian-base-arm64:v1.0.0 -linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:v1.0.0 -linux/s390x=k8s.gcr.io/debian-base-s390x:v1.0.0 +linux/amd64=registry.k8s.io/debian-base-amd64:v1.0.0 +linux/arm=registry.k8s.io/debian-base-arm:v1.0.0 +linux/arm64=registry.k8s.io/debian-base-arm64:v1.0.0 +linux/ppc64le=registry.k8s.io/debian-base-ppc64le:v1.0.0 +linux/s390x=registry.k8s.io/debian-base-s390x:v1.0.0 diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE index d9428fdd8b5..0b2a75d4384 100644 --- a/test/images/resource-consumer/BASEIMAGE +++ b/test/images/resource-consumer/BASEIMAGE @@ -1,8 +1,8 @@ -linux/amd64=k8s.gcr.io/debian-base-amd64:0.4.1 -linux/arm=k8s.gcr.io/debian-base-arm:0.4.1 -linux/arm64=k8s.gcr.io/debian-base-arm64:0.4.1 -linux/ppc64le=k8s.gcr.io/debian-base-ppc64le:0.4.1 -linux/s390x=k8s.gcr.io/debian-base-s390x:0.4.1 +linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1 +linux/arm=registry.k8s.io/debian-base-arm:0.4.1 +linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1 +linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1 +linux/s390x=registry.k8s.io/debian-base-s390x:0.4.1 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/20H2=mcr.microsoft.com/windows/nanoserver:20H2 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/sample-apiserver/Makefile b/test/images/sample-apiserver/Makefile index 54c93492f1b..670e4e1d242 100644 --- a/test/images/sample-apiserver/Makefile +++ b/test/images/sample-apiserver/Makefile @@ -25,7 +25,7 @@ export # Get without building to populate module cache # Then, get with OS/ARCH-specific env to build bin: - docker run --rm -i -v "${TARGET}:${TARGET}:Z" k8s.gcr.io/build-image/kube-cross:${KUBE_CROSS_VERSION} \ + docker run --rm -i -v "${TARGET}:${TARGET}:Z" registry.k8s.io/build-image/kube-cross:${KUBE_CROSS_VERSION} \ /bin/bash -c "\ mkdir -p /go/src /go/bin && \ GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 && \ diff --git a/test/images/windows/Makefile b/test/images/windows/Makefile index 514c32eb293..8930be12b29 100644 --- a/test/images/windows/Makefile +++ b/test/images/windows/Makefile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -REGISTRY ?= k8s.gcr.io/e2e-test-images +REGISTRY ?= registry.k8s.io/e2e-test-images REMOTE_DOCKER_URL ?= DOCKER_CERT_PATH ?= "$(HOME)/.docker" export diff --git a/test/integration/benchmark-controller.json b/test/integration/benchmark-controller.json index b41fd97e646..b5f82c40a48 100644 --- a/test/integration/benchmark-controller.json +++ b/test/integration/benchmark-controller.json @@ -17,7 +17,7 @@ "spec": { "containers": [{ "name": "test-container", - "image": "k8s.gcr.io/pause:3.7" + "image": "registry.k8s.io/pause:3.7" }] } } diff --git a/test/integration/controlplane/synthetic_controlplane_test.go b/test/integration/controlplane/synthetic_controlplane_test.go index c7c60edd135..7f6c62cda6a 100644 --- a/test/integration/controlplane/synthetic_controlplane_test.go +++ b/test/integration/controlplane/synthetic_controlplane_test.go @@ -420,7 +420,7 @@ var deploymentApps = ` "spec": { "containers": [{ "name": "nginx", - "image": "k8s.gcr.io/nginx:1.7.9" + "image": "registry.k8s.io/nginx:1.7.9" }] } } diff --git a/test/integration/logs/benchmark/data/container.log b/test/integration/logs/benchmark/data/container.log index 4f8a6676f73..27ea85e898d 100644 --- a/test/integration/logs/benchmark/data/container.log +++ b/test/integration/logs/benchmark/data/container.log @@ -1,2 +1,2 @@ # This is a manually created message. See https://github.com/kubernetes/kubernetes/issues/106652 for the real one. -Nov 19 02:13:48 kind-worker2 kubelet[250]: {"ts":1637288028968.0125,"caller":"kuberuntime/kuberuntime_manager.go:902","msg":"Creating container in pod","v":0,"container":{"Name":"terminate-cmd-rpn","Image":"k8s.gcr.io/e2e-test-images/busybox:1.29-2","Command":["sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n"],"TerminationMessagePath":"/dev/termination-log"}} +Nov 19 02:13:48 kind-worker2 kubelet[250]: {"ts":1637288028968.0125,"caller":"kuberuntime/kuberuntime_manager.go:902","msg":"Creating container in pod","v":0,"container":{"Name":"terminate-cmd-rpn","Image":"registry.k8s.io/e2e-test-images/busybox:1.29-2","Command":["sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n"],"TerminationMessagePath":"/dev/termination-log"}} diff --git a/test/integration/logs/benchmark/load_test.go b/test/integration/logs/benchmark/load_test.go index 496377e0858..7ac71096df8 100644 --- a/test/integration/logs/benchmark/load_test.go +++ b/test/integration/logs/benchmark/load_test.go @@ -30,7 +30,7 @@ import ( func TestData(t *testing.T) { container := v1.Container{ Command: []string{"sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n"}, - Image: "k8s.gcr.io/e2e-test-images/busybox:1.29-2", + Image: "registry.k8s.io/e2e-test-images/busybox:1.29-2", Name: "terminate-cmd-rpn", TerminationMessagePath: "/dev/termination-log", } @@ -142,7 +142,7 @@ func TestData(t *testing.T) { }, }, }, - printf: `Creating container in pod: [container &Container{Name:terminate-cmd-rpn,Image:k8s.gcr.io/e2e-test-images/busybox:1.29-2,Command:[sh -c + printf: `Creating container in pod: [container &Container{Name:terminate-cmd-rpn,Image:registry.k8s.io/e2e-test-images/busybox:1.29-2,Command:[sh -c f=/restart-count/restartCount count=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'}) if [ $count -eq 1 ]; then @@ -155,7 +155,7 @@ while true; do sleep 1; done ],Args:[],WorkingDir:,Ports:[]ContainerPort{},Env:[]EnvVar{},Resources:ResourceRequirements{Limits:ResourceList{},Requests:ResourceList{},},VolumeMounts:[]VolumeMount{},LivenessProbe:nil,ReadinessProbe:nil,Lifecycle:nil,TerminationMessagePath:/dev/termination-log,ImagePullPolicy:,SecurityContext:nil,Stdin:false,StdinOnce:false,TTY:false,EnvFrom:[]EnvFromSource{},TerminationMessagePolicy:,VolumeDevices:[]VolumeDevice{},StartupProbe:nil,}] `, structured: `"Creating container in pod" container=< - &Container{Name:terminate-cmd-rpn,Image:k8s.gcr.io/e2e-test-images/busybox:1.29-2,Command:[sh -c + &Container{Name:terminate-cmd-rpn,Image:registry.k8s.io/e2e-test-images/busybox:1.29-2,Command:[sh -c f=/restart-count/restartCount count=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'}) if [ $count -eq 1 ]; then @@ -169,9 +169,9 @@ while true; do sleep 1; done > `, // This is what the output would look like with JSON object. Because of https://github.com/kubernetes/kubernetes/issues/106652 we get the string instead. - // json: `{"msg":"Creating container in pod","v":0,"container":{"name":"terminate-cmd-rpn","image":"k8s.gcr.io/e2e-test-images/busybox:1.29-2","command":["sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n"],"resources":{},"terminationMessagePath":"/dev/termination-log"}} + // json: `{"msg":"Creating container in pod","v":0,"container":{"name":"terminate-cmd-rpn","image":"registry.k8s.io/e2e-test-images/busybox:1.29-2","command":["sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n"],"resources":{},"terminationMessagePath":"/dev/termination-log"}} // `, - json: `{"msg":"Creating container in pod","v":0,"container":"&Container{Name:terminate-cmd-rpn,Image:k8s.gcr.io/e2e-test-images/busybox:1.29-2,Command:[sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n],Args:[],WorkingDir:,Ports:[]ContainerPort{},Env:[]EnvVar{},Resources:ResourceRequirements{Limits:ResourceList{},Requests:ResourceList{},},VolumeMounts:[]VolumeMount{},LivenessProbe:nil,ReadinessProbe:nil,Lifecycle:nil,TerminationMessagePath:/dev/termination-log,ImagePullPolicy:,SecurityContext:nil,Stdin:false,StdinOnce:false,TTY:false,EnvFrom:[]EnvFromSource{},TerminationMessagePolicy:,VolumeDevices:[]VolumeDevice{},StartupProbe:nil,}"} + json: `{"msg":"Creating container in pod","v":0,"container":"&Container{Name:terminate-cmd-rpn,Image:registry.k8s.io/e2e-test-images/busybox:1.29-2,Command:[sh -c \nf=/restart-count/restartCount\ncount=$(echo 'hello' >> $f ; wc -l $f | awk {'print $1'})\nif [ $count -eq 1 ]; then\n\texit 1\nfi\nif [ $count -eq 2 ]; then\n\texit 0\nfi\nwhile true; do sleep 1; done\n],Args:[],WorkingDir:,Ports:[]ContainerPort{},Env:[]EnvVar{},Resources:ResourceRequirements{Limits:ResourceList{},Requests:ResourceList{},},VolumeMounts:[]VolumeMount{},LivenessProbe:nil,ReadinessProbe:nil,Lifecycle:nil,TerminationMessagePath:/dev/termination-log,ImagePullPolicy:,SecurityContext:nil,Stdin:false,StdinOnce:false,TTY:false,EnvFrom:[]EnvFromSource{},TerminationMessagePolicy:,VolumeDevices:[]VolumeDevice{},StartupProbe:nil,}"} `, stats: logStats{ TotalLines: 2, diff --git a/test/integration/scheduler_perf/config/churn/pod-default.yaml b/test/integration/scheduler_perf/config/churn/pod-default.yaml index 72fcee3572b..a1b184353ce 100644 --- a/test/integration/scheduler_perf/config/churn/pod-default.yaml +++ b/test/integration/scheduler_perf/config/churn/pod-default.yaml @@ -4,5 +4,5 @@ metadata: generateName: pod-churn- spec: containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause diff --git a/test/integration/scheduler_perf/config/pod-affinity-ns-selector.yaml b/test/integration/scheduler_perf/config/pod-affinity-ns-selector.yaml index 8e182c54284..1b95e94125c 100644 --- a/test/integration/scheduler_perf/config/pod-affinity-ns-selector.yaml +++ b/test/integration/scheduler_perf/config/pod-affinity-ns-selector.yaml @@ -16,7 +16,7 @@ spec: matchLabels: team: devops containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-anti-affinity-ns-selector.yaml b/test/integration/scheduler_perf/config/pod-anti-affinity-ns-selector.yaml index 1dc9dab609a..1fabc8b63f0 100644 --- a/test/integration/scheduler_perf/config/pod-anti-affinity-ns-selector.yaml +++ b/test/integration/scheduler_perf/config/pod-anti-affinity-ns-selector.yaml @@ -16,7 +16,7 @@ spec: matchLabels: team: devops containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-default.yaml b/test/integration/scheduler_perf/config/pod-default.yaml index 90d2128a3e7..e0304676e51 100644 --- a/test/integration/scheduler_perf/config/pod-default.yaml +++ b/test/integration/scheduler_perf/config/pod-default.yaml @@ -4,7 +4,7 @@ metadata: generateName: pod- spec: containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-high-priority-large-cpu.yaml b/test/integration/scheduler_perf/config/pod-high-priority-large-cpu.yaml index 4e5881e5a4a..a239062d399 100644 --- a/test/integration/scheduler_perf/config/pod-high-priority-large-cpu.yaml +++ b/test/integration/scheduler_perf/config/pod-high-priority-large-cpu.yaml @@ -5,7 +5,7 @@ metadata: spec: priority: 10 containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-high-priority.yaml b/test/integration/scheduler_perf/config/pod-high-priority.yaml index d5091112700..75f7fd77e24 100644 --- a/test/integration/scheduler_perf/config/pod-high-priority.yaml +++ b/test/integration/scheduler_perf/config/pod-high-priority.yaml @@ -5,7 +5,7 @@ metadata: spec: priority: 10 containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-large-cpu.yaml b/test/integration/scheduler_perf/config/pod-large-cpu.yaml index 85a9364eefa..dbdada32dd7 100644 --- a/test/integration/scheduler_perf/config/pod-large-cpu.yaml +++ b/test/integration/scheduler_perf/config/pod-large-cpu.yaml @@ -4,7 +4,7 @@ metadata: generateName: pod- spec: containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-low-priority.yaml b/test/integration/scheduler_perf/config/pod-low-priority.yaml index 64936fb42be..74a6630f3c5 100644 --- a/test/integration/scheduler_perf/config/pod-low-priority.yaml +++ b/test/integration/scheduler_perf/config/pod-low-priority.yaml @@ -5,7 +5,7 @@ metadata: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-preferred-affinity-ns-selector.yaml b/test/integration/scheduler_perf/config/pod-preferred-affinity-ns-selector.yaml index 4fb4b8d51bd..0f7361e3f6e 100644 --- a/test/integration/scheduler_perf/config/pod-preferred-affinity-ns-selector.yaml +++ b/test/integration/scheduler_perf/config/pod-preferred-affinity-ns-selector.yaml @@ -18,7 +18,7 @@ spec: team: devops weight: 1 containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-preferred-anti-affinity-ns-selector.yaml b/test/integration/scheduler_perf/config/pod-preferred-anti-affinity-ns-selector.yaml index 5b0c680e790..d508a86205e 100644 --- a/test/integration/scheduler_perf/config/pod-preferred-anti-affinity-ns-selector.yaml +++ b/test/integration/scheduler_perf/config/pod-preferred-anti-affinity-ns-selector.yaml @@ -18,7 +18,7 @@ spec: team: devops weight: 1 containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-node-affinity.yaml b/test/integration/scheduler_perf/config/pod-with-node-affinity.yaml index 8abc41005d6..c42bc4b5f12 100644 --- a/test/integration/scheduler_perf/config/pod-with-node-affinity.yaml +++ b/test/integration/scheduler_perf/config/pod-with-node-affinity.yaml @@ -14,7 +14,7 @@ spec: - zone1 - zone2 containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml b/test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml index 58305f94aa8..3e7e3f9b313 100644 --- a/test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml +++ b/test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml @@ -14,7 +14,7 @@ spec: topologyKey: topology.kubernetes.io/zone namespaces: ["sched-1", "sched-0"] containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml b/test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml index e95b4a669ef..7a59f60a315 100644 --- a/test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml +++ b/test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml @@ -14,7 +14,7 @@ spec: topologyKey: kubernetes.io/hostname namespaces: ["sched-1", "sched-0"] containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml b/test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml index c2a7946d537..74c2ccc9491 100644 --- a/test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml +++ b/test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml @@ -16,7 +16,7 @@ spec: namespaces: ["sched-1", "sched-0"] weight: 1 containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml b/test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml index 556d0883924..a28ee578086 100644 --- a/test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml +++ b/test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml @@ -16,7 +16,7 @@ spec: namespaces: ["sched-1", "sched-0"] weight: 1 containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml b/test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml index cc6c66cc630..12a4b70d08c 100644 --- a/test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml +++ b/test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml @@ -13,7 +13,7 @@ spec: matchLabels: color: blue containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-secret-volume.yaml b/test/integration/scheduler_perf/config/pod-with-secret-volume.yaml index f8b74a52c40..31eea51e7e7 100644 --- a/test/integration/scheduler_perf/config/pod-with-secret-volume.yaml +++ b/test/integration/scheduler_perf/config/pod-with-secret-volume.yaml @@ -4,7 +4,7 @@ metadata: generateName: secret-volume- spec: containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml b/test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml index b58edeb3a73..3634262e7b9 100644 --- a/test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml +++ b/test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml @@ -13,7 +13,7 @@ spec: matchLabels: color: blue containers: - - image: k8s.gcr.io/pause:3.7 + - image: registry.k8s.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/integration/statefulset/statefulset_test.go b/test/integration/statefulset/statefulset_test.go index 675fb32760b..34ab4140e58 100644 --- a/test/integration/statefulset/statefulset_test.go +++ b/test/integration/statefulset/statefulset_test.go @@ -76,7 +76,7 @@ func TestVolumeTemplateNoopUpdate(t *testing.T) { "terminationGracePeriodSeconds": 10, "containers": [{ "name": "nginx", - "image": "k8s.gcr.io/nginx-slim:0.8", + "image": "registry.k8s.io/nginx-slim:0.8", "ports": [{"containerPort": 80,"name": "web"}], "volumeMounts": [{"name": "www","mountPath": "/usr/share/nginx/html"}] }] diff --git a/test/kubemark/resources/cluster-autoscaler_template.json b/test/kubemark/resources/cluster-autoscaler_template.json index ffe4a61f8b3..87e465a5f61 100644 --- a/test/kubemark/resources/cluster-autoscaler_template.json +++ b/test/kubemark/resources/cluster-autoscaler_template.json @@ -14,7 +14,7 @@ "containers": [ { "name": "cluster-autoscaler", - "image": "k8s.gcr.io/cluster-autoscaler:v1.0.0", + "image": "registry.k8s.io/cluster-autoscaler:v1.0.0", "command": [ "./run.sh", "--kubernetes=https://{{master_ip}}:443?inClusterConfig=0&useServiceAccount=0&auth=/kubeconfig/cluster_autoscaler.kubeconfig", diff --git a/test/kubemark/resources/heapster_template.json b/test/kubemark/resources/heapster_template.json index 5a9bb512ea1..8164ce31740 100644 --- a/test/kubemark/resources/heapster_template.json +++ b/test/kubemark/resources/heapster_template.json @@ -33,7 +33,7 @@ "containers": [ { "name": "heapster", - "image": "k8s.gcr.io/heapster:v1.3.0", + "image": "registry.k8s.io/heapster:v1.3.0", "resources": { "requests": { "cpu": "{{METRICS_CPU}}m", @@ -55,7 +55,7 @@ }, { "name": "eventer", - "image": "k8s.gcr.io/heapster:v1.3.0", + "image": "registry.k8s.io/heapster:v1.3.0", "resources": { "requests": { "memory": "{{EVENTER_MEM}}Ki" diff --git a/test/kubemark/resources/hollow-node_template.yaml b/test/kubemark/resources/hollow-node_template.yaml index ab26783a38c..ac847a48648 100644 --- a/test/kubemark/resources/hollow-node_template.yaml +++ b/test/kubemark/resources/hollow-node_template.yaml @@ -99,7 +99,7 @@ spec: cpu: {{hollow_proxy_millicpu}}m memory: {{hollow_proxy_mem_Ki}}Ki - name: hollow-node-problem-detector - image: k8s.gcr.io/node-problem-detector/node-problem-detector:v0.8.9 + image: registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.9 env: - name: NODE_NAME valueFrom: diff --git a/test/kubemark/resources/kube_dns_template.yaml b/test/kubemark/resources/kube_dns_template.yaml index 5857f43271e..d943d810c74 100644 --- a/test/kubemark/resources/kube_dns_template.yaml +++ b/test/kubemark/resources/kube_dns_template.yaml @@ -72,7 +72,7 @@ spec: secretName: kubeconfig containers: - name: kubedns - image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.9 + image: registry.k8s.io/k8s-dns-kube-dns-amd64:1.14.9 resources: limits: memory: 170Mi @@ -120,7 +120,7 @@ spec: - name: secret-volume mountPath: /etc/secret-volume - name: dnsmasq - image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.9 + image: registry.k8s.io/k8s-dns-dnsmasq-nanny-amd64:1.14.9 livenessProbe: httpGet: path: /healthcheck/dnsmasq @@ -160,7 +160,7 @@ spec: - name: kube-dns-config mountPath: /etc/k8s/dns/dnsmasq-nanny - name: sidecar - image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.9 + image: registry.k8s.io/k8s-dns-sidecar-amd64:1.14.9 livenessProbe: httpGet: path: /metrics diff --git a/test/kubemark/resources/start-kubemark-master.sh b/test/kubemark/resources/start-kubemark-master.sh index b7fc1d1b120..4279fa18600 100755 --- a/test/kubemark/resources/start-kubemark-master.sh +++ b/test/kubemark/resources/start-kubemark-master.sh @@ -742,7 +742,7 @@ create-addonmanager-kubeconfig # Setup docker flags and load images of the master components. assemble-docker-flags -DOCKER_REGISTRY="k8s.gcr.io" +DOCKER_REGISTRY="registry.k8s.io" load-docker-images readonly audit_policy_file="/etc/audit_policy.config" diff --git a/test/utils/image/csi_manifest.go b/test/utils/image/csi_manifest.go index d55bc978123..27c750751ba 100644 --- a/test/utils/image/csi_manifest.go +++ b/test/utils/image/csi_manifest.go @@ -27,7 +27,7 @@ import ( e2etestingmanifests "k8s.io/kubernetes/test/e2e/testing-manifests" ) -// All of the image tags are of the format k8s.gcr.io/sig-storage/hostpathplugin:v1.7.3. +// All of the image tags are of the format registry.k8s.io/sig-storage/hostpathplugin:v1.7.3. var imageRE = regexp.MustCompile(`^(.*)/([^/:]*):(.*)$`) // appendCSIImageConfigs extracts image repo, name and version from diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 4965c1ef0eb..572bf9385eb 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -123,16 +123,16 @@ func readFromURL(url string, writer io.Writer) error { var ( initRegistry = RegistryList{ GcAuthenticatedRegistry: "gcr.io/authenticated-image-pulling", - PromoterE2eRegistry: "k8s.gcr.io/e2e-test-images", - BuildImageRegistry: "k8s.gcr.io/build-image", + PromoterE2eRegistry: "registry.k8s.io/e2e-test-images", + BuildImageRegistry: "registry.k8s.io/build-image", InvalidRegistry: "invalid.registry.k8s.io/invalid", - GcEtcdRegistry: "k8s.gcr.io", - GcRegistry: "k8s.gcr.io", - SigStorageRegistry: "k8s.gcr.io/sig-storage", + GcEtcdRegistry: "registry.k8s.io", + GcRegistry: "registry.k8s.io", + SigStorageRegistry: "registry.k8s.io/sig-storage", PrivateRegistry: "gcr.io/k8s-authenticated-test", MicrosoftRegistry: "mcr.microsoft.com", DockerLibraryRegistry: "docker.io/library", - CloudProviderGcpRegistry: "k8s.gcr.io/cloud-provider-gcp", + CloudProviderGcpRegistry: "registry.k8s.io/cloud-provider-gcp", } registry = initReg() diff --git a/test/utils/image/manifest_test.go b/test/utils/image/manifest_test.go index a981d89719f..700bb97881c 100644 --- a/test/utils/image/manifest_test.go +++ b/test/utils/image/manifest_test.go @@ -39,13 +39,13 @@ func BenchmarkReplaceRegistryInImageURL(b *testing.B) { in: "test", out: "test.io/library/test", }, { - in: "k8s.gcr.io/test:123", + in: "registry.k8s.io/test:123", out: "test.io/test:123", }, { in: "gcr.io/k8s-authenticated-test/test:123", out: "test.io/k8s-authenticated-test/test:123", }, { - in: "k8s.gcr.io/sig-storage/test:latest", + in: "registry.k8s.io/sig-storage/test:latest", out: "test.io/sig-storage/test:latest", }, { in: "invalid.registry.k8s.io/invalid/test:latest", @@ -54,10 +54,10 @@ func BenchmarkReplaceRegistryInImageURL(b *testing.B) { in: "mcr.microsoft.com/test:latest", out: "test.io/microsoft/test:latest", }, { - in: "k8s.gcr.io/e2e-test-images/test:latest", + in: "registry.k8s.io/e2e-test-images/test:latest", out: "test.io/promoter/test:latest", }, { - in: "k8s.gcr.io/build-image/test:latest", + in: "registry.k8s.io/build-image/test:latest", out: "test.io/build/test:latest", }, { in: "gcr.io/authenticated-image-pulling/test:latest", @@ -100,13 +100,13 @@ func TestReplaceRegistryInImageURL(t *testing.T) { in: "test", out: "test.io/library/test", }, { - in: "k8s.gcr.io/test:123", + in: "registry.k8s.io/test:123", out: "test.io/test:123", }, { in: "gcr.io/k8s-authenticated-test/test:123", out: "test.io/k8s-authenticated-test/test:123", }, { - in: "k8s.gcr.io/sig-storage/test:latest", + in: "registry.k8s.io/sig-storage/test:latest", out: "test.io/sig-storage/test:latest", }, { in: "invalid.registry.k8s.io/invalid/test:latest", @@ -115,10 +115,10 @@ func TestReplaceRegistryInImageURL(t *testing.T) { in: "mcr.microsoft.com/test:latest", out: "test.io/microsoft/test:latest", }, { - in: "k8s.gcr.io/e2e-test-images/test:latest", + in: "registry.k8s.io/e2e-test-images/test:latest", out: "test.io/promoter/test:latest", }, { - in: "k8s.gcr.io/build-image/test:latest", + in: "registry.k8s.io/build-image/test:latest", out: "test.io/build/test:latest", }, { in: "gcr.io/authenticated-image-pulling/test:latest", diff --git a/test/utils/runners.go b/test/utils/runners.go index 05df7643255..d3d37944f7c 100644 --- a/test/utils/runners.go +++ b/test/utils/runners.go @@ -1319,7 +1319,7 @@ func MakePodSpec() v1.PodSpec { return v1.PodSpec{ Containers: []v1.Container{{ Name: "pause", - Image: "k8s.gcr.io/pause:3.7", + Image: "registry.k8s.io/pause:3.7", Ports: []v1.ContainerPort{{ContainerPort: 80}}, Resources: v1.ResourceRequirements{ Limits: v1.ResourceList{ @@ -1741,7 +1741,7 @@ type DaemonConfig struct { func (config *DaemonConfig) Run() error { if config.Image == "" { - config.Image = "k8s.gcr.io/pause:3.7" + config.Image = "registry.k8s.io/pause:3.7" } nameLabel := map[string]string{ "name": config.Name + "-daemon",