Use k8s.gcr.io vanity domain for container images

2026-01-29 21:29:24 +00:00 · 2017-10-18 23:37:03 +02:00
parent 17117051c4
commit eba5b6092a
247 changed files with 541 additions and 525 deletions
--- a/test/e2e_node/conformance/build/Makefile
+++ b/test/e2e_node/conformance/build/Makefile
@@ -15,7 +15,7 @@
 # Build the node-test image.
 #
 # Usage:
-#   [ARCH=amd64] [REGISTRY="gcr.io/google_containers"] [BIN_DIR="../../../../_output/bin"] make (build|push) VERSION={some_version_number e.g. 0.1}
+#   [ARCH=amd64] [REGISTRY="k8s.gcr.io"] [BIN_DIR="../../../../_output/bin"] make (build|push) VERSION={some_version_number e.g. 0.1}

 # SYSTEM_SPEC_NAME is the name of the system spec used for the node conformance
 # test. The specs are expected to be in SYSTEM_SPEC_DIR.
@@ -23,7 +23,7 @@ SYSTEM_SPEC_NAME?=
 SYSTEM_SPEC_DIR?=../../system/specs

 # TODO(random-liu): Add this into release progress.
-REGISTRY?=gcr.io/google_containers
+REGISTRY?=k8s.gcr.io
 ARCH?=amd64
 # BIN_DIR is the directory to find binaries, overwrite with ../../../../_output/bin
 # for local development.
@@ -76,10 +76,10 @@ endif
 	docker build --pull -t ${IMAGE_NAME}-${ARCH}:${VERSION} ${TEMP_DIR}

 push: build
-	gcloud docker -- push ${IMAGE_NAME}-${ARCH}:${VERSION}
+	gcloud docker --server=k8s.gcr.io -- push ${IMAGE_NAME}-${ARCH}:${VERSION}
 ifeq ($(ARCH),amd64)
 	docker tag ${IMAGE_NAME}-${ARCH}:${VERSION} ${IMAGE_NAME}:${VERSION}
-	gcloud docker -- push ${IMAGE_NAME}:${VERSION}
+	gcloud docker --server=k8s.gcr.io -- push ${IMAGE_NAME}:${VERSION}
 endif

 .PHONY: all
--- a/test/e2e_node/conformance/run_test.sh
+++ b/test/e2e_node/conformance/run_test.sh
@@ -44,7 +44,7 @@ SKIP=${SKIP:-""}
 TEST_ARGS=${TEST_ARGS:-""}

 # REGISTRY is the image registry for node test image.
-REGISTRY=${REGISTRY:-"gcr.io/google_containers"}
+REGISTRY=${REGISTRY:-"k8s.gcr.io"}

 # ARCH is the architecture of current machine, the script will use this to
 # select corresponding test container image.
--- a/test/e2e_node/gke_environment_test.go
+++ b/test/e2e_node/gke_environment_test.go
@@ -84,7 +84,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 = "gcr.io/google-containers/busybox"
+	const image = "k8s.gcr.io/busybox"
 	output, err := runCommand("docker", "images", "-q", image)
 	if len(output) != 0 {
 		if _, err := runCommand("docker", "rmi", "-f", image); err != nil {
@@ -170,7 +170,7 @@ func checkDockerConfig() error {
 // checkDockerNetworkClient checks client networking by pinging an external IP
 // address from a container.
 func checkDockerNetworkClient() error {
-	const imageName = "gcr.io/google-containers/busybox"
+	const imageName = "k8s.gcr.io/busybox"
 	output, err := runCommand("docker", "run", "--rm", imageName, "sh", "-c", "ping -w 5 -q google.com")
 	if err != nil {
 		return err
@@ -185,7 +185,7 @@ func checkDockerNetworkClient() error {
 // within a container and accessing it from outside.
 func checkDockerNetworkServer() error {
 	const (
-		imageName     = "gcr.io/google-containers/nginx:1.7.9"
+		imageName     = "k8s.gcr.io/nginx:1.7.9"
 		hostAddr      = "127.0.0.1"
 		hostPort      = "8088"
 		containerPort = "80"
--- a/test/e2e_node/image_id_test.go
+++ b/test/e2e_node/image_id_test.go
@@ -28,7 +28,7 @@ import (

 var _ = framework.KubeDescribe("ImageID", func() {

-	busyBoxImage := "gcr.io/google_containers/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff"
+	busyBoxImage := "k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff"

 	f := framework.NewDefaultFramework("image-id-test")

--- a/test/e2e_node/image_list.go
+++ b/test/e2e_node/image_list.go
@@ -47,10 +47,10 @@ const (
 // before test running so that the image pulling won't fail in actual test.
 var NodeImageWhiteList = sets.NewString(
 	"google/cadvisor:latest",
-	"gcr.io/google-containers/stress:v1",
+	"k8s.gcr.io/stress:v1",
 	busyboxImage,
-	"gcr.io/google_containers/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff",
-	"gcr.io/google_containers/node-problem-detector:v0.4.1",
+	"k8s.gcr.io/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff",
+	"k8s.gcr.io/node-problem-detector:v0.4.1",
 	imageutils.GetE2EImage(imageutils.NginxSlim),
 	imageutils.GetE2EImage(imageutils.ServeHostname),
 	imageutils.GetE2EImage(imageutils.Netexec),
--- a/test/e2e_node/jenkins/gci-init-gpu.yaml
+++ b/test/e2e_node/jenkins/gci-init-gpu.yaml
@@ -2,7 +2,7 @@

 runcmd:
  - modprobe configs
-  - docker run -v /dev:/dev -v /home/kubernetes/bin/nvidia:/rootfs/nvidia -v /etc/os-release:/rootfs/etc/os-release -v /proc/sysrq-trigger:/sysrq -e BASE_DIR=/rootfs/nvidia --privileged gcr.io/google_containers/cos-nvidia-driver-install@sha256:cb55c7971c337fece62f2bfe858662522a01e43ac9984a2dd1dd5c71487d225c
+  - docker run -v /dev:/dev -v /home/kubernetes/bin/nvidia:/rootfs/nvidia -v /etc/os-release:/rootfs/etc/os-release -v /proc/sysrq-trigger:/sysrq -e BASE_DIR=/rootfs/nvidia --privileged k8s.gcr.io/cos-nvidia-driver-install@sha256:cb55c7971c337fece62f2bfe858662522a01e43ac9984a2dd1dd5c71487d225c
  - mount /tmp /tmp -o remount,exec,suid
  - usermod -a -G docker jenkins
  - mkdir -p /var/lib/kubelet
--- a/test/e2e_node/memory_eviction_test.go
+++ b/test/e2e_node/memory_eviction_test.go
@@ -272,7 +272,7 @@ func getMemhogPod(podName string, ctnName string, res v1.ResourceRequirements) *
 			Containers: []v1.Container{
 				{
 					Name:            ctnName,
-					Image:           "gcr.io/google-containers/stress:v1",
+					Image:           "k8s.gcr.io/stress:v1",
 					ImagePullPolicy: "Always",
 					Env:             env,
 					// 60 min timeout * 60s / tick per 10s = 360 ticks before timeout => ~11.11Mi/tick
--- a/test/e2e_node/node_problem_detector_linux.go
+++ b/test/e2e_node/node_problem_detector_linux.go
@@ -45,7 +45,7 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
 		pollInterval   = 1 * time.Second
 		pollConsistent = 5 * time.Second
 		pollTimeout    = 1 * time.Minute
-		image          = "gcr.io/google_containers/node-problem-detector:v0.4.1"
+		image          = "k8s.gcr.io/node-problem-detector:v0.4.1"
 	)
 	f := framework.NewDefaultFramework("node-problem-detector")
 	var c clientset.Interface
--- a/test/e2e_node/remote/node_conformance.go
+++ b/test/e2e_node/remote/node_conformance.go
@@ -53,7 +53,7 @@ func commandToString(c *exec.Cmd) string {

 // Image path constants.
 const (
-	conformanceRegistry         = "gcr.io/google_containers"
+	conformanceRegistry         = "k8s.gcr.io"
 	conformanceArch             = runtime.GOARCH
 	conformanceTarfile          = "node_conformance.tar"
 	conformanceTestBinary       = "e2e_node.test"
--- a/test/e2e_node/runtime_conformance_test.go
+++ b/test/e2e_node/runtime_conformance_test.go
@@ -275,13 +275,13 @@ while true; do sleep 1; done
 				},
 				{
 					description: "should not be able to pull non-existing image from gcr.io",
-					image:       "gcr.io/google_containers/invalid-image:invalid-tag",
+					image:       "k8s.gcr.io/invalid-image:invalid-tag",
 					phase:       v1.PodPending,
 					waiting:     true,
 				},
 				{
 					description: "should be able to pull image from gcr.io",
-					image:       "gcr.io/google_containers/alpine-with-bash:1.0",
+					image:       "k8s.gcr.io/alpine-with-bash:1.0",
 					phase:       v1.PodRunning,
 					waiting:     false,
 				},