kubernetes
/
examples
mirror of https://github.com/kubernetes/examples.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #163 from thockin-tmp/gcr-vanity 

Convert registry to k8s.gcr.io
This commit is contained in:
Tim Hockin 2017-12-23 10:22:35 -08:00 committed by GitHub
parent 4e6b5f092a 40f5426f1e
commit 3c2ef9e0d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cassandra/image/Dockerfile
View File

@ -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

4
guestbook-go/Makefile
View File

@ -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

2
guestbook-go/README.md
View File

@ -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
...

2
guestbook-go/guestbook-controller.json
View File

@ -22,7 +22,7 @@
"containers":[
{
"name":"guestbook",
"image":"gcr.io/google_containers/guestbook:v3",
"image":"k8s.gcr.io/guestbook:v3",
"ports":[
{
"name":"http-server",

2
guestbook/all-in-one/guestbook-all-in-one.yaml
View File

@ -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

2
guestbook/legacy/redis-master-controller.yaml
View File

@ -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

2
guestbook/redis-master-deployment.yaml
View File

@ -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

2
staging/cluster-dns/dns-backend-rc.yaml
View File

@ -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

2
staging/cluster-dns/dns-frontend-pod.yaml
View File

@ -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

2
staging/cluster-dns/images/backend/Makefile
View File

@ -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

2
staging/cluster-dns/images/frontend/Makefile
View File

@ -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

4
staging/explorer/Makefile
View File

@ -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

2
staging/explorer/README.md
View File

@ -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.

2
staging/explorer/pod.yaml
View File

@ -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

2
staging/spark/spark-gluster/spark-master-controller.yaml
View File

@ -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

2
staging/spark/spark-gluster/spark-worker-controller.yaml
View File

@ -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

2
staging/spark/spark-master-controller.yaml
View File

@ -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

2
staging/spark/spark-worker-controller.yaml
View File

@ -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

2
staging/spark/zeppelin-controller.yaml
View File

@ -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:

2
staging/storage/redis/redis-controller.yaml
View File

@ -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:

2
staging/storage/redis/redis-master.yaml
View File

@ -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"

2
staging/storage/redis/redis-sentinel-controller.yaml
View File

@ -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"

2
staging/storage/rethinkdb/admin-pod.yaml
View File

@ -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

2
staging/storage/rethinkdb/rc.yaml
View File

@ -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

2
staging/volumes/fibre_channel/README.md
View File

@ -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

2
staging/volumes/nfs/nfs-server-rc.yaml
View File

@ -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

6
staging/volumes/portworx/README.md
View File

@ -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

2
staging/volumes/portworx/portworx-volume-pod.yaml
View File

@ -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

2
staging/volumes/portworx/portworx-volume-pvcpod.yaml
View File

@ -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

2
staging/volumes/portworx/portworx-volume-pvcscpod.yaml
View File

@ -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

4
staging/volumes/scaleio/README.md
View File

@ -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

2
staging/volumes/scaleio/pod-sc-pvc.yaml
View File

@ -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

2
staging/volumes/scaleio/pod.yaml
View File

@ -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

10
staging/volumes/vsphere/README.md
View File

@ -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

2
staging/volumes/vsphere/simple-statefulset.yaml
View File

@ -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

2
staging/volumes/vsphere/vsphere-volume-pod.yaml
View File

@ -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

2
staging/volumes/vsphere/vsphere-volume-pvcpod.yaml
View File

@ -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

2
staging/volumes/vsphere/vsphere-volume-pvcscpod.yaml
View File

@ -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

2
staging/volumes/vsphere/vsphere-volume-pvcscvsanpod.yaml
View File

@ -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