From 8a9c0151e97d19866c2c9efeb850f6f600776ae2 Mon Sep 17 00:00:00 2001 From: Khaled Hamed Date: Mon, 13 Feb 2023 20:04:06 +0000 Subject: [PATCH 1/2] Update k8s.gcr.io to registry.k8s.io --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 84108a8fc..742452b3d 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,6 @@ Follow these steps to make changes and release a new binary. The image SHAs should be added to [`images/k8s-staging-dns/images.yaml`](https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/images/k8s-staging-dns/images.yaml). The SHAs can be obtained by running the command `python parse-image-sha.py ` This will return the SHAs for kube-dns as well as node-cache images. Node-cache images are always promoted, kube-dns images are promoted if there is a change to kubedns/vulnerability fix. -6. Images will be available in the repo k8s.gcr.io/dns/. The node-cache image with tag 1.15.14 can be found at k8s.gcr.io/dns/k8s-dns-node-cache:1.15.14. Older versions are at k8s.gcr.io/k8s-dns-node-cache: +6. Images will be available in the repo registry.k8s.io/dns/. The node-cache image with tag 1.15.14 can be found at registry.k8s.io/dns/k8s-dns-node-cache:1.15.14. Older versions are at registry.k8s.io/k8s-dns-node-cache: 7. Submit a PR for the kubernetes/kubernetes repository to switch to the new version of the containers. Example - https://github.com/kubernetes/kubernetes/pull/106189 From 0c047077561a076f97bf3d91b230922cae4e4cab Mon Sep 17 00:00:00 2001 From: Khaled Hamed Date: Mon, 13 Feb 2023 20:06:29 +0000 Subject: [PATCH 2/2] Update k8s.gcr.io to registry.k8s.io --- images/dnsmasq/Makefile | 4 ++-- pkg/e2e/options.go | 4 ++-- test/e2e/cluster/manifests/addon-manager.json | 2 +- test/e2e/cluster/manifests/master.json | 6 +++--- test/e2e/sidecar/Dockerfile.e2e | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/images/dnsmasq/Makefile b/images/dnsmasq/Makefile index a7be98135..1bca221c2 100644 --- a/images/dnsmasq/Makefile +++ b/images/dnsmasq/Makefile @@ -21,7 +21,7 @@ CONTAINER_PREFIX ?= k8s-dns ALL_ARCH := amd64 arm arm64 ppc64le s390x MANIFEST_IMAGE := $(REGISTRY)/$(CONTAINER_PREFIX)-dnsmasq IMAGE := $(CONTAINER_PREFIX)-dnsmasq-$(ARCH) -COMPILE_IMAGE := k8s.gcr.io/kube-cross:v1.7.6-k8s1.6-0 +COMPILE_IMAGE := registry.k8s.io/kube-cross:v1.7.6-k8s1.6-0 OUTPUT_DIR := _output/$(ARCH) # Ensure that the docker command line supports the manifest images @@ -31,7 +31,7 @@ export DOCKER_CLI_EXPERIMENTAL=enabled # Uploaded: Feb 10, 2023, 11:04:43 PM BASEIMAGE ?= gcr.io/distroless/base-debian11@sha256:5d40383d8cc15830334f30f4a19e2af16923e02ceeca275f0acc39bdf3a1c577 ifeq ($(ARCH),amd64) - COMPILE_IMAGE := k8s.gcr.io/build-image/debian-base-$(ARCH):bullseye-v1.4.1 + COMPILE_IMAGE := registry.k8s.io/build-image/debian-base-$(ARCH):bullseye-v1.4.1 else ifeq ($(ARCH),arm) TRIPLE ?= arm-linux-gnueabihf QEMUARCH := arm diff --git a/pkg/e2e/options.go b/pkg/e2e/options.go index 388100459..3a109bbda 100644 --- a/pkg/e2e/options.go +++ b/pkg/e2e/options.go @@ -18,8 +18,8 @@ package e2e const ( etcdImage = "quay.io/coreos/etcd:v3.0.14" - hyperkubeImage = "k8s.gcr.io/hyperkube:v1.5.1" - dnsmasqImage = "k8s.gcr.io/k8s-dns-dnsmasq-amd64:1.14.5" + hyperkubeImage = "registry.k8s.io/hyperkube:v1.5.1" + dnsmasqImage = "registry.k8s.io/k8s-dns-dnsmasq-amd64:1.14.5" ) type Options struct { diff --git a/test/e2e/cluster/manifests/addon-manager.json b/test/e2e/cluster/manifests/addon-manager.json index c982160ac..358513b5b 100644 --- a/test/e2e/cluster/manifests/addon-manager.json +++ b/test/e2e/cluster/manifests/addon-manager.json @@ -11,7 +11,7 @@ "containers": [ { "name": "kube-addon-manager", - "image": "k8s.gcr.io/kube-addon-manager-amd64:v6.1", + "image": "registry.k8s.io/kube-addon-manager-amd64:v6.1", "resources": { "requests": { "cpu": "5m", diff --git a/test/e2e/cluster/manifests/master.json b/test/e2e/cluster/manifests/master.json index cff28530c..65a8a3bad 100644 --- a/test/e2e/cluster/manifests/master.json +++ b/test/e2e/cluster/manifests/master.json @@ -10,7 +10,7 @@ "containers": [ { "name": "controller-manager", - "image": "k8s.gcr.io/hyperkube-amd64:v1.5.1", + "image": "registry.k8s.io/hyperkube-amd64:v1.5.1", "command": [ "/hyperkube", "controller-manager", @@ -30,7 +30,7 @@ }, { "name": "scheduler", - "image": "k8s.gcr.io/hyperkube-amd64:v1.5.1", + "image": "registry.k8s.io/hyperkube-amd64:v1.5.1", "command": [ "/hyperkube", "scheduler", @@ -41,7 +41,7 @@ }, { "name": "setup", - "image": "k8s.gcr.io/hyperkube-amd64:v1.5.1", + "image": "registry.k8s.io/hyperkube-amd64:v1.5.1", "command": [ "/setup-files.sh", "IP:10.0.0.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local" diff --git a/test/e2e/sidecar/Dockerfile.e2e b/test/e2e/sidecar/Dockerfile.e2e index ef470df9f..faa3865be 100644 --- a/test/e2e/sidecar/Dockerfile.e2e +++ b/test/e2e/sidecar/Dockerfile.e2e @@ -13,7 +13,7 @@ # limitations under the License. # # Builds the docker container for the e2e test. -FROM k8s.gcr.io/kube-dnsmasq-amd64:1.4 +FROM registry.k8s.io/kube-dnsmasq-amd64:1.4 MAINTAINER Bowei Du COPY bin/amd64/sidecar /sidecar