Skip to content

Commit 33dfad2

Browse files
ajaykajayk
committed
chore: move registry from k8s.gcr.io to registry.k8s.io
1 parent 8c357b6 commit 33dfad2

35 files changed

+45
-45
lines changed

‎guestbook-go/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ The Redis master we created earlier is a single pod (REPLICAS = 1), while the Re
109109
$ kubectl get rc
110110
CONTROLLER CONTAINER(S) IMAGE(S) SELECTOR REPLICAS
111111
redis-master redis-master redis app=redis,role=master 1
112-
redis-replica redis-replica k8s.gcr.io/redis-slave:v2 app=redis,role=replica 2
112+
redis-replica redis-replica registry.k8s.io/redis-slave:v2 app=redis,role=replica 2
113113
...
114114
```
115115

@@ -178,9 +178,9 @@ This is a simple Go `net/http` ([negroni](https://github.com/codegangsta/negroni
178178
```console
179179
$ kubectl get rc
180180
CONTROLLER CONTAINER(S) IMAGE(S) SELECTOR REPLICAS
181-
guestbook guestbook k8s.gcr.io/guestbook:v3 app=guestbook 3
181+
guestbook guestbook registry.k8s.io/guestbook:v3 app=guestbook 3
182182
redis-master redis-master redis app=redis,role=master 1
183-
redis-replica redis-replica k8s.gcr.io/redis-replica:v2 app=redis,role=replica 2
183+
redis-replica redis-replica registry.k8s.io/redis-replica:v2 app=redis,role=replica 2
184184
...
185185
```
186186

‎guestbook-go/guestbook-controller.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"containers":[
2323
{
2424
"name":"guestbook",
25-
"image":"k8s.gcr.io/guestbook:v3",
25+
"image":"registry.k8s.io/guestbook:v3",
2626
"ports":[
2727
{
2828
"name":"http-server",

‎guestbook-go/redis-master-controller.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"containers":[
2626
{
2727
"name":"redis-master",
28-
"image":"k8s.gcr.io/redis:e2e",
28+
"image":"registry.k8s.io/redis:e2e",
2929
"ports":[
3030
{
3131
"name":"redis-server",

‎guestbook-go/redis-replica-controller.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"containers":[
2626
{
2727
"name":"redis-replica",
28-
"image":"k8s.gcr.io/redis-slave:v2",
28+
"image":"registry.k8s.io/redis-slave:v2",
2929
"ports":[
3030
{
3131
"name":"redis-server",

‎guestbook/all-in-one/guestbook-all-in-one.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
spec:
3636
containers:
3737
- name: master
38-
image: k8s.gcr.io/redis:e2e # or just image: redis
38+
image: registry.k8s.io/redis:e2e # or just image: redis
3939
resources:
4040
requests:
4141
cpu: 100m

‎guestbook/legacy/redis-master-controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
spec:
1818
containers:
1919
- name: master
20-
image: k8s.gcr.io/redis:e2e # or just image: redis
20+
image: registry.k8s.io/redis:e2e # or just image: redis
2121
resources:
2222
requests:
2323
cpu: 100m

‎guestbook/redis-master-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
spec:
1919
containers:
2020
- name: master
21-
image: k8s.gcr.io/redis:e2e # or just image: redis
21+
image: registry.k8s.io/redis:e2e # or just image: redis
2222
resources:
2323
requests:
2424
cpu: 100m

‎staging/cluster-dns/dns-backend-rc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: dns-backend
18-
image: k8s.gcr.io/example-dns-backend:v1
18+
image: registry.k8s.io/example-dns-backend:v1
1919
ports:
2020
- name: backend-port
2121
containerPort: 8000

‎staging/cluster-dns/dns-frontend-pod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
spec:
88
containers:
99
- name: dns-frontend
10-
image: k8s.gcr.io/example-dns-frontend:v1
10+
image: registry.k8s.io/example-dns-frontend:v1
1111
command:
1212
- python
1313
- client.py

‎staging/explorer/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Explorer is a little container for examining the runtime environment Kubernetes produces for your pods.
44

5-
The intended use is to substitute k8s.gcr.io/explorer for your intended container, and then visit it via the proxy.
5+
The intended use is to substitute registry.k8s.io/explorer for your intended container, and then visit it via the proxy.
66

77
Currently, you can look at:
88
* The environment variables to make sure Kubernetes is doing what you expect.

‎staging/explorer/pod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: explorer
8-
image: k8s.gcr.io/explorer:1.0
8+
image: registry.k8s.io/explorer:1.0
99
args: ["-port=8080"]
1010
ports:
1111
- containerPort: 8080

‎staging/spark/spark-gluster/spark-master-controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
containers:
1818
- name: spark-master
19-
image: k8s.gcr.io/spark:1.5.2_v1
19+
image: registry.k8s.io/spark:1.5.2_v1
2020
command: ["/start-master"]
2121
ports:
2222
- containerPort: 7077

‎staging/spark/spark-gluster/spark-worker-controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
spec:
1818
containers:
1919
- name: spark-worker
20-
image: k8s.gcr.io/spark:1.5.2_v1
20+
image: registry.k8s.io/spark:1.5.2_v1
2121
command: ["/start-worker"]
2222
ports:
2323
- containerPort: 8888

‎staging/spark/spark-master-controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: spark-master
16-
image: k8s.gcr.io/spark:1.5.2_v1
16+
image: registry.k8s.io/spark:1.5.2_v1
1717
command: ["/start-master"]
1818
ports:
1919
- containerPort: 7077

‎staging/spark/spark-worker-controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: spark-worker
16-
image: k8s.gcr.io/spark:1.5.2_v1
16+
image: registry.k8s.io/spark:1.5.2_v1
1717
command: ["/start-worker"]
1818
ports:
1919
- containerPort: 8081

‎staging/spark/zeppelin-controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: zeppelin
16-
image: k8s.gcr.io/zeppelin:v0.5.6_v1
16+
image: registry.k8s.io/zeppelin:v0.5.6_v1
1717
ports:
1818
- containerPort: 8080
1919
resources:

‎staging/storage/redis/redis-controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: redis
17-
image: k8s.gcr.io/redis:v1
17+
image: registry.k8s.io/redis:v1
1818
ports:
1919
- containerPort: 6379
2020
resources:

‎staging/storage/redis/redis-master.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
spec:
1010
containers:
1111
- name: master
12-
image: k8s.gcr.io/redis:v1
12+
image: registry.k8s.io/redis:v1
1313
env:
1414
- name: MASTER
1515
value: "true"
@@ -22,7 +22,7 @@ spec:
2222
- mountPath: /redis-master-data
2323
name: data
2424
- name: sentinel
25-
image: k8s.gcr.io/redis:v1
25+
image: registry.k8s.io/redis:v1
2626
env:
2727
- name: SENTINEL
2828
value: "true"

‎staging/storage/redis/redis-sentinel-controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: sentinel
18-
image: k8s.gcr.io/redis:v1
18+
image: registry.k8s.io/redis:v1
1919
env:
2020
- name: SENTINEL
2121
value: "true"

‎staging/storage/rethinkdb/admin-pod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
name: rethinkdb-admin
88
spec:
99
containers:
10-
- image: k8s.gcr.io/rethinkdb:1.16.0_1
10+
- image: registry.k8s.io/rethinkdb:1.16.0_1
1111
name: rethinkdb
1212
env:
1313
- name: POD_NAMESPACE

‎staging/storage/rethinkdb/rc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
role: replicas
1717
spec:
1818
containers:
19-
- image: k8s.gcr.io/rethinkdb:1.16.0_1
19+
- image: registry.k8s.io/rethinkdb:1.16.0_1
2020
name: rethinkdb
2121
env:
2222
- name: POD_NAMESPACE

‎staging/volumes/nfs/nfs-server-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: nfs-server
17-
image: k8s.gcr.io/volume-nfs:0.8
17+
image: registry.k8s.io/volume-nfs:0.8
1818
ports:
1919
- name: nfs
2020
containerPort: 2049

‎staging/volumes/portworx/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The following examples assumes that you already have a running Kubernetes cluste
4545
name: test-portworx-volume-pod
4646
spec:
4747
containers:
48-
- image: k8s.gcr.io/test-webserver
48+
- image: registry.k8s.io/test-webserver
4949
name: test-container
5050
volumeMounts:
5151
- mountPath: /test-portworx-volume
@@ -181,7 +181,7 @@ The following examples assumes that you already have a running Kubernetes cluste
181181
spec:
182182
containers:
183183
- name: test-container
184-
image: k8s.gcr.io/test-webserver
184+
image: registry.k8s.io/test-webserver
185185
volumeMounts:
186186
- name: test-volume
187187
mountPath: /test-portworx-volume
@@ -338,7 +338,7 @@ create Portworx volumes out of band and they will be created automatically.
338338
spec:
339339
containers:
340340
- name: test-container
341-
image: k8s.gcr.io/test-webserver
341+
image: registry.k8s.io/test-webserver
342342
volumeMounts:
343343
- name: test-volume
344344
mountPath: /test-portworx-volume

‎staging/volumes/portworx/portworx-volume-pod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: test-portworx-volume-pod
55
spec:
66
containers:
7-
- image: k8s.gcr.io/test-webserver
7+
- image: registry.k8s.io/test-webserver
88
name: test-container
99
volumeMounts:
1010
- mountPath: /test-portworx-volume

‎staging/volumes/portworx/portworx-volume-pvcpod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: test-container
8-
image: k8s.gcr.io/test-webserver
8+
image: registry.k8s.io/test-webserver
99
volumeMounts:
1010
- name: test-volume
1111
mountPath: /test-portworx-volume

‎staging/volumes/portworx/portworx-volume-pvcscpod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: test-container
8-
image: k8s.gcr.io/test-webserver
8+
image: registry.k8s.io/test-webserver
99
volumeMounts:
1010
- name: test-volume
1111
mountPath: /test-portworx-volume

‎staging/volumes/scaleio/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ metadata:
8484
name: pod-0
8585
spec:
8686
containers:
87-
- image: k8s.gcr.io/test-webserver
87+
- image: registry.k8s.io/test-webserver
8888
name: pod-0
8989
volumeMounts:
9090
- mountPath: /test-pd
@@ -221,7 +221,7 @@ metadata:
221221
spec:
222222
containers:
223223
- name: pod-sio-small-container
224-
image: k8s.gcr.io/test-webserver
224+
image: registry.k8s.io/test-webserver
225225
volumeMounts:
226226
- mountPath: /test
227227
name: test-data

‎staging/volumes/scaleio/pod-sc-pvc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: pod-sio-small-container
8-
image: k8s.gcr.io/test-webserver
8+
image: registry.k8s.io/test-webserver
99
volumeMounts:
1010
- mountPath: /test
1111
name: test-data

‎staging/volumes/scaleio/pod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: pod-0
55
spec:
66
containers:
7-
- image: k8s.gcr.io/test-webserver
7+
- image: registry.k8s.io/test-webserver
88
name: pod-0
99
volumeMounts:
1010
- mountPath: /test-pd

‎staging/volumes/vsphere/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
name: test-vmdk
3939
spec:
4040
containers:
41-
- image: k8s.gcr.io/test-webserver
41+
- image: registry.k8s.io/test-webserver
4242
name: test-container
4343
volumeMounts:
4444
- mountPath: /test-vmdk
@@ -180,7 +180,7 @@
180180
spec:
181181
containers:
182182
- name: test-container
183-
image: k8s.gcr.io/test-webserver
183+
image: registry.k8s.io/test-webserver
184184
volumeMounts:
185185
- name: test-volume
186186
mountPath: /test-vmdk
@@ -350,7 +350,7 @@
350350
spec:
351351
containers:
352352
- name: test-container
353-
image: k8s.gcr.io/test-webserver
353+
image: registry.k8s.io/test-webserver
354354
volumeMounts:
355355
- name: test-volume
356356
mountPath: /test-vmdk
@@ -568,7 +568,7 @@
568568
spec:
569569
containers:
570570
- name: test-container
571-
image: k8s.gcr.io/test-webserver
571+
image: registry.k8s.io/test-webserver
572572
volumeMounts:
573573
- name: test-volume
574574
mountPath: /test
@@ -653,7 +653,7 @@ vSphere volumes can be consumed by Stateful Sets.
653653
spec:
654654
containers:
655655
- name: nginx
656-
image: k8s.gcr.io/nginx-slim:0.8
656+
image: registry.k8s.io/nginx-slim:0.8
657657
ports:
658658
- containerPort: 80
659659
name: web

‎staging/volumes/vsphere/simple-statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
spec:
3333
containers:
3434
- name: nginx
35-
image: k8s.gcr.io/nginx-slim:0.8
35+
image: registry.k8s.io/nginx-slim:0.8
3636
ports:
3737
- containerPort: 80
3838
name: web

‎staging/volumes/vsphere/vsphere-volume-pod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: test-vmdk
55
spec:
66
containers:
7-
- image: k8s.gcr.io/test-webserver
7+
- image: registry.k8s.io/test-webserver
88
name: test-container
99
volumeMounts:
1010
- mountPath: /test-vmdk

‎staging/volumes/vsphere/vsphere-volume-pvcpod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: test-container
8-
image: k8s.gcr.io/test-webserver
8+
image: registry.k8s.io/test-webserver
99
volumeMounts:
1010
- name: test-volume
1111
mountPath: /test-vmdk

‎staging/volumes/vsphere/vsphere-volume-pvcscpod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: test-container
8-
image: k8s.gcr.io/test-webserver
8+
image: registry.k8s.io/test-webserver
99
volumeMounts:
1010
- name: test-volume
1111
mountPath: /test-vmdk

‎staging/volumes/vsphere/vsphere-volume-pvcscvsanpod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: test-container
8-
image: k8s.gcr.io/test-webserver
8+
image: registry.k8s.io/test-webserver
99
volumeMounts:
1010
- name: test-volume
1111
mountPath: /test

0 commit comments

Comments
 (0)