Migrating test images to gcr.io/kubernetes-e2e-test-images

Currently all our e2e test images are distributed between 2 registry locations (i) google-containers (k8s.gcr.io) and (ii) gcr.io/kubernetes-e2e-test-images. This PR is part of the initiative to house all test images at gcr.io/kubernetes-e2e-test-images eventually.

Migrating test images to gcr.io/kubernetes-e2e-test-images
929a2f9b · Aish Sundar · Aishwarya Sundar · 7fed970f · 929a2f9b · 929a2f9b
Commit 929a2f9b authored Apr 03, 2018 by Aish Sundar Committed by Aishwarya Sundar Apr 04, 2018
5 changed files
--- a/cluster/gce/manifests/e2e-image-puller.manifest
+++ b/cluster/gce/manifests/e2e-image-puller.manifest
@@ -70,10 +70,10 @@ spec:
      k8s.gcr.io/update-demo:kitten
      k8s.gcr.io/update-demo:nautilus
      k8s.gcr.io/volume-ceph:0.1
-      k8s.gcr.io/volume-gluster:0.2
-      k8s.gcr.io/volume-iscsi:0.1
+      gcr.io/kubernetes-e2e-test-images/volume-gluster:0.2
+      gcr.io/kubernetes-e2e-test-images/volume-iscsi:0.1
      k8s.gcr.io/volume-nfs:0.8
-      k8s.gcr.io/volume-rbd:0.1
+      gcr.io/kubernetes-e2e-test-images/volume-rbd:0.1
      k8s.gcr.io/zookeeper-install-3.5.0-alpha:e2e
      gcr.io/google_samples/gb-redisslave:nonexistent
      ; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;

--- a/test/images/volumes-tester/gluster/Makefile
+++ b/test/images/volumes-tester/gluster/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.

 TAG = 0.5
-PREFIX = staging-k8s.gcr.io
+PREFIX = gcr.io/kubernetes-e2e-test-images

 all: push


--- a/test/images/volumes-tester/iscsi/Makefile
+++ b/test/images/volumes-tester/iscsi/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.

 TAG = 0.2
-PREFIX = staging-k8s.gcr.io
+PREFIX = gcr.io/kubernetes-e2e-test-images

 all: push


--- a/test/images/volumes-tester/rbd/Makefile
+++ b/test/images/volumes-tester/rbd/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.

 TAG = 0.2
-PREFIX = staging-k8s.gcr.io
+PREFIX = gcr.io/kubernetes-e2e-test-images

 all: push


--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -94,9 +94,9 @@ var (
 	ServeHostname       = ImageConfig{e2eRegistry, "serve-hostname", "1.0", true}
 	TestWebserver       = ImageConfig{e2eRegistry, "test-webserver", "1.0", true}
 	VolumeNFSServer     = ImageConfig{gcRegistry, "volume-nfs", "0.8", false}
-	VolumeISCSIServer   = ImageConfig{gcRegistry, "volume-iscsi", "0.2", false}
-	VolumeGlusterServer = ImageConfig{gcRegistry, "volume-gluster", "0.5", false}
-	VolumeRBDServer     = ImageConfig{gcRegistry, "volume-rbd", "0.2", false}
+	VolumeISCSIServer   = ImageConfig{e2eRegistry, "volume-iscsi", "0.2", false}
+	VolumeGlusterServer = ImageConfig{e2eRegistry, "volume-gluster", "0.5", false}
+	VolumeRBDServer     = ImageConfig{e2eRegistry, "volume-rbd", "0.2", false}
 )

 func GetE2EImage(image ImageConfig) string {