Merge pull request #54174 from thockin/gcr-vanity

Automatic merge from submit-queue (batch tested with PRs 54379, 56593, 56685, 54174, 57309). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Use k8s.gcr.io vanity domain for container images

Related issue: https://github.com/kubernetes/release/issues/281

```release-note
Use "k8s.gcr.io" for container images rather than "gcr.io/google_containers".  This is just a redirect, for now, so should not impact anyone materially.  

Documentation and tools should all convert to the new name. Users should take note of this in case they see this new name in the system.
```
This commit is contained in:
Kubernetes Submit Queue
2017-12-18 14:45:45 -08:00
committed by GitHub
245 changed files with 505 additions and 489 deletions

View File

@@ -64,7 +64,7 @@ var benchmarkPod api.Pod = api.Pod{
Containers: []api.Container{
{
Name: "etcd-container",
Image: "gcr.io/google_containers/etcd:2.0.9",
Image: "k8s.gcr.io/etcd:2.0.9",
Command: []string{
"/usr/local/bin/etcd",
"--addr",
@@ -120,7 +120,7 @@ var benchmarkPod api.Pod = api.Pod{
},
Ready: true,
RestartCount: 0,
Image: "gcr.io/google_containers/etcd:2.0.9",
Image: "k8s.gcr.io/etcd:2.0.9",
ImageID: "docker://b6b9a86dc06aa1361357ca1b105feba961f6a4145adca6c54e142c0be0fe87b0",
ContainerID: "docker://3cbbf818f1addfc252957b4504f56ef2907a313fe6afc47fc75373674255d46d",
},

View File

@@ -47,7 +47,7 @@
"containers": [
{
"name": "elasticsearch-logging",
"image": "gcr.io/google_containers/elasticsearch:1.0",
"image": "k8s.gcr.io/elasticsearch:1.0",
"ports": [
{
"name": "db",