Skip to content

Commit 4b8db1e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#4137 from thockin-tmp/gcr-vanity
Convert registry to k8s.gcr.io
2 parents 87fbb34 + 79d5f79 commit 4b8db1e

File tree

50 files changed

+96
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+96
-96
lines changed

Diff for: ‎WORKSPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ container_pull(
5555
name = "debian_hyperkube_base_amd64",
5656
# 'tag' is also supported, but digest is encouraged for reproducibility.
5757
digest = "sha256:fc1b461367730660ac5a40c1eb2d1b23221829acf8a892981c12361383b3742b",
58-
registry = "gcr.io",
59-
repository = "google_containers/debian-hyperkube-base-amd64",
58+
registry = "k8s.gcr.io",
59+
repository = "debian-hyperkube-base-amd64",
6060
tag = "0.8",
6161
)

Diff for: ‎addons/cluster-autoscaler/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Note that you likely want to change `AWS_REGION` and `GROUP_NAME`, and probably
66

77
```bash
88
CLOUD_PROVIDER=aws
9-
IMAGE=gcr.io/google_containers/cluster-autoscaler:v1.1.0
9+
IMAGE=k8s.gcr.io/cluster-autoscaler:v1.1.0
1010
MIN_NODES=1
1111
MAX_NODES=5
1212
AWS_REGION=us-east-1

Diff for: ‎addons/ingress-nginx/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Creating a simple ingress
44

55
```
6-
kubectl run echoheaders --image=gcr.io/google_containers/echoserver:1.4 --replicas=1 --port=8080
6+
kubectl run echoheaders --image=k8s.gcr.io/echoserver:1.4 --replicas=1 --port=8080
77
kubectl expose deployment echoheaders --port=80 --target-port=8080 --name=echoheaders-x
88
kubectl expose deployment echoheaders --port=80 --target-port=8080 --name=echoheaders-y
99

Diff for: ‎addons/ingress-nginx/v1.4.0.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
terminationGracePeriodSeconds: 60
3131
containers:
3232
- name: default-http-backend
33-
image: gcr.io/google_containers/defaultbackend:1.0
33+
image: k8s.gcr.io/defaultbackend:1.0
3434
livenessProbe:
3535
httpGet:
3636
path: /healthz
@@ -101,7 +101,7 @@ spec:
101101
spec:
102102
terminationGracePeriodSeconds: 60
103103
containers:
104-
- image: gcr.io/google_containers/nginx-ingress-controller:0.8.3
104+
- image: k8s.gcr.io/nginx-ingress-controller:0.8.3
105105
name: ingress-nginx
106106
imagePullPolicy: Always
107107
ports:

Diff for: ‎addons/ingress-nginx/v1.6.0-gce.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ spec:
194194
terminationGracePeriodSeconds: 60
195195
containers:
196196
- name: default-http-backend
197-
image: gcr.io/google_containers/defaultbackend:1.3
197+
image: k8s.gcr.io/defaultbackend:1.3
198198
livenessProbe:
199199
httpGet:
200200
path: /healthz
@@ -272,7 +272,7 @@ spec:
272272
terminationGracePeriodSeconds: 60
273273
serviceAccountName: nginx-ingress-controller
274274
containers:
275-
- image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10
275+
- image: k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.10
276276
name: nginx-ingress-controller
277277
imagePullPolicy: Always
278278
ports:

Diff for: ‎addons/ingress-nginx/v1.6.0.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ spec:
194194
terminationGracePeriodSeconds: 60
195195
containers:
196196
- name: default-http-backend
197-
image: gcr.io/google_containers/defaultbackend:1.3
197+
image: k8s.gcr.io/defaultbackend:1.3
198198
livenessProbe:
199199
httpGet:
200200
path: /healthz
@@ -274,7 +274,7 @@ spec:
274274
terminationGracePeriodSeconds: 60
275275
serviceAccountName: nginx-ingress-controller
276276
containers:
277-
- image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
277+
- image: k8s.gcr.io/nginx-ingress-controller:0.9.0
278278
name: nginx-ingress-controller
279279
imagePullPolicy: Always
280280
ports:

Diff for: ‎addons/kube-state-metrics/v1.0.1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ spec:
7676
memory: 200Mi
7777
cpu: 200m
7878
- name: addon-resizer
79-
image: gcr.io/google_containers/addon-resizer:1.0
79+
image: k8s.gcr.io/addon-resizer:1.0
8080
resources:
8181
limits:
8282
cpu: 100m

Diff for: ‎addons/kube-state-metrics/v1.1.0-rc.0.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ spec:
7676
memory: 200Mi
7777
cpu: 200m
7878
- name: addon-resizer
79-
image: gcr.io/google_containers/addon-resizer:1.0
79+
image: k8s.gcr.io/addon-resizer:1.0
8080
resources:
8181
limits:
8282
cpu: 100m

Diff for: ‎addons/kube-state-metrics/v1.1.0.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ spec:
7676
memory: 500Mi
7777
cpu: 300m
7878
- name: addon-resizer
79-
image: gcr.io/google_containers/addon-resizer:1.8.1
79+
image: k8s.gcr.io/addon-resizer:1.8.1
8080
resources:
8181
limits:
8282
cpu: 100m

Diff for: ‎addons/kubernetes-dashboard/v1.1.0.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
spec:
3838
containers:
3939
- name: kubernetes-dashboard
40-
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.1.0
40+
image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.1.0
4141
imagePullPolicy: Always
4242
ports:
4343
- name: http

Diff for: ‎addons/kubernetes-dashboard/v1.4.0.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
spec:
2727
containers:
2828
- name: kubernetes-dashboard
29-
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.4.0
29+
image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.4.0
3030
resources:
3131
# keep request = limit to keep this container in guaranteed class
3232
limits:

Diff for: ‎addons/kubernetes-dashboard/v1.5.0.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
spec:
2727
containers:
2828
- name: kubernetes-dashboard
29-
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.0
29+
image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.5.0
3030
resources:
3131
# keep request = limit to keep this container in guaranteed class
3232
limits:

Diff for: ‎addons/kubernetes-dashboard/v1.6.0.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ spec:
5656
spec:
5757
containers:
5858
- name: kubernetes-dashboard
59-
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.0
59+
image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.0
6060
ports:
6161
- containerPort: 9090
6262
protocol: TCP

Diff for: ‎addons/kubernetes-dashboard/v1.6.1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ spec:
5656
spec:
5757
containers:
5858
- name: kubernetes-dashboard
59-
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.1
59+
image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.1
6060
ports:
6161
- containerPort: 9090
6262
protocol: TCP

Diff for: ‎addons/kubernetes-dashboard/v1.6.3.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
spec:
5858
containers:
5959
- name: kubernetes-dashboard
60-
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.6.3
60+
image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.6.3
6161
ports:
6262
- containerPort: 9090
6363
protocol: TCP

Diff for: ‎addons/kubernetes-dashboard/v1.7.0.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ spec:
9090
spec:
9191
containers:
9292
- name: kubernetes-dashboard
93-
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.7.0
93+
image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.7.0
9494
ports:
9595
- containerPort: 9090
9696
protocol: TCP

Diff for: ‎addons/kubernetes-dashboard/v1.7.1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ spec:
9090
spec:
9191
containers:
9292
- name: kubernetes-dashboard
93-
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.7.1
93+
image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.7.1
9494
ports:
9595
- containerPort: 9090
9696
protocol: TCP

Diff for: ‎addons/kubernetes-dashboard/v1.8.0.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ spec:
110110
spec:
111111
containers:
112112
- name: kubernetes-dashboard
113-
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.0
113+
image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.0
114114
ports:
115115
- containerPort: 8443
116116
protocol: TCP

Diff for: ‎addons/kubernetes-dashboard/v1.8.1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ spec:
114114
spec:
115115
containers:
116116
- name: kubernetes-dashboard
117-
image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.8.1
117+
image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.8.1
118118
ports:
119119
- containerPort: 8443
120120
protocol: TCP

Diff for: ‎addons/logging-elasticsearch/v1.5.0.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
spec:
1919
containers:
2020
- name: fluentd-es
21-
image: gcr.io/google_containers/fluentd-elasticsearch:1.22
21+
image: k8s.gcr.io/fluentd-elasticsearch:1.22
2222
command:
2323
- '/bin/sh'
2424
- '-c'
@@ -89,7 +89,7 @@ spec:
8989
kubernetes.io/cluster-service: "true"
9090
spec:
9191
containers:
92-
- image: gcr.io/google_containers/elasticsearch:v2.4.1-2
92+
- image: k8s.gcr.io/elasticsearch:v2.4.1-2
9393
name: elasticsearch-logging
9494
resources:
9595
# need more cpu upon initialization, therefore burstable class
@@ -146,7 +146,7 @@ spec:
146146
spec:
147147
containers:
148148
- name: kibana-logging
149-
image: gcr.io/google_containers/kibana:v4.6.1-1
149+
image: k8s.gcr.io/kibana:v4.6.1-1
150150
resources:
151151
# keep request = limit to keep this container in guaranteed class
152152
limits:

Diff for: ‎addons/logging-elasticsearch/v1.6.0.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ spec:
113113
serviceAccountName: fluentd-es
114114
containers:
115115
- name: fluentd-es
116-
image: gcr.io/google_containers/fluentd-elasticsearch:1.22
116+
image: k8s.gcr.io/fluentd-elasticsearch:1.22
117117
command:
118118
- '/bin/sh'
119119
- '-c'
@@ -185,7 +185,7 @@ spec:
185185
spec:
186186
serviceAccountName: elasticsearch-logging
187187
containers:
188-
- image: gcr.io/google_containers/elasticsearch:v2.4.1-2
188+
- image: k8s.gcr.io/elasticsearch:v2.4.1-2
189189
name: elasticsearch-logging
190190
resources:
191191
# need more cpu upon initialization, therefore burstable class
@@ -242,7 +242,7 @@ spec:
242242
spec:
243243
containers:
244244
- name: kibana-logging
245-
image: gcr.io/google_containers/kibana:v4.6.1-1
245+
image: k8s.gcr.io/kibana:v4.6.1-1
246246
resources:
247247
# keep request = limit to keep this container in guaranteed class
248248
limits:

Diff for: ‎addons/monitoring-standalone/v1.1.0.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
version: v1.1.0
2121
spec:
2222
containers:
23-
- image: gcr.io/google_containers/heapster:v1.1.0
23+
- image: k8s.gcr.io/heapster:v1.1.0
2424
name: heapster
2525
resources:
2626
# keep request = limit to keep this container in guaranteed class
@@ -33,7 +33,7 @@ spec:
3333
command:
3434
- /heapster
3535
- --source=kubernetes.summary_api:''
36-
- image: gcr.io/google_containers/addon-resizer:1.3
36+
- image: k8s.gcr.io/addon-resizer:1.3
3737
name: heapster-nanny
3838
resources:
3939
limits:

Diff for: ‎addons/monitoring-standalone/v1.2.0.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
2525
spec:
2626
containers:
27-
- image: gcr.io/google_containers/heapster:v1.2.0
27+
- image: k8s.gcr.io/heapster:v1.2.0
2828
name: heapster
2929
livenessProbe:
3030
httpGet:
@@ -44,7 +44,7 @@ spec:
4444
command:
4545
- /heapster
4646
- --source=kubernetes.summary_api:''
47-
- image: gcr.io/google_containers/addon-resizer:1.6
47+
- image: k8s.gcr.io/addon-resizer:1.6
4848
name: heapster-nanny
4949
resources:
5050
limits:

Diff for: ‎addons/monitoring-standalone/v1.3.0.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
2525
spec:
2626
containers:
27-
- image: gcr.io/google_containers/heapster:v1.3.0
27+
- image: k8s.gcr.io/heapster:v1.3.0
2828
name: heapster
2929
livenessProbe:
3030
httpGet:
@@ -44,7 +44,7 @@ spec:
4444
command:
4545
- /heapster
4646
- --source=kubernetes.summary_api:''
47-
- image: gcr.io/google_containers/addon-resizer:1.7
47+
- image: k8s.gcr.io/addon-resizer:1.7
4848
name: heapster-nanny
4949
resources:
5050
limits:

Diff for: ‎addons/monitoring-standalone/v1.6.0.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
spec:
2626
serviceAccountName: heapster
2727
containers:
28-
- image: gcr.io/google_containers/heapster:v1.3.0
28+
- image: k8s.gcr.io/heapster:v1.3.0
2929
name: heapster
3030
livenessProbe:
3131
httpGet:
@@ -45,7 +45,7 @@ spec:
4545
command:
4646
- /heapster
4747
- --source=kubernetes.summary_api:''
48-
- image: gcr.io/google_containers/addon-resizer:1.7
48+
- image: k8s.gcr.io/addon-resizer:1.7
4949
name: heapster-nanny
5050
resources:
5151
limits:

Diff for: ‎addons/monitoring-standalone/v1.7.0.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
spec:
2626
serviceAccountName: heapster
2727
containers:
28-
- image: gcr.io/google_containers/heapster:v1.4.0
28+
- image: k8s.gcr.io/heapster:v1.4.0
2929
name: heapster
3030
livenessProbe:
3131
httpGet:
@@ -45,7 +45,7 @@ spec:
4545
command:
4646
- /heapster
4747
- --source=kubernetes.summary_api:''
48-
- image: gcr.io/google_containers/addon-resizer:2.0
48+
- image: k8s.gcr.io/addon-resizer:2.0
4949
name: heapster-nanny
5050
resources:
5151
limits:

Diff for: ‎docs/advisories/cve_2017_14491.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Apply the update to the container:
8383

8484
```bash
8585
kubectl set image deployment/kube-dns -n kube-system \
86-
dnsmasq=gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
86+
dnsmasq=k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5
8787
```
8888

8989
Validate the change was applied to the deployment:
@@ -108,8 +108,8 @@ You should see version 1.14.5 for the k8s-dns-dnsmasq-nanny-amd64 container:
108108

109109
```console
110110
NAME IMAGE
111-
kube-dns-1100866048-3lqm0 gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5,gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5,gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
112-
kube-dns-1100866048-tjlv2 gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5,gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5,gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
111+
kube-dns-1100866048-3lqm0 k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5,k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5,k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5
112+
kube-dns-1100866048-tjlv2 k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5,k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5,k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5
113113
```
114114

115115
### Kubernetes Versions 1.4.x - 1.5.x
@@ -136,7 +136,7 @@ Upgrade the kube-dns container to the new version.
136136

137137
```bash
138138
kubectl set image deployment/kube-dns -n kube-system \
139-
dnsmasq=gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
139+
dnsmasq=k8s.gcr.io/k8s-dns-dnsmasq-amd64:1.14.5
140140
```
141141

142142
Validate the change was applied to the deployment:
@@ -157,8 +157,8 @@ You should see version 1.14.5 for the dnsmasq pod
157157

158158
```console
159159
NAME IMAGE
160-
kube-dns-4146767324-djthf gcr.io/google_containers/kubedns-amd64:1.9,gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5,gcr.io/google_containers/dnsmasq-metrics-amd64:1.0,gcr.io/google_containers/exechealthz-amd64:1.2
161-
kube-dns-4146767324-kloxi gcr.io/google_containers/kubedns-amd64:1.9,gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5,gcr.io/google_containers/dnsmasq-metrics-amd64:1.0,gcr.io/google_containers/exechealthz-amd64:1.2
160+
kube-dns-4146767324-djthf k8s.gcr.io/kubedns-amd64:1.9,k8s.gcr.io/k8s-dns-dnsmasq-amd64:1.14.5,k8s.gcr.io/dnsmasq-metrics-amd64:1.0,k8s.gcr.io/exechealthz-amd64:1.2
161+
kube-dns-4146767324-kloxi k8s.gcr.io/kubedns-amd64:1.9,k8s.gcr.io/k8s-dns-dnsmasq-amd64:1.14.5,k8s.gcr.io/dnsmasq-metrics-amd64:1.0,k8s.gcr.io/exechealthz-amd64:1.2
162162
```
163163

164164
## More Information

Diff for: ‎images/dns-controller-builder/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM gcr.io/google_containers/debian-base-amd64:0.3
15+
FROM k8s.gcr.io/debian-base-amd64:0.3
1616

1717
# Install packages:
1818
# curl (to download golang)

0 commit comments

Comments
 (0)