diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile index 0ebf515c4ed..42de13ccb88 100644 --- a/build/build-image/Dockerfile +++ b/build/build-image/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # This file creates a standard build environment for building Kubernetes -FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:KUBE_BUILD_IMAGE_CROSS_TAG +FROM k8s.gcr.io/build-image/kube-cross:KUBE_BUILD_IMAGE_CROSS_TAG # Mark this as a kube-build container RUN touch /kube-build-image diff --git a/build/common.sh b/build/common.sh index 942bd4d6458..f000b76c33c 100755 --- a/build/common.sh +++ b/build/common.sh @@ -43,7 +43,7 @@ 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:-us.gcr.io/k8s-artifacts-prod/build-image}" +readonly KUBE_BASE_IMAGE_REGISTRY="${KUBE_BASE_IMAGE_REGISTRY:-k8s.gcr.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/debian-iptables/Makefile b/build/debian-iptables/Makefile index 4a669177c43..917b1c81015 100644 --- a/build/debian-iptables/Makefile +++ b/build/debian-iptables/Makefile @@ -21,7 +21,7 @@ ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x TEMP_DIR:=$(shell mktemp -d) -BASE_REGISTRY?=us.gcr.io/k8s-artifacts-prod/build-image +BASE_REGISTRY?=k8s.gcr.io/build-image BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.1.0 # This option is for running docker manifest command diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 6a58ca918c1..b33748ba9ad 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -92,15 +92,15 @@ dependencies: - path: build/debian-iptables/Makefile match: BASEIMAGE\?\=\$\(BASE_REGISTRY\)\/debian-base-\$\(ARCH\) - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base:v\d+\.\d+\.\d+ - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-arm:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-arm:v\d+\.\d+\.\d+ - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-arm64:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-arm64:v\d+\.\d+\.\d+ - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-ppc64le:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-ppc64le:v\d+\.\d+\.\d+ - path: cluster/images/etcd/Makefile - match: BASEIMAGE\?\=us\.gcr\.io\/k8s-artifacts-prod\/build-image\/debian-base-s390x:v\d+\.\d+\.\d+ + match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-s390x:v\d+\.\d+\.\d+ - name: "k8s.gcr.io/debian-iptables" version: 12.1.0 @@ -137,7 +137,7 @@ dependencies: refPaths: - path: build/build-image/cross/VERSION - path: test/images/sample-apiserver/Dockerfile - match: us\.gcr\.io\/k8s-artifacts-prod\/build-image\/kube-cross:v\d+\.\d+\.\d+-\d+ + match: k8s\.gcr\.io\/build-image\/kube-cross:v\d+\.\d+\.\d+-\d+ - name: "k8s.gcr.io/pause" version: 3.3 diff --git a/build/pause/Makefile b/build/pause/Makefile index 0559b13a8a8..9fa573d7d70 100644 --- a/build/pause/Makefile +++ b/build/pause/Makefile @@ -27,7 +27,7 @@ ARCH ?= amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x CFLAGS = -Os -Wall -Werror -static -DVERSION=v$(TAG)-$(REV) -KUBE_CROSS_IMAGE ?= us.gcr.io/k8s-artifacts-prod/build-image/kube-cross +KUBE_CROSS_IMAGE ?= k8s.gcr.io/build-image/kube-cross KUBE_CROSS_VERSION ?= $(shell cat ../build-image/cross/VERSION) BIN = pause diff --git a/build/workspace.bzl b/build/workspace.bzl index 85d9bcb3e27..f23d3725a00 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -125,7 +125,7 @@ def image_dependencies(): name = "go-runner-linux-" + arch, architecture = arch, digest = _digest(_GO_RUNNER_DIGEST, arch), - registry = "us.gcr.io/k8s-artifacts-prod/build-image", + registry = "k8s.gcr.io/build-image", repository = "go-runner", tag = "v0.1.1", # ignored, but kept here for documentation ) @@ -134,7 +134,7 @@ def image_dependencies(): name = "debian-base-" + arch, architecture = arch, digest = _digest(_DEBIAN_BASE_DIGEST, arch), - registry = "us.gcr.io/k8s-artifacts-prod/build-image", + registry = "k8s.gcr.io/build-image", repository = "debian-base", # Ensure the digests above are updated to match a new tag tag = "v2.1.0", # ignored, but kept here for documentation @@ -144,7 +144,7 @@ def image_dependencies(): name = "debian-iptables-" + arch, architecture = arch, digest = _digest(_DEBIAN_IPTABLES_DIGEST, arch), - registry = "us.gcr.io/k8s-artifacts-prod/build-image", + registry = "k8s.gcr.io/build-image", repository = "debian-iptables", # Ensure the digests above are updated to match a new tag tag = "v12.1.0", # ignored, but kept here for documentation diff --git a/cluster/gce/addons/konnectivity-agent/konnectivity-agent-ds.yaml b/cluster/gce/addons/konnectivity-agent/konnectivity-agent-ds.yaml index b5b38c79597..2f684fca045 100644 --- a/cluster/gce/addons/konnectivity-agent/konnectivity-agent-ds.yaml +++ b/cluster/gce/addons/konnectivity-agent/konnectivity-agent-ds.yaml @@ -23,7 +23,7 @@ spec: - key: "CriticalAddonsOnly" operator: "Exists" containers: - - image: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-agent:v0.0.9 + - image: k8s.gcr.io/kas-network-proxy/proxy-agent:v0.0.9 name: konnectivity-agent command: ["/proxy-agent"] args: [ diff --git a/cluster/gce/manifests/etcd.manifest b/cluster/gce/manifests/etcd.manifest index e6ef6457975..29f5783820c 100644 --- a/cluster/gce/manifests/etcd.manifest +++ b/cluster/gce/manifests/etcd.manifest @@ -15,7 +15,7 @@ "containers":[ { "name": "etcd-container", - "image": "{{ pillar.get('etcd_docker_repository', 'us.gcr.io/k8s-artifacts-prod/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.4.9-1') }}", + "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.4.9-1') }}", "resources": { "requests": { "cpu": {{ cpulimit }} diff --git a/cluster/gce/manifests/konnectivity-server.yaml b/cluster/gce/manifests/konnectivity-server.yaml index 9b1f50e493c..d762c0d498c 100644 --- a/cluster/gce/manifests/konnectivity-server.yaml +++ b/cluster/gce/manifests/konnectivity-server.yaml @@ -12,7 +12,7 @@ spec: hostNetwork: true containers: - name: konnectivity-server-container - image: us.gcr.io/k8s-artifacts-prod/kas-network-proxy/proxy-server:v0.0.9 + image: k8s.gcr.io/kas-network-proxy/proxy-server:v0.0.9 resources: requests: cpu: 25m diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index e090fa549ff..5e219de4263 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -67,19 +67,19 @@ GOARM?=7 TEMP_DIR:=$(shell mktemp -d) ifeq ($(ARCH),amd64) - BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base:v2.1.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base:v2.1.0 endif ifeq ($(ARCH),arm) - BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm:v2.1.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:v2.1.0 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-arm64:v2.1.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:v2.1.0 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-ppc64le:v2.1.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:v2.1.0 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=us.gcr.io/k8s-artifacts-prod/build-image/debian-base-s390x:v2.1.0 + BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:v2.1.0 endif RUNNERIMAGE?=gcr.io/distroless/static:latest diff --git a/test/images/agnhost/README.md b/test/images/agnhost/README.md index 2b13bdd8650..f1193c2b57a 100644 --- a/test/images/agnhost/README.md +++ b/test/images/agnhost/README.md @@ -40,7 +40,7 @@ For example, let's consider the following `pod.yaml` file: containers: - args: - dns-suffix - image: us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost:2.14 + image: k8s.gcr.io/e2e-test-images/agnhost:2.14 name: agnhost dnsConfig: nameservers: @@ -209,7 +209,7 @@ Usage: ```console guestbook="test/e2e/testing-manifests/guestbook" -sed_expr="s|{{.AgnhostImage}}|us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost:2.14|" +sed_expr="s|{{.AgnhostImage}}|k8s.gcr.io/e2e-test-images/agnhost:2.14|" # create the services. kubectl create -f ${guestbook}/frontend-service.yaml @@ -292,14 +292,14 @@ Examples: ```console docker run -i \ - us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost:2.14 \ + k8s.gcr.io/e2e-test-images/agnhost:2.14 \ logs-generator --log-lines-total 10 --run-duration 1s ``` ```console kubectl run logs-generator \ --generator=run-pod/v1 \ - --image=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost:2.14 \ + --image=k8s.gcr.io/e2e-test-images/agnhost:2.14 \ --restart=Never \ -- logs-generator -t 10 -d 1s ``` @@ -476,7 +476,7 @@ Usage: ```console kubectl run test-agnhost \ --generator=run-pod/v1 \ - --image=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost:2.14 \ + --image=k8s.gcr.io/e2e-test-images/agnhost:2.14 \ --restart=Never \ --env "POD_IP=" \ --env "NODE_IP=" \ @@ -531,7 +531,7 @@ Usage: ```console kubectl run test-agnhost \ --generator=run-pod/v1 \ - --image=us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost:2.14 \ + --image=k8s.gcr.io/e2e-test-images/agnhost:2.14 \ --restart=Never \ --env "BIND_ADDRESS=localhost" \ --env "BIND_PORT=8080" \ @@ -659,6 +659,6 @@ The Windows `agnhost` image includes a `nc` binary that is 100% compliant with i ## Image -The image can be found at `us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnhost:2.14` for both Linux and +The image can be found at `k8s.gcr.io/e2e-test-images/agnhost:2.14` for both Linux and Windows containers (based on `mcr.microsoft.com/windows/servercore:ltsc2019`, `mcr.microsoft.com/windows/servercore:1903`, and `mcr.microsoft.com/windows/servercore:1909`). diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile index cb2798d53b9..9e50ad5d2ee 100644 --- a/test/images/sample-apiserver/Dockerfile +++ b/test/images/sample-apiserver/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. ARG BASEIMAGE -FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.14.6-1 as build_k8s_1_17_sample_apiserver +FROM k8s.gcr.io/build-image/kube-cross:v1.14.6-1 as build_k8s_1_17_sample_apiserver ENV GOPATH /go RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 179d45f96d4..8153fa926b2 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -73,12 +73,11 @@ func initReg() RegistryList { DockerGluster: "docker.io/gluster", E2eRegistry: "gcr.io/kubernetes-e2e-test-images", E2eVolumeRegistry: "gcr.io/kubernetes-e2e-test-images/volume", - // TODO: After the domain flip, this should instead be k8s.gcr.io/k8s-artifacts-prod/e2e-test-images - PromoterE2eRegistry: "us.gcr.io/k8s-artifacts-prod/e2e-test-images", - BuildImageRegistry: "us.gcr.io/k8s-artifacts-prod/build-image", - InvalidRegistry: "invalid.com/invalid", - GcRegistry: "k8s.gcr.io", - GcrReleaseRegistry: "gcr.io/gke-release", + PromoterE2eRegistry: "k8s.gcr.io/e2e-test-images", + BuildImageRegistry: "k8s.gcr.io/build-image", + InvalidRegistry: "invalid.com/invalid", + GcRegistry: "k8s.gcr.io", + GcrReleaseRegistry: "gcr.io/gke-release", // TODO: The last consumer of this has been removed and it should be deleted GoogleContainerRegistry: "gcr.io/google-containers", PrivateRegistry: "gcr.io/k8s-authenticated-test",