Merge pull request kubernetes#6268 from jlowdermilk/e2e-gcr

Pull e2e images from gcr.io
duda · Apr 1, 2015 · f7f1337 · f7f1337
2 parents fb1a821 + 2d8e93f
commit f7f1337
Show file tree

Hide file tree

Showing 42 changed files with 66 additions and 66 deletions.
diff --git a/cluster/addons/cluster-monitoring/heapster-controller.yaml b/cluster/addons/cluster-monitoring/heapster-controller.yaml
@@ -12,7 +12,7 @@ desiredState:
         id: monitoring-heapster
         containers:
           - name: heapster
-            image: gcr.io/google-containers/heapster:v0.9
+            image: gcr.io/google_containers/heapster:v0.9
             env: 
               - name: "INFLUXDB_HOST"
                 value: "monitoring-influxdb"

diff --git a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
@@ -15,14 +15,14 @@ desiredState:
         id: monitoring-influx-grafana
         containers: 
           - name: influxdb
-            image: gcr.io/google-containers/heapster_influxdb:v0.3
+            image: gcr.io/google_containers/heapster_influxdb:v0.3
             ports: 
               - containerPort: 8083
                 hostPort: 8083
               - containerPort: 8086
                 hostPort: 8086
           - name: grafana
-            image: gcr.io/google-containers/heapster_grafana:v0.5
+            image: gcr.io/google_containers/heapster_grafana:v0.5
             env: 
               - name: "HTTP_USER"
                 value: "admin"

diff --git a/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
@@ -16,7 +16,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google-containers/heapster:v0.9
+        - image: gcr.io/google_containers/heapster:v0.9
           name: heapster
           env: 
             - name: "INFLUXDB_HOST"

diff --git a/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
@@ -16,15 +16,15 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google-containers/heapster_influxdb:v0.3
+        - image: gcr.io/google_containers/heapster_influxdb:v0.3
           name: influxdb
           ports: 
             - containerPort: 8083
               hostPort: 8083
             - containerPort: 8086
               hostPort: 8086
         - name: grafana
-          image: gcr.io/google-containers/heapster_grafana:v0.5
+          image: gcr.io/google_containers/heapster_grafana:v0.5
           ports:
               - containerPort: 80
           env: 

diff --git a/cluster/addons/dns/kube2sky/Makefile b/cluster/addons/dns/kube2sky/Makefile
@@ -4,10 +4,10 @@ kube2sky: kube2sky.go
 	CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./kube2sky.go
 
 container: kube2sky
-	sudo docker build -t kubernetes/kube2sky .
+	sudo docker build -t gcr.io/google_containers/kube2sky .
 
 push:
-	sudo docker push kubernetes/kube2sky
+	gcloud preview docker push gcr.io/google_containers/kube2sky
 
 clean:
 	rm -f kube2sky
diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in
@@ -29,13 +29,13 @@ desiredState:
                     "-advertise-client-urls=http://127.0.0.1:4001",
             ]
           - name: kube2sky
-            image: gcr.io/google-containers/kube2sky:1.1
+            image: gcr.io/google_containers/kube2sky:1.1
             command: [
                     # entrypoint = "/kube2sky",
                     "-domain={{ pillar['dns_domain'] }}",
             ]
           - name: skydns
-            image: gcr.io/google-containers/skydns:2015-03-11-001
+            image: gcr.io/google_containers/skydns:2015-03-11-001
             command: [
                     # entrypoint = "/skydns",
                     "-machines=http://localhost:4001",

diff --git a/cluster/addons/dns/skydns/Makefile b/cluster/addons/dns/skydns/Makefile
@@ -4,10 +4,10 @@ skydns:
 	CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' github.com/skynetservices/skydns
 
 container: skydns
-	sudo docker build -t kubernetes/skydns .
+	sudo docker build -t gcr.io/google_containers/skydns .
 
 push:
-	sudo docker push kubernetes/skydns
+	sudo gcloud preview docker push gcr.io/google_containers/skydns
 
 clean:
 	rm -f skydns
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile b/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
@@ -2,8 +2,8 @@
 
 TAG = 1.1
 
-build:	
-	docker build -t kubernetes/kibana:$(TAG) .
+build:
+	docker build -t gcr.io/google_containers/kibana:$(TAG) .
 
-push:	
-	docker push kubernetes/kibana:$(TAG)
+push:
+	gcloud preview docker push gcr.io/google_containers/kibana:$(TAG)
diff --git 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
@@ -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/contrib/logging/fluentd-gcp-image/Makefile b/contrib/logging/fluentd-gcp-image/Makefile
@@ -8,9 +8,9 @@
 
 TAG = 1.2
 
-build:	
+build:
 	docker build -t gcr.io/google_containers/fluentd-gcp:$(TAG) .
 
-push:	
+push:
 	gcloud preview docker push gcr.io/google_containers/fluentd-gcp:$(TAG)
 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,8 +11,8 @@
       "id": "invalid-pod",
       "containers": [{
         "name": "kubernetes-serve-hostname",
-        "image": "kubernetes/serve_hostname"        
+        "image": "gcr.io/google_containers/serve_hostname"
       }]
     }
   }
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",