diff --git a/cluster/gce/manifests/e2e-image-puller.manifest b/cluster/gce/manifests/e2e-image-puller.manifest index 1391897989e..aba8eef6de7 100644 --- a/cluster/gce/manifests/e2e-image-puller.manifest +++ b/cluster/gce/manifests/e2e-image-puller.manifest @@ -69,11 +69,11 @@ spec: k8s.gcr.io/test-webserver:e2e 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 - k8s.gcr.io/volume-nfs:0.8 - k8s.gcr.io/volume-rbd:0.1 + gcr.io/kubernetes-e2e-test-images/volume-ceph:0.1 + gcr.io/kubernetes-e2e-test-images/volume-gluster:0.2 + gcr.io/kubernetes-e2e-test-images/volume-iscsi:0.1 + gcr.io/kubernetes-e2e-test-images/volume-nfs:0.8 + 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/ceph/Makefile b/test/images/volumes-tester/ceph/Makefile index 4f282da8e6a..8abd08d0100 100644 --- a/test/images/volumes-tester/ceph/Makefile +++ b/test/images/volumes-tester/ceph/Makefile @@ -13,7 +13,7 @@ # limitations under the License. TAG = 0.1 -PREFIX = staging-k8s.gcr.io +PREFIX = gcr.io/kubernetes-e2e-test-images all: push 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/nfs/Makefile b/test/images/volumes-tester/nfs/Makefile index 363c518acaf..5579421588b 100644 --- a/test/images/volumes-tester/nfs/Makefile +++ b/test/images/volumes-tester/nfs/Makefile @@ -13,7 +13,7 @@ # limitations under the License. TAG = 0.8 -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 b1d0408a281..2bb80b50da2 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -93,10 +93,10 @@ var ( SDDummyExporter = ImageConfig{gcRegistry, "sd-dummy-exporter", "v0.1.0", false} 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} + VolumeNFSServer = ImageConfig{e2eRegistry, "volume-nfs", "0.8", 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 {