Merge pull request #9887 from brendandburns/gcr2

switch some more images to gcr for reliability

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

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,

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())
 	})

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,

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}},
 						},
 					},

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"},

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),
 						},