From 929a2f9b78683464abd65e7bede6f1037f82d33a Mon Sep 17 00:00:00 2001
From: Aish Sundar <20229685+AishSundar@users.noreply.github.com>
Date: Tue, 3 Apr 2018 15:32:12 -0700
Subject: [PATCH] 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.
---
 cluster/gce/manifests/e2e-image-puller.manifest | 6 +++---
 test/images/volumes-tester/gluster/Makefile     | 2 +-
 test/images/volumes-tester/iscsi/Makefile       | 2 +-
 test/images/volumes-tester/rbd/Makefile         | 2 +-
 test/utils/image/manifest.go                    | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cluster/gce/manifests/e2e-image-puller.manifest b/cluster/gce/manifests/e2e-image-puller.manifest
index 03515582587..646ec5d0ed8 100644
--- 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;
diff --git a/test/images/volumes-tester/gluster/Makefile b/test/images/volumes-tester/gluster/Makefile
index b9b793faca9..6ddfe196423 100644
--- 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
 
diff --git a/test/images/volumes-tester/iscsi/Makefile b/test/images/volumes-tester/iscsi/Makefile
index d5b295fd7fe..f6e6903e1b1 100644
--- 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
 
diff --git a/test/images/volumes-tester/rbd/Makefile b/test/images/volumes-tester/rbd/Makefile
index 910ba816057..df64f669491 100644
--- 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
 
diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
index 56f4854c653..35e613dfa94 100644
--- 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 {