From 2d8e93f8b4639f3cada944423530b5142e7b03fc Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Tue, 31 Mar 2015 10:25:20 -0700 Subject: [PATCH] e2e images pulled from gcr.io --- contrib/for-demos/serve_hostname/Makefile | 6 +++--- contrib/for-demos/test-webserver/Makefile | 4 ++-- examples/gce-pd/testpd.yaml | 2 +- examples/gce-pd/v1beta3/testpd.yaml | 2 +- examples/guestbook/frontend-controller.json | 2 +- examples/guestbook/redis-master-controller.json | 2 +- examples/guestbook/redis-slave-controller.json | 2 +- examples/limitrange/invalid-pod.json | 4 ++-- examples/limitrange/v1beta3/invalid-pod.json | 2 +- examples/limitrange/v1beta3/valid-pod.json | 2 +- examples/limitrange/valid-pod.json | 2 +- examples/liveness/exec-liveness.yaml | 2 +- examples/liveness/http-liveness.yaml | 2 +- examples/liveness/image/Makefile | 4 ++-- examples/liveness/v1beta3/exec-liveness.yaml | 2 +- examples/liveness/v1beta3/http-liveness.yaml | 2 +- examples/update-demo/README.md | 2 +- examples/update-demo/v1beta1/kitten-rc.yaml | 2 +- examples/update-demo/v1beta1/nautilus-rc.yaml | 2 +- examples/update-demo/v1beta3/kitten-rc.yaml | 2 +- examples/update-demo/v1beta3/nautilus-rc.yaml | 2 +- test/e2e/density.go | 4 ++-- test/e2e/docker_containers.go | 2 +- test/e2e/es_cluster_logging.go | 2 +- test/e2e/events.go | 2 +- test/e2e/kubectl.go | 4 ++-- test/e2e/networking.go | 2 +- test/e2e/pd.go | 2 +- test/e2e/pods.go | 12 ++++++------ test/e2e/rc.go | 2 +- test/e2e/secrets.go | 2 +- test/e2e/service.go | 8 ++++---- test/soak/serve_hostnames/serve_hostnames.go | 2 +- 33 files changed, 48 insertions(+), 48 deletions(-) diff --git a/contrib/for-demos/serve_hostname/Makefile b/contrib/for-demos/serve_hostname/Makefile index ef52642dbc6..abf1c8df317 100644 --- a/contrib/for-demos/serve_hostname/Makefile +++ b/contrib/for-demos/serve_hostname/Makefile @@ -6,11 +6,11 @@ serve_hostname: serve_hostname.go CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./serve_hostname.go container: serve_hostname - sudo docker build -t gcr.io/google-containers/serve_hostname:$(TAG) . - sudo docker tag gcr.io/google-containers/serve_hostname:$(TAG) gcr.io/_b_k8s_authenticated_test/serve_hostname:$(TAG) + sudo docker build -t gcr.io/google_containers/serve_hostname:$(TAG) . + sudo docker tag gcr.io/google_containers/serve_hostname:$(TAG) gcr.io/_b_k8s_authenticated_test/serve_hostname:$(TAG) push: - gcloud preview docker push gcr.io/google-containers/serve_hostname:$(TAG) + gcloud preview docker push gcr.io/google_containers/serve_hostname:$(TAG) gcloud preview docker push gcr.io/_b_k8s_authenticated_test/serve_hostname:$(TAG) clean: diff --git a/contrib/for-demos/test-webserver/Makefile b/contrib/for-demos/test-webserver/Makefile index 87ff0c3810d..8edf29c0f7f 100644 --- a/contrib/for-demos/test-webserver/Makefile +++ b/contrib/for-demos/test-webserver/Makefile @@ -4,10 +4,10 @@ test-webserver: test-webserver.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./test-webserver.go container: test-webserver - sudo docker build -t kubernetes/test-webserver . + sudo docker build -t gcr.io/google_containers/test-webserver . push: container - sudo docker push kubernetes/test-webserver + gcloud preview docker push gcr.io/google_containers/test-webserver clean: rm -f test-webserver diff --git a/examples/gce-pd/testpd.yaml b/examples/gce-pd/testpd.yaml index 66a96d44ef3..246e4eafe5f 100644 --- a/examples/gce-pd/testpd.yaml +++ b/examples/gce-pd/testpd.yaml @@ -2,7 +2,7 @@ apiVersion: v1beta1 desiredState: manifest: containers: - - image: kubernetes/pause + - image: gcr.io/google_containers/pause name: testpd volumeMounts: - mountPath: "/testpd" diff --git a/examples/gce-pd/v1beta3/testpd.yaml b/examples/gce-pd/v1beta3/testpd.yaml index 336dd763bf4..1f95d4ff36f 100644 --- a/examples/gce-pd/v1beta3/testpd.yaml +++ b/examples/gce-pd/v1beta3/testpd.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: testpd - image: kubernetes/pause + image: gcr.io/google_containers/pause volumeMounts: # name must match the volume name below - name: testpd diff --git a/examples/guestbook/frontend-controller.json b/examples/guestbook/frontend-controller.json index 6764d7434b4..5f16a1ad8d1 100644 --- a/examples/guestbook/frontend-controller.json +++ b/examples/guestbook/frontend-controller.json @@ -12,7 +12,7 @@ "id": "frontend", "containers": [{ "name": "php-redis", - "image": "kubernetes/example-guestbook-php-redis:v2", + "image": "gcr.io/google_containers/example-guestbook-php-redis:v2", "ports": [{"name": "http-server", "containerPort": 80}] }] } diff --git a/examples/guestbook/redis-master-controller.json b/examples/guestbook/redis-master-controller.json index ab75d25a71c..a33bf646c4f 100644 --- a/examples/guestbook/redis-master-controller.json +++ b/examples/guestbook/redis-master-controller.json @@ -12,7 +12,7 @@ "id": "redis-master", "containers": [{ "name": "redis-master", - "image": "dockerfile/redis", + "image": "gcr.io/google_containers/redis", "ports": [{"containerPort": 6379}] }] } diff --git a/examples/guestbook/redis-slave-controller.json b/examples/guestbook/redis-slave-controller.json index 38e3bb60df3..6ec7734cbae 100644 --- a/examples/guestbook/redis-slave-controller.json +++ b/examples/guestbook/redis-slave-controller.json @@ -12,7 +12,7 @@ "id": "redis-slave", "containers": [{ "name": "redis-slave", - "image": "kubernetes/redis-slave:v2", + "image": "gcr.io/google_containers/redis-slave:v2", "ports": [{"containerPort": 6379}] }] } diff --git a/examples/limitrange/invalid-pod.json b/examples/limitrange/invalid-pod.json index 03573de69db..2a4cdafd0bf 100644 --- a/examples/limitrange/invalid-pod.json +++ b/examples/limitrange/invalid-pod.json @@ -11,8 +11,8 @@ "id": "invalid-pod", "containers": [{ "name": "kubernetes-serve-hostname", - "image": "kubernetes/serve_hostname" + "image": "gcr.io/google_containers/serve_hostname" }] } } -} \ No newline at end of file +} diff --git a/examples/limitrange/v1beta3/invalid-pod.json b/examples/limitrange/v1beta3/invalid-pod.json index 1e6f0b85d2b..05dc3ad0300 100644 --- a/examples/limitrange/v1beta3/invalid-pod.json +++ b/examples/limitrange/v1beta3/invalid-pod.json @@ -10,7 +10,7 @@ "spec": { "containers": [{ "name": "kubernetes-serve-hostname", - "image": "kubernetes/serve_hostname" + "image": "gcr.io/google_containers/serve_hostname" }] } } diff --git a/examples/limitrange/v1beta3/valid-pod.json b/examples/limitrange/v1beta3/valid-pod.json index d470f29f478..c7271a63817 100644 --- a/examples/limitrange/v1beta3/valid-pod.json +++ b/examples/limitrange/v1beta3/valid-pod.json @@ -10,7 +10,7 @@ "spec": { "containers": [{ "name": "kubernetes-serve-hostname", - "image": "kubernetes/serve_hostname", + "image": "gcr.io/google_containers/serve_hostname", "resources": { "limits": { "cpu": "1", diff --git a/examples/limitrange/valid-pod.json b/examples/limitrange/valid-pod.json index 8e3d50e6a47..2bb965d6818 100644 --- a/examples/limitrange/valid-pod.json +++ b/examples/limitrange/valid-pod.json @@ -11,7 +11,7 @@ "id": "valid-pod", "containers": [{ "name": "kubernetes-serve-hostname", - "image": "kubernetes/serve_hostname", + "image": "gcr.io/google_containers/serve_hostname", "cpu": 1000, "memory": 1048576 }] diff --git a/examples/liveness/exec-liveness.yaml b/examples/liveness/exec-liveness.yaml index 8f8bdda13d2..4e1ba960c64 100644 --- a/examples/liveness/exec-liveness.yaml +++ b/examples/liveness/exec-liveness.yaml @@ -2,7 +2,7 @@ apiVersion: v1beta1 desiredState: manifest: containers: - - image: busybox + - image: gcr.io/google_containers/busybox name: liveness livenessProbe: exec: diff --git a/examples/liveness/http-liveness.yaml b/examples/liveness/http-liveness.yaml index 7a9d6ad160f..8f81dd5c7e7 100644 --- a/examples/liveness/http-liveness.yaml +++ b/examples/liveness/http-liveness.yaml @@ -2,7 +2,7 @@ apiVersion: v1beta1 desiredState: manifest: containers: - - image: kubernetes/liveness + - image: gcr.io/google_containers/liveness name: liveness livenessProbe: httpGet: diff --git a/examples/liveness/image/Makefile b/examples/liveness/image/Makefile index 2ea47d12634..c123ac6df9d 100644 --- a/examples/liveness/image/Makefile +++ b/examples/liveness/image/Makefile @@ -4,10 +4,10 @@ server: server.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./server.go container: server - docker build -t kubernetes/liveness . + docker build -t gcr.io/google_containers/liveness . push: container - docker push kubernetes/liveness + gcloud preview docker push gcr.io/google_containers/liveness clean: rm -f server diff --git a/examples/liveness/v1beta3/exec-liveness.yaml b/examples/liveness/v1beta3/exec-liveness.yaml index d032e2c409e..068c7d8c351 100644 --- a/examples/liveness/v1beta3/exec-liveness.yaml +++ b/examples/liveness/v1beta3/exec-liveness.yaml @@ -18,7 +18,7 @@ spec: - "/bin/sh" - "-c" - "echo ok > /tmp/health; sleep 10; echo fail > /tmp/health; sleep 600" - image: busybox + image: gcr.io/google_containers/busybox livenessProbe: exec: command: diff --git a/examples/liveness/v1beta3/http-liveness.yaml b/examples/liveness/v1beta3/http-liveness.yaml index 7cb8aec0739..36328fd908b 100644 --- a/examples/liveness/v1beta3/http-liveness.yaml +++ b/examples/liveness/v1beta3/http-liveness.yaml @@ -16,7 +16,7 @@ spec: containers: - command: - "/server" - image: kubernetes/liveness + image: gcr.io/google_containers/liveness livenessProbe: httpGet: path: "/healthz" diff --git a/examples/update-demo/README.md b/examples/update-demo/README.md index 7be454bdcf5..00422204b76 100644 --- a/examples/update-demo/README.md +++ b/examples/update-demo/README.md @@ -65,7 +65,7 @@ $ ./cluster/kubectl.sh rollingupdate update-demo-nautilus --update-period=10s -f ``` The rollingupdate command in kubectl will do 2 things: -1. Create a new replication controller with a pod template that uses the new image (`kubernetes/update-demo:kitten`) +1. Create a new replication controller with a pod template that uses the new image (`gcr.io/google_containers/update-demo:kitten`) 2. Resize the old and new replication controllers until the new controller replaces the old. This will kill the current pods one at a time, spinnning up new ones to replace them. Watch the [demo website](http://localhost:8001/static/index.html), it will update one pod every 10 seconds until all of the pods have the new image. diff --git a/examples/update-demo/v1beta1/kitten-rc.yaml b/examples/update-demo/v1beta1/kitten-rc.yaml index 67326f74b8a..fe6926524e4 100644 --- a/examples/update-demo/v1beta1/kitten-rc.yaml +++ b/examples/update-demo/v1beta1/kitten-rc.yaml @@ -10,7 +10,7 @@ desiredState: manifest: containers: - name: update-demo - image: kubernetes/update-demo:kitten + image: gcr.io/google_containers/update-demo:kitten ports: - containerPort: 80 protocol: TCP diff --git a/examples/update-demo/v1beta1/nautilus-rc.yaml b/examples/update-demo/v1beta1/nautilus-rc.yaml index 13857c89eea..5218f62bf91 100644 --- a/examples/update-demo/v1beta1/nautilus-rc.yaml +++ b/examples/update-demo/v1beta1/nautilus-rc.yaml @@ -11,7 +11,7 @@ desiredState: manifest: containers: - name: update-demo - image: kubernetes/update-demo:nautilus + image: gcr.io/google_containers/update-demo:nautilus ports: - containerPort: 80 protocol: TCP diff --git a/examples/update-demo/v1beta3/kitten-rc.yaml b/examples/update-demo/v1beta3/kitten-rc.yaml index c78c4f8b807..516d5b88d78 100644 --- a/examples/update-demo/v1beta3/kitten-rc.yaml +++ b/examples/update-demo/v1beta3/kitten-rc.yaml @@ -13,7 +13,7 @@ spec: version: kitten spec: containers: - - image: kubernetes/update-demo:kitten + - image: gcr.io/google_containers/update-demo:kitten name: update-demo ports: - containerPort: 80 diff --git a/examples/update-demo/v1beta3/nautilus-rc.yaml b/examples/update-demo/v1beta3/nautilus-rc.yaml index 25164520391..5e3b4566fce 100644 --- a/examples/update-demo/v1beta3/nautilus-rc.yaml +++ b/examples/update-demo/v1beta3/nautilus-rc.yaml @@ -14,7 +14,7 @@ spec: version: nautilus spec: containers: - - image: kubernetes/update-demo:nautilus + - image: gcr.io/google_containers/update-demo:nautilus name: update-demo ports: - containerPort: 80 diff --git a/test/e2e/density.go b/test/e2e/density.go index eb9c7ed3292..c159b68cc12 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -218,7 +218,7 @@ var _ = Describe("Density", func() { } It(name, func() { RCName = "my-hostname-density" + strconv.Itoa(count) + "-" + string(util.NewUUID()) - RunRC(c, RCName, ns, "kubernetes/pause:go", count*minionCount) + RunRC(c, RCName, ns, "gcr.io/google_containers/pause:go", count*minionCount) }) } @@ -231,7 +231,7 @@ var _ = Describe("Density", func() { defer wg.Done() for i := 0; i < 10; i++ { name := "my-hostname-thrash-" + string(util.NewUUID()) - RunRC(c, name, ns, "kubernetes/pause:go", 10*minionCount) + RunRC(c, name, ns, "gcr.io/google_containers/pause:go", 10*minionCount) } }() } diff --git a/test/e2e/docker_containers.go b/test/e2e/docker_containers.go index 425de9fa1bb..bf70f1867e2 100644 --- a/test/e2e/docker_containers.go +++ b/test/e2e/docker_containers.go @@ -85,7 +85,7 @@ func entrypointTestPod() *api.Pod { Containers: []api.Container{ { Name: testContainerName, - Image: "kubernetes/eptest:0.1", + Image: "gcr.io/google_containers/eptest:0.1", }, }, RestartPolicy: api.RestartPolicyNever, diff --git a/test/e2e/es_cluster_logging.go b/test/e2e/es_cluster_logging.go index 46ca4902dc9..1194c90cd4e 100644 --- a/test/e2e/es_cluster_logging.go +++ b/test/e2e/es_cluster_logging.go @@ -198,7 +198,7 @@ func ClusterLevelLoggingWithElasticsearch(c *client.Client) { Containers: []api.Container{ { Name: "synth-logger", - Image: "ubuntu:14.04", + Image: "gcr.io/google_containers/ubuntu:14.04", Command: []string{"bash", "-c", fmt.Sprintf("i=0; while ((i < %d)); do echo \"%d %s $i %s\"; i=$(($i+1)); done", countTo, i, taintName, podName)}, }, }, diff --git a/test/e2e/events.go b/test/e2e/events.go index feeb44333f4..e33222aee31 100644 --- a/test/e2e/events.go +++ b/test/e2e/events.go @@ -64,7 +64,7 @@ var _ = Describe("Events", func() { Containers: []api.Container{ { Name: "p", - Image: "kubernetes/serve_hostname", + Image: "gcr.io/google_containers/serve_hostname", Ports: []api.ContainerPort{{ContainerPort: 80}}, }, }, diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index af9de8fa923..06807df8599 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -30,8 +30,8 @@ import ( ) const ( - nautilusImage = "kubernetes/update-demo:nautilus" - kittenImage = "kubernetes/update-demo:kitten" + nautilusImage = "gcr.io/google_containers/update-demo:nautilus" + kittenImage = "gcr.io/google_containers/update-demo:kitten" updateDemoSelector = "name=update-demo" updateDemoContainer = "update-demo" frontendSelector = "name=frontend" diff --git a/test/e2e/networking.go b/test/e2e/networking.go index e866302c960..c019a86c7d0 100644 --- a/test/e2e/networking.go +++ b/test/e2e/networking.go @@ -116,7 +116,7 @@ var _ = Describe("Networking", func() { Containers: []api.Container{ { Name: "webserver", - Image: "kubernetes/nettest:1.1", + Image: "gcr.io/google_containers/nettest:1.1", Args: []string{ "-service=" + name, fmt.Sprintf("-peers=%d", peers), diff --git a/test/e2e/pd.go b/test/e2e/pd.go index a643d8c6d20..74916d9e677 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -212,7 +212,7 @@ func testPDPod(diskName, targetHost string, readOnly bool) *api.Pod { Containers: []api.Container{ { Name: "testpd", - Image: "kubernetes/pause", + Image: "gcr.io/google_containers/pause", VolumeMounts: []api.VolumeMount{ { Name: "testpd", diff --git a/test/e2e/pods.go b/test/e2e/pods.go index 639de27a73b..ab0f0c1f015 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -107,7 +107,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "nginx", - Image: "dockerfile/nginx", + Image: "gcr.io/google_containers/nginx", Ports: []api.ContainerPort{{ContainerPort: 80}}, LivenessProbe: &api.Probe{ Handler: api.Handler{ @@ -207,7 +207,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "nginx", - Image: "dockerfile/nginx", + Image: "gcr.io/google_containers/nginx", Ports: []api.ContainerPort{{ContainerPort: 80}}, LivenessProbe: &api.Probe{ Handler: api.Handler{ @@ -277,7 +277,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "srv", - Image: "kubernetes/serve_hostname", + Image: "gcr.io/google_containers/serve_hostname", Ports: []api.ContainerPort{{ContainerPort: 9376}}, }, }, @@ -332,7 +332,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "env3cont", - Image: "busybox", + Image: "gcr.io/google_containers/busybox", Command: []string{"sh", "-c", "env"}, }, }, @@ -361,7 +361,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "liveness", - Image: "busybox", + Image: "gcr.io/google_containers/busybox", Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 10; echo fail >/tmp/health; sleep 600"}, LivenessProbe: &api.Probe{ Handler: api.Handler{ @@ -387,7 +387,7 @@ var _ = Describe("Pods", func() { Containers: []api.Container{ { Name: "liveness", - Image: "kubernetes/liveness", + Image: "gcr.io/google_containers/liveness", Command: []string{"/server"}, LivenessProbe: &api.Probe{ Handler: api.Handler{ diff --git a/test/e2e/rc.go b/test/e2e/rc.go index 8368657b44d..5cf3e513b59 100644 --- a/test/e2e/rc.go +++ b/test/e2e/rc.go @@ -40,7 +40,7 @@ var _ = Describe("ReplicationController", func() { }) It("should serve a basic image on each replica with a public image", func() { - ServeImageOrFail(c, "basic", "kubernetes/serve_hostname:1.1") + ServeImageOrFail(c, "basic", "gcr.io/google_containers/serve_hostname:1.1") }) It("should serve a basic image on each replica with a private image", func() { diff --git a/test/e2e/secrets.go b/test/e2e/secrets.go index 8443879486c..ff0fea1b2a3 100644 --- a/test/e2e/secrets.go +++ b/test/e2e/secrets.go @@ -84,7 +84,7 @@ var _ = Describe("Secrets", func() { Containers: []api.Container{ { Name: "catcont", - Image: "busybox", + Image: "gcr.io/google_containers/busybox", Command: []string{"sh", "-c", "cat /etc/secret-volume/data-1"}, VolumeMounts: []api.VolumeMount{ { diff --git a/test/e2e/service.go b/test/e2e/service.go index 661e0dd820b..44ae9cf1a52 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -91,7 +91,7 @@ var _ = Describe("Services", func() { Containers: []api.Container{ { Name: "webserver", - Image: "kubernetes/test-webserver", + Image: "gcr.io/google_containers/test-webserver", VolumeMounts: []api.VolumeMount{ { Name: "results", @@ -101,7 +101,7 @@ var _ = Describe("Services", func() { }, { Name: "pinger", - Image: "busybox", + Image: "gcr.io/google_containers/busybox", Command: []string{"sh", "-c", probeCmd}, VolumeMounts: []api.VolumeMount{ { @@ -306,7 +306,7 @@ var _ = Describe("Services", func() { Containers: []api.Container{ { Name: "webserver", - Image: "kubernetes/test-webserver", + Image: "gcr.io/google_containers/test-webserver", }, }, }, @@ -454,7 +454,7 @@ func addEndpointPodOrFail(c *client.Client, ns, name string, labels map[string]s Containers: []api.Container{ { Name: "test", - Image: "kubernetes/pause", + Image: "gcr.io/google_containers/pause", Ports: []api.ContainerPort{{ContainerPort: 80}}, }, }, diff --git a/test/soak/serve_hostnames/serve_hostnames.go b/test/soak/serve_hostnames/serve_hostnames.go index f926fef6685..3e08dd044b7 100644 --- a/test/soak/serve_hostnames/serve_hostnames.go +++ b/test/soak/serve_hostnames/serve_hostnames.go @@ -161,7 +161,7 @@ func main() { Containers: []api.Container{ { Name: "serve-hostname", - Image: "gcr.io/google-containers/serve_hostname:1.1", + Image: "gcr.io/google_containers/serve_hostname:1.1", Ports: []api.ContainerPort{{ContainerPort: 9376}}, }, },