diff --git a/gce-pd/testpd.yaml b/gce-pd/testpd.yaml index 66a96d44..246e4eaf 100644 --- a/gce-pd/testpd.yaml +++ b/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/gce-pd/v1beta3/testpd.yaml b/gce-pd/v1beta3/testpd.yaml index 336dd763..1f95d4ff 100644 --- a/gce-pd/v1beta3/testpd.yaml +++ b/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/guestbook/frontend-controller.json b/guestbook/frontend-controller.json index 6764d743..5f16a1ad 100644 --- a/guestbook/frontend-controller.json +++ b/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/guestbook/redis-master-controller.json b/guestbook/redis-master-controller.json index ab75d25a..a33bf646 100644 --- a/guestbook/redis-master-controller.json +++ b/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/guestbook/redis-slave-controller.json b/guestbook/redis-slave-controller.json index 38e3bb60..6ec7734c 100644 --- a/guestbook/redis-slave-controller.json +++ b/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/limitrange/invalid-pod.json b/limitrange/invalid-pod.json index 03573de6..2a4cdafd 100644 --- a/limitrange/invalid-pod.json +++ b/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/limitrange/v1beta3/invalid-pod.json b/limitrange/v1beta3/invalid-pod.json index 1e6f0b85..05dc3ad0 100644 --- a/limitrange/v1beta3/invalid-pod.json +++ b/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/limitrange/v1beta3/valid-pod.json b/limitrange/v1beta3/valid-pod.json index d470f29f..c7271a63 100644 --- a/limitrange/v1beta3/valid-pod.json +++ b/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/limitrange/valid-pod.json b/limitrange/valid-pod.json index 8e3d50e6..2bb965d6 100644 --- a/limitrange/valid-pod.json +++ b/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/liveness/exec-liveness.yaml b/liveness/exec-liveness.yaml index 8f8bdda1..4e1ba960 100644 --- a/liveness/exec-liveness.yaml +++ b/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/liveness/http-liveness.yaml b/liveness/http-liveness.yaml index 7a9d6ad1..8f81dd5c 100644 --- a/liveness/http-liveness.yaml +++ b/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/liveness/image/Makefile b/liveness/image/Makefile index 2ea47d12..c123ac6d 100644 --- a/liveness/image/Makefile +++ b/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/liveness/v1beta3/exec-liveness.yaml b/liveness/v1beta3/exec-liveness.yaml index d032e2c4..068c7d8c 100644 --- a/liveness/v1beta3/exec-liveness.yaml +++ b/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/liveness/v1beta3/http-liveness.yaml b/liveness/v1beta3/http-liveness.yaml index 7cb8aec0..36328fd9 100644 --- a/liveness/v1beta3/http-liveness.yaml +++ b/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/update-demo/README.md b/update-demo/README.md index 7be454bd..00422204 100644 --- a/update-demo/README.md +++ b/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/update-demo/v1beta1/kitten-rc.yaml b/update-demo/v1beta1/kitten-rc.yaml index 67326f74..fe692652 100644 --- a/update-demo/v1beta1/kitten-rc.yaml +++ b/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/update-demo/v1beta1/nautilus-rc.yaml b/update-demo/v1beta1/nautilus-rc.yaml index 13857c89..5218f62b 100644 --- a/update-demo/v1beta1/nautilus-rc.yaml +++ b/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/update-demo/v1beta3/kitten-rc.yaml b/update-demo/v1beta3/kitten-rc.yaml index c78c4f8b..516d5b88 100644 --- a/update-demo/v1beta3/kitten-rc.yaml +++ b/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/update-demo/v1beta3/nautilus-rc.yaml b/update-demo/v1beta3/nautilus-rc.yaml index 25164520..5e3b4566 100644 --- a/update-demo/v1beta3/nautilus-rc.yaml +++ b/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