diff --git a/cassandra/image/Dockerfile b/cassandra/image/Dockerfile index 45b75951..5c4658d7 100644 --- a/cassandra/image/Dockerfile +++ b/cassandra/image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/google_containers/ubuntu-slim:0.9 +FROM k8s.gcr.io/ubuntu-slim:0.9 ARG BUILD_DATE ARG VCS_REF diff --git a/guestbook-go/Makefile b/guestbook-go/Makefile index 9c63819e..605916fd 100644 --- a/guestbook-go/Makefile +++ b/guestbook-go/Makefile @@ -15,9 +15,9 @@ # Build the guestbook-go example # Usage: -# [VERSION=v3] [REGISTRY="gcr.io/google_containers"] make build +# [VERSION=v3] [REGISTRY="k8s.gcr.io"] make build VERSION?=v3 -REGISTRY?=gcr.io/google_containers +REGISTRY?=k8s.gcr.io release: clean build push clean diff --git a/guestbook-go/README.md b/guestbook-go/README.md index 5d5f972d..19015025 100644 --- a/guestbook-go/README.md +++ b/guestbook-go/README.md @@ -178,7 +178,7 @@ This is a simple Go `net/http` ([negroni](https://github.com/codegangsta/negroni ```console $ kubectl get rc CONTROLLER CONTAINER(S) IMAGE(S) SELECTOR REPLICAS - guestbook guestbook gcr.io/google_containers/guestbook:v3 app=guestbook 3 + guestbook guestbook k8s.gcr.io/guestbook:v3 app=guestbook 3 redis-master redis-master redis app=redis,role=master 1 redis-slave redis-slave kubernetes/redis-slave:v2 app=redis,role=slave 2 ... diff --git a/guestbook-go/guestbook-controller.json b/guestbook-go/guestbook-controller.json index 82c0e913..0e3553c8 100644 --- a/guestbook-go/guestbook-controller.json +++ b/guestbook-go/guestbook-controller.json @@ -22,7 +22,7 @@ "containers":[ { "name":"guestbook", - "image":"gcr.io/google_containers/guestbook:v3", + "image":"k8s.gcr.io/guestbook:v3", "ports":[ { "name":"http-server", diff --git a/guestbook/all-in-one/guestbook-all-in-one.yaml b/guestbook/all-in-one/guestbook-all-in-one.yaml index 7735c798..a3415d6a 100644 --- a/guestbook/all-in-one/guestbook-all-in-one.yaml +++ b/guestbook/all-in-one/guestbook-all-in-one.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: master - image: gcr.io/google_containers/redis:e2e # or just image: redis + image: k8s.gcr.io/redis:e2e # or just image: redis resources: requests: cpu: 100m diff --git a/guestbook/legacy/redis-master-controller.yaml b/guestbook/legacy/redis-master-controller.yaml index 0bdf9761..28208103 100644 --- a/guestbook/legacy/redis-master-controller.yaml +++ b/guestbook/legacy/redis-master-controller.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: master - image: gcr.io/google_containers/redis:e2e # or just image: redis + image: k8s.gcr.io/redis:e2e # or just image: redis resources: requests: cpu: 100m diff --git a/guestbook/redis-master-deployment.yaml b/guestbook/redis-master-deployment.yaml index 21a3d586..9238a800 100644 --- a/guestbook/redis-master-deployment.yaml +++ b/guestbook/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: gcr.io/google_containers/redis:e2e # or just image: redis + image: k8s.gcr.io/redis:e2e # or just image: redis resources: requests: cpu: 100m diff --git a/staging/cluster-dns/dns-backend-rc.yaml b/staging/cluster-dns/dns-backend-rc.yaml index 9649d367..4af1b0dc 100644 --- a/staging/cluster-dns/dns-backend-rc.yaml +++ b/staging/cluster-dns/dns-backend-rc.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: dns-backend - image: gcr.io/google_containers/example-dns-backend:v1 + image: k8s.gcr.io/example-dns-backend:v1 ports: - name: backend-port containerPort: 8000 diff --git a/staging/cluster-dns/dns-frontend-pod.yaml b/staging/cluster-dns/dns-frontend-pod.yaml index b4244783..4a7695f1 100644 --- a/staging/cluster-dns/dns-frontend-pod.yaml +++ b/staging/cluster-dns/dns-frontend-pod.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: dns-frontend - image: gcr.io/google_containers/example-dns-frontend:v1 + image: k8s.gcr.io/example-dns-frontend:v1 command: - python - client.py diff --git a/staging/cluster-dns/images/backend/Makefile b/staging/cluster-dns/images/backend/Makefile index 67992ec2..6a9fe53d 100644 --- a/staging/cluster-dns/images/backend/Makefile +++ b/staging/cluster-dns/images/backend/Makefile @@ -13,7 +13,7 @@ # limitations under the License. TAG = v1 -PREFIX = gcr.io/google_containers +PREFIX = k8s.gcr.io IMAGE = example-dns-backend all: push diff --git a/staging/cluster-dns/images/frontend/Makefile b/staging/cluster-dns/images/frontend/Makefile index 2f633754..9b375525 100644 --- a/staging/cluster-dns/images/frontend/Makefile +++ b/staging/cluster-dns/images/frontend/Makefile @@ -13,7 +13,7 @@ # limitations under the License. TAG = v1 -PREFIX = gcr.io/google_containers +PREFIX = k8s.gcr.io IMAGE = example-dns-frontend all: push diff --git a/staging/explorer/Makefile b/staging/explorer/Makefile index 35dd5bd7..59bef7c2 100644 --- a/staging/explorer/Makefile +++ b/staging/explorer/Makefile @@ -21,10 +21,10 @@ explorer: explorer.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./explorer.go container: explorer - docker build --pull -t gcr.io/google_containers/explorer:$(TAG) . + docker build --pull -t k8s.gcr.io/explorer:$(TAG) . push: container - gcloud docker -- push gcr.io/google_containers/explorer:$(TAG) + gcloud docker -- push k8s.gcr.io/explorer:$(TAG) clean: rm -f explorer diff --git a/staging/explorer/README.md b/staging/explorer/README.md index 8fb1fac9..2aca9b22 100644 --- a/staging/explorer/README.md +++ b/staging/explorer/README.md @@ -2,7 +2,7 @@ Explorer is a little container for examining the runtime environment Kubernetes produces for your pods. -The intended use is to substitute gcr.io/google_containers/explorer for your intended container, and then visit it via the proxy. +The intended use is to substitute k8s.gcr.io/explorer for your intended container, and then visit it via the proxy. Currently, you can look at: * The environment variables to make sure Kubernetes is doing what you expect. diff --git a/staging/explorer/pod.yaml b/staging/explorer/pod.yaml index 2c26c3e1..0437a249 100644 --- a/staging/explorer/pod.yaml +++ b/staging/explorer/pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: explorer - image: gcr.io/google_containers/explorer:1.0 + image: k8s.gcr.io/explorer:1.0 args: ["-port=8080"] ports: - containerPort: 8080 diff --git a/staging/spark/spark-gluster/spark-master-controller.yaml b/staging/spark/spark-gluster/spark-master-controller.yaml index d0b365b7..28cb6ac3 100644 --- a/staging/spark/spark-gluster/spark-master-controller.yaml +++ b/staging/spark/spark-gluster/spark-master-controller.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: spark-master - image: gcr.io/google_containers/spark:1.5.2_v1 + image: k8s.gcr.io/spark:1.5.2_v1 command: ["/start-master"] ports: - containerPort: 7077 diff --git a/staging/spark/spark-gluster/spark-worker-controller.yaml b/staging/spark/spark-gluster/spark-worker-controller.yaml index 69cc3cec..0030d8a6 100644 --- a/staging/spark/spark-gluster/spark-worker-controller.yaml +++ b/staging/spark/spark-gluster/spark-worker-controller.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: spark-worker - image: gcr.io/google_containers/spark:1.5.2_v1 + image: k8s.gcr.io/spark:1.5.2_v1 command: ["/start-worker"] ports: - containerPort: 8888 diff --git a/staging/spark/spark-master-controller.yaml b/staging/spark/spark-master-controller.yaml index 60fb7ba8..ceaef078 100644 --- a/staging/spark/spark-master-controller.yaml +++ b/staging/spark/spark-master-controller.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: spark-master - image: gcr.io/google_containers/spark:1.5.2_v1 + image: k8s.gcr.io/spark:1.5.2_v1 command: ["/start-master"] ports: - containerPort: 7077 diff --git a/staging/spark/spark-worker-controller.yaml b/staging/spark/spark-worker-controller.yaml index 9c748b3e..3e5ed50c 100644 --- a/staging/spark/spark-worker-controller.yaml +++ b/staging/spark/spark-worker-controller.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: spark-worker - image: gcr.io/google_containers/spark:1.5.2_v1 + image: k8s.gcr.io/spark:1.5.2_v1 command: ["/start-worker"] ports: - containerPort: 8081 diff --git a/staging/spark/zeppelin-controller.yaml b/staging/spark/zeppelin-controller.yaml index 56bb90d4..2f578fcf 100644 --- a/staging/spark/zeppelin-controller.yaml +++ b/staging/spark/zeppelin-controller.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: zeppelin - image: gcr.io/google_containers/zeppelin:v0.5.6_v1 + image: k8s.gcr.io/zeppelin:v0.5.6_v1 ports: - containerPort: 8080 resources: diff --git a/staging/storage/redis/redis-controller.yaml b/staging/storage/redis/redis-controller.yaml index e3d2f920..24614534 100644 --- a/staging/storage/redis/redis-controller.yaml +++ b/staging/storage/redis/redis-controller.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: redis - image: gcr.io/google_containers/redis:v1 + image: k8s.gcr.io/redis:v1 ports: - containerPort: 6379 resources: diff --git a/staging/storage/redis/redis-master.yaml b/staging/storage/redis/redis-master.yaml index 57305a7a..589de648 100644 --- a/staging/storage/redis/redis-master.yaml +++ b/staging/storage/redis/redis-master.yaml @@ -9,7 +9,7 @@ metadata: spec: containers: - name: master - image: gcr.io/google_containers/redis:v1 + image: k8s.gcr.io/redis:v1 env: - name: MASTER value: "true" diff --git a/staging/storage/redis/redis-sentinel-controller.yaml b/staging/storage/redis/redis-sentinel-controller.yaml index da09e10c..6c4b1434 100644 --- a/staging/storage/redis/redis-sentinel-controller.yaml +++ b/staging/storage/redis/redis-sentinel-controller.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: sentinel - image: gcr.io/google_containers/redis:v1 + image: k8s.gcr.io/redis:v1 env: - name: SENTINEL value: "true" diff --git a/staging/storage/rethinkdb/admin-pod.yaml b/staging/storage/rethinkdb/admin-pod.yaml index eac07f33..12163909 100644 --- a/staging/storage/rethinkdb/admin-pod.yaml +++ b/staging/storage/rethinkdb/admin-pod.yaml @@ -7,7 +7,7 @@ metadata: name: rethinkdb-admin spec: containers: - - image: gcr.io/google_containers/rethinkdb:1.16.0_1 + - image: k8s.gcr.io/rethinkdb:1.16.0_1 name: rethinkdb env: - name: POD_NAMESPACE diff --git a/staging/storage/rethinkdb/rc.yaml b/staging/storage/rethinkdb/rc.yaml index 36b31919..23becb6e 100644 --- a/staging/storage/rethinkdb/rc.yaml +++ b/staging/storage/rethinkdb/rc.yaml @@ -16,7 +16,7 @@ spec: role: replicas spec: containers: - - image: gcr.io/google_containers/rethinkdb:1.16.0_1 + - image: k8s.gcr.io/rethinkdb:1.16.0_1 name: rethinkdb env: - name: POD_NAMESPACE diff --git a/staging/volumes/fibre_channel/README.md b/staging/volumes/fibre_channel/README.md index 0e1bcf9b..a31c60fd 100644 --- a/staging/volumes/fibre_channel/README.md +++ b/staging/volumes/fibre_channel/README.md @@ -36,7 +36,7 @@ If you ssh to that machine, you can run `docker ps` to see the actual pod. CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES 090ac457ddc2 kubernetes/pause "/pause" 12 minutes ago Up 12 minutes k8s_fcpd-rw.aae720ec_fcpd_default_4024318f-4121-11e5-a294-e839352ddd54_99eb5415 5e2629cf3e7b kubernetes/pause "/pause" 12 minutes ago Up 12 minutes k8s_fcpd-ro.857720dc_fcpd_default_4024318f-4121-11e5-a294-e839352ddd54_c0175742 -2948683253f7 gcr.io/google_containers/pause:0.8.0 "/pause" 12 minutes ago Up 12 minutes k8s_POD.7be6d81d_fcpd_default_4024318f-4121-11e5-a294-e839352ddd54_8d9dd7bf +2948683253f7 k8s.gcr.io/pause:0.8.0 "/pause" 12 minutes ago Up 12 minutes k8s_POD.7be6d81d_fcpd_default_4024318f-4121-11e5-a294-e839352ddd54_8d9dd7bf ``` ## Multipath diff --git a/staging/volumes/nfs/nfs-server-rc.yaml b/staging/volumes/nfs/nfs-server-rc.yaml index c83baf21..6152f79e 100644 --- a/staging/volumes/nfs/nfs-server-rc.yaml +++ b/staging/volumes/nfs/nfs-server-rc.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: nfs-server - image: gcr.io/google_containers/volume-nfs:0.8 + image: k8s.gcr.io/volume-nfs:0.8 ports: - name: nfs containerPort: 2049 diff --git a/staging/volumes/portworx/README.md b/staging/volumes/portworx/README.md index 36e87b4a..f42d55d2 100644 --- a/staging/volumes/portworx/README.md +++ b/staging/volumes/portworx/README.md @@ -45,7 +45,7 @@ The following examples assumes that you already have a running Kubernetes cluste name: test-portworx-volume-pod spec: containers: - - image: gcr.io/google_containers/test-webserver + - image: k8s.gcr.io/test-webserver name: test-container volumeMounts: - mountPath: /test-portworx-volume @@ -181,7 +181,7 @@ The following examples assumes that you already have a running Kubernetes cluste spec: containers: - name: test-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - name: test-volume mountPath: /test-portworx-volume @@ -338,7 +338,7 @@ create Portworx volumes out of band and they will be created automatically. spec: containers: - name: test-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - name: test-volume mountPath: /test-portworx-volume diff --git a/staging/volumes/portworx/portworx-volume-pod.yaml b/staging/volumes/portworx/portworx-volume-pod.yaml index c5f19591..f44302f5 100644 --- a/staging/volumes/portworx/portworx-volume-pod.yaml +++ b/staging/volumes/portworx/portworx-volume-pod.yaml @@ -4,7 +4,7 @@ metadata: name: test-portworx-volume-pod spec: containers: - - image: gcr.io/google_containers/test-webserver + - image: k8s.gcr.io/test-webserver name: test-container volumeMounts: - mountPath: /test-portworx-volume diff --git a/staging/volumes/portworx/portworx-volume-pvcpod.yaml b/staging/volumes/portworx/portworx-volume-pvcpod.yaml index fb92b320..bef2d496 100644 --- a/staging/volumes/portworx/portworx-volume-pvcpod.yaml +++ b/staging/volumes/portworx/portworx-volume-pvcpod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - name: test-volume mountPath: /test-portworx-volume diff --git a/staging/volumes/portworx/portworx-volume-pvcscpod.yaml b/staging/volumes/portworx/portworx-volume-pvcscpod.yaml index 464bf5d8..8bdd5131 100644 --- a/staging/volumes/portworx/portworx-volume-pvcscpod.yaml +++ b/staging/volumes/portworx/portworx-volume-pvcscpod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - name: test-volume mountPath: /test-portworx-volume diff --git a/staging/volumes/scaleio/README.md b/staging/volumes/scaleio/README.md index 13fb02a0..81e7e488 100644 --- a/staging/volumes/scaleio/README.md +++ b/staging/volumes/scaleio/README.md @@ -84,7 +84,7 @@ metadata: name: pod-0 spec: containers: - - image: gcr.io/google_containers/test-webserver + - image: k8s.gcr.io/test-webserver name: pod-0 volumeMounts: - mountPath: /test-pd @@ -221,7 +221,7 @@ metadata: spec: containers: - name: pod-sio-small-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - mountPath: /test name: test-data diff --git a/staging/volumes/scaleio/pod-sc-pvc.yaml b/staging/volumes/scaleio/pod-sc-pvc.yaml index ceed7b56..c94e7bc3 100644 --- a/staging/volumes/scaleio/pod-sc-pvc.yaml +++ b/staging/volumes/scaleio/pod-sc-pvc.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: pod-sio-small-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - mountPath: /test name: test-data diff --git a/staging/volumes/scaleio/pod.yaml b/staging/volumes/scaleio/pod.yaml index 51dfbf81..64cef4f6 100644 --- a/staging/volumes/scaleio/pod.yaml +++ b/staging/volumes/scaleio/pod.yaml @@ -4,7 +4,7 @@ metadata: name: pod-0 spec: containers: - - image: gcr.io/google_containers/test-webserver + - image: k8s.gcr.io/test-webserver name: pod-0 volumeMounts: - mountPath: /test-pd diff --git a/staging/volumes/vsphere/README.md b/staging/volumes/vsphere/README.md index 02e3f302..72e6a4c9 100644 --- a/staging/volumes/vsphere/README.md +++ b/staging/volumes/vsphere/README.md @@ -38,7 +38,7 @@ name: test-vmdk spec: containers: - - image: gcr.io/google_containers/test-webserver + - image: k8s.gcr.io/test-webserver name: test-container volumeMounts: - mountPath: /test-vmdk @@ -180,7 +180,7 @@ spec: containers: - name: test-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - name: test-volume mountPath: /test-vmdk @@ -350,7 +350,7 @@ spec: containers: - name: test-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - name: test-volume mountPath: /test-vmdk @@ -568,7 +568,7 @@ spec: containers: - name: test-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - name: test-volume mountPath: /test @@ -647,7 +647,7 @@ vSphere volumes can be consumed by Stateful Sets. spec: containers: - name: nginx - image: gcr.io/google_containers/nginx-slim:0.8 + image: k8s.gcr.io/nginx-slim:0.8 ports: - containerPort: 80 name: web diff --git a/staging/volumes/vsphere/simple-statefulset.yaml b/staging/volumes/vsphere/simple-statefulset.yaml index 465c7c5e..53dd7563 100644 --- a/staging/volumes/vsphere/simple-statefulset.yaml +++ b/staging/volumes/vsphere/simple-statefulset.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: nginx - image: gcr.io/google_containers/nginx-slim:0.8 + image: k8s.gcr.io/nginx-slim:0.8 ports: - containerPort: 80 name: web diff --git a/staging/volumes/vsphere/vsphere-volume-pod.yaml b/staging/volumes/vsphere/vsphere-volume-pod.yaml index 8660d62e..0204ad3a 100644 --- a/staging/volumes/vsphere/vsphere-volume-pod.yaml +++ b/staging/volumes/vsphere/vsphere-volume-pod.yaml @@ -4,7 +4,7 @@ metadata: name: test-vmdk spec: containers: - - image: gcr.io/google_containers/test-webserver + - image: k8s.gcr.io/test-webserver name: test-container volumeMounts: - mountPath: /test-vmdk diff --git a/staging/volumes/vsphere/vsphere-volume-pvcpod.yaml b/staging/volumes/vsphere/vsphere-volume-pvcpod.yaml index 291664ad..326c0031 100644 --- a/staging/volumes/vsphere/vsphere-volume-pvcpod.yaml +++ b/staging/volumes/vsphere/vsphere-volume-pvcpod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - name: test-volume mountPath: /test-vmdk diff --git a/staging/volumes/vsphere/vsphere-volume-pvcscpod.yaml b/staging/volumes/vsphere/vsphere-volume-pvcscpod.yaml index 036aeb28..c569a0b3 100644 --- a/staging/volumes/vsphere/vsphere-volume-pvcscpod.yaml +++ b/staging/volumes/vsphere/vsphere-volume-pvcscpod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - name: test-volume mountPath: /test-vmdk diff --git a/staging/volumes/vsphere/vsphere-volume-pvcscvsanpod.yaml b/staging/volumes/vsphere/vsphere-volume-pvcscvsanpod.yaml index 6c34f0f9..f5addbea 100644 --- a/staging/volumes/vsphere/vsphere-volume-pvcscvsanpod.yaml +++ b/staging/volumes/vsphere/vsphere-volume-pvcscvsanpod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/test-webserver + image: k8s.gcr.io/test-webserver volumeMounts: - name: test-volume mountPath: /test