From ca8317695f8fc2bcd2f05499ad0f0c179c1c8217 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Tue, 16 Jun 2015 11:45:34 -0700 Subject: [PATCH 1/2] Switch to gcr.io for the mount test container. --- contrib/for-tests/mount-tester/Makefile | 6 +++--- test/e2e/empty_dir.go | 2 +- test/e2e/host_path.go | 2 +- test/e2e/secrets.go | 2 +- test/e2e/service_accounts.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/for-tests/mount-tester/Makefile b/contrib/for-tests/mount-tester/Makefile index c11ef5fcd5d..97a163df615 100644 --- a/contrib/for-tests/mount-tester/Makefile +++ b/contrib/for-tests/mount-tester/Makefile @@ -1,15 +1,15 @@ all: push -TAG = 0.1 +TAG = 0.2 mt: mt.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./mt.go image: mt - sudo docker build -t kubernetes/mounttest:$(TAG) . + sudo docker build -t gcr.io/google_containers/mounttest:$(TAG) . push: image - sudo docker push kubernetes/mounttest:$(TAG) + gcloud preview docker push gcr.io/google_containers/mounttest:$(TAG) clean: rm -f mt diff --git a/test/e2e/empty_dir.go b/test/e2e/empty_dir.go index 91fdef60f53..526fa7aa2be 100644 --- a/test/e2e/empty_dir.go +++ b/test/e2e/empty_dir.go @@ -86,7 +86,7 @@ func testPodWithVolume(path string, source *api.EmptyDirVolumeSource) *api.Pod { Containers: []api.Container{ { Name: containerName, - Image: "kubernetes/mounttest:0.1", + Image: "gcr.io/google_containers/mounttest:0.2", VolumeMounts: []api.VolumeMount{ { Name: volumeName, diff --git a/test/e2e/host_path.go b/test/e2e/host_path.go index b1ec66164f6..e8d3f7b859e 100644 --- a/test/e2e/host_path.go +++ b/test/e2e/host_path.go @@ -126,7 +126,7 @@ func testPodWithHostVol(path string, source *api.HostPathVolumeSource) *api.Pod Containers: []api.Container{ { Name: containerName, - Image: "kubernetes/mounttest:0.1", + Image: "gcr.io/google_containers/mounttest:0.2", VolumeMounts: []api.VolumeMount{ { Name: volumeName, diff --git a/test/e2e/secrets.go b/test/e2e/secrets.go index 8fb62932125..a25d54d8c87 100644 --- a/test/e2e/secrets.go +++ b/test/e2e/secrets.go @@ -75,7 +75,7 @@ var _ = Describe("Secrets", func() { Containers: []api.Container{ { Name: "secret-test", - Image: "kubernetes/mounttest:0.1", + Image: "gcr.io/google_containers/mounttest:0.2", Args: []string{ "--file_content=/etc/secret-volume/data-1", "--file_mode=/etc/secret-volume/data-1"}, diff --git a/test/e2e/service_accounts.go b/test/e2e/service_accounts.go index 9e4d8732b49..89cdf90d21a 100644 --- a/test/e2e/service_accounts.go +++ b/test/e2e/service_accounts.go @@ -65,7 +65,7 @@ var _ = Describe("ServiceAccounts", func() { Containers: []api.Container{ { Name: "service-account-test", - Image: "kubernetes/mounttest:0.1", + Image: "gcr.io/google_containers/mounttest:0.2", Args: []string{ fmt.Sprintf("--file_content=%s/%s", serviceaccount.DefaultAPITokenMountPath, api.ServiceAccountTokenKey), }, From c3f4b3ff9798849a5504a7348242735e48ce0fa4 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Tue, 16 Jun 2015 11:49:36 -0700 Subject: [PATCH 2/2] Switch to the gcr nginx container in a few remaining places. --- test/e2e/etcd_failure.go | 2 +- test/e2e/pods.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/etcd_failure.go b/test/e2e/etcd_failure.go index 9d093146712..a68e1b64fdf 100644 --- a/test/e2e/etcd_failure.go +++ b/test/e2e/etcd_failure.go @@ -41,7 +41,7 @@ var _ = Describe("Etcd failure", func() { Client: framework.Client, Name: "baz", Namespace: framework.Namespace.Name, - Image: "nginx", + Image: "gcr.io/google_containers/nginx", Replicas: 1, })).NotTo(HaveOccurred()) }) diff --git a/test/e2e/pods.go b/test/e2e/pods.go index b862eed718b..6c164ca3205 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -570,7 +570,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "nginx", - Image: "nginx", + Image: "gcr.io/google_containers/nginx:1.7.9", }, }, }, @@ -642,7 +642,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "nginx", - Image: "nginx", + Image: "gcr.io/google_containers/nginx:1.7.9", Ports: []api.Port{{ContainerPort: 80}}, }, },