diff --git a/_includes/v1.3/v1-definitions.html b/_includes/v1.3/v1-definitions.html index 4cd88cc6ed..42ed010f3c 100755 --- a/_includes/v1.3/v1-definitions.html +++ b/_includes/v1.3/v1-definitions.html @@ -6415,7 +6415,7 @@ The resulting set of endpoints can be viewed as:

names

-

Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]

+

Names by which this image is known. e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]

true

string array

diff --git a/_includes/v1.4/v1-definitions.html b/_includes/v1.4/v1-definitions.html index 254075b5cb..8e61a5b040 100755 --- a/_includes/v1.4/v1-definitions.html +++ b/_includes/v1.4/v1-definitions.html @@ -6671,7 +6671,7 @@ The resulting set of endpoints can be viewed as:

names

-

Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]

+

Names by which this image is known. e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]

true

string array

diff --git a/_includes/v1.5/v1-definitions.html b/_includes/v1.5/v1-definitions.html index ed1b302484..5dbb6c7094 100755 --- a/_includes/v1.5/v1-definitions.html +++ b/_includes/v1.5/v1-definitions.html @@ -6850,7 +6850,7 @@ The resulting set of endpoints can be viewed as:

names

-

Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]

+

Names by which this image is known. e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]

true

string array

diff --git a/cn/docs/admin/cluster-large.md b/cn/docs/admin/cluster-large.md index 9f6b33c94f..5670f7e0ae 100644 --- a/cn/docs/admin/cluster-large.md +++ b/cn/docs/admin/cluster-large.md @@ -85,7 +85,7 @@ AWS使用的规格为: ```yaml containers: - name: fluentd-cloud-logging - image: gcr.io/google_containers/fluentd-gcp:1.16 + image: k8s.gcr.io/fluentd-gcp:1.16 resources: limits: cpu: 100m diff --git a/cn/docs/admin/node-conformance.md b/cn/docs/admin/node-conformance.md index 6be4ba50a0..91af9fde63 100644 --- a/cn/docs/admin/node-conformance.md +++ b/cn/docs/admin/node-conformance.md @@ -40,7 +40,7 @@ title: 节点设置校验 # $LOG_DIR 是测试结果输出的路径。 sudo docker run -it --rm --privileged --net=host \ -v /:/rootfs -v $CONFIG_DIR:$CONFIG_DIR -v $LOG_DIR:/var/result \ - gcr.io/google_containers/node-test:0.2 + k8s.gcr.io/node-test:0.2 ``` ## 针对其他硬件体系结构运行节点合规性测试 @@ -61,7 +61,7 @@ Kubernetes 也为其他硬件体系结构的系统提供了节点合规性测试 sudo docker run -it --rm --privileged --net=host \ -v /:/rootfs:ro -v $CONFIG_DIR:$CONFIG_DIR -v $LOG_DIR:/var/result \ -e FOCUS=MirrorPod \ # 只运行MirrorPod测试 - gcr.io/google_containers/node-test:0.2 + k8s.gcr.io/node-test:0.2 ``` 为跳过指定的测试,用正则表达式来描述将要跳过的测试,并重载 `SKIP` 环境变量。 @@ -70,7 +70,7 @@ sudo docker run -it --rm --privileged --net=host \ sudo docker run -it --rm --privileged --net=host \ -v /:/rootfs:ro -v $CONFIG_DIR:$CONFIG_DIR -v $LOG_DIR:/var/result \ -e SKIP=MirrorPod \ # 运行除MirrorPod外的所有测试 - gcr.io/google_containers/node-test:0.2 + k8s.gcr.io/node-test:0.2 ``` 节点合规性测试是[节点端到端测试](https://github.com/kubernetes/community/blob/{{page.githubbranch}}/contributors/devel/e2e-node-tests.md)的一个容器化的版本。 diff --git a/cn/docs/concepts/architecture/nodes.md b/cn/docs/concepts/architecture/nodes.md index fa9bb53098..da999dd7a6 100644 --- a/cn/docs/concepts/architecture/nodes.md +++ b/cn/docs/concepts/architecture/nodes.md @@ -216,7 +216,7 @@ metadata: spec: containers: - name: sleep-forever - image: gcr.io/google_containers/pause:0.8.0 + image: k8s.gcr.io/pause:0.8.0 resources: requests: cpu: 100m diff --git a/cn/docs/concepts/configuration/manage-compute-resources-container.md b/cn/docs/concepts/configuration/manage-compute-resources-container.md index 6b06fc5064..341706ef10 100644 --- a/cn/docs/concepts/configuration/manage-compute-resources-container.md +++ b/cn/docs/concepts/configuration/manage-compute-resources-container.md @@ -199,7 +199,7 @@ Conditions: Events: FirstSeen LastSeen Count From SubobjectPath Reason Message Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {scheduler } scheduled Successfully assigned simmemleak-hra99 to kubernetes-node-tf0f - Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD pulled Pod container image "gcr.io/google_containers/pause:0.8.0" already present on machine + Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD pulled Pod container image "k8s.gcr.io/pause:0.8.0" already present on machine Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD created Created with docker id 6a41280f516d Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD started Started with docker id 6a41280f516d Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} spec.containers{simmemleak} created Created with docker id 87348f12526a diff --git a/cn/docs/concepts/configuration/pod-with-node-affinity.yaml b/cn/docs/concepts/configuration/pod-with-node-affinity.yaml index 7c38e19997..253d2b21ea 100644 --- a/cn/docs/concepts/configuration/pod-with-node-affinity.yaml +++ b/cn/docs/concepts/configuration/pod-with-node-affinity.yaml @@ -23,4 +23,4 @@ spec: - another-node-label-value containers: - name: with-node-affinity - image: gcr.io/google_containers/pause:2.0 \ No newline at end of file + image: k8s.gcr.io/pause:2.0 \ No newline at end of file diff --git a/cn/docs/concepts/configuration/pod-with-pod-affinity.yaml b/cn/docs/concepts/configuration/pod-with-pod-affinity.yaml index 3728537d5a..1897af901f 100644 --- a/cn/docs/concepts/configuration/pod-with-pod-affinity.yaml +++ b/cn/docs/concepts/configuration/pod-with-pod-affinity.yaml @@ -26,4 +26,4 @@ spec: topologyKey: kubernetes.io/hostname containers: - name: with-pod-affinity - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 diff --git a/cn/docs/concepts/configuration/secret.md b/cn/docs/concepts/configuration/secret.md index 9b61a725eb..c8c9319485 100644 --- a/cn/docs/concepts/configuration/secret.md +++ b/cn/docs/concepts/configuration/secret.md @@ -518,7 +518,7 @@ spec: secretName: dotfile-secret containers: - name: dotfile-test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: - ls - "-l" diff --git a/cn/docs/concepts/workloads/pods/pod-lifecycle.md b/cn/docs/concepts/workloads/pods/pod-lifecycle.md index 8420f318bc..176e57b829 100644 --- a/cn/docs/concepts/workloads/pods/pod-lifecycle.md +++ b/cn/docs/concepts/workloads/pods/pod-lifecycle.md @@ -108,7 +108,7 @@ spec: containers: - args: - /server - image: gcr.io/google_containers/liveness + image: k8s.gcr.io/liveness livenessProbe: httpGet: # when "host" is not defined, "PodIP" will be used diff --git a/cn/docs/tasks/access-application-cluster/redis-master.yaml b/cn/docs/tasks/access-application-cluster/redis-master.yaml index 57305a7a35..589de648f5 100644 --- a/cn/docs/tasks/access-application-cluster/redis-master.yaml +++ b/cn/docs/tasks/access-application-cluster/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/cn/docs/tasks/administer-cluster/cpu-memory-limit.md b/cn/docs/tasks/administer-cluster/cpu-memory-limit.md index b437c8a2f0..341e3070f6 100644 --- a/cn/docs/tasks/administer-cluster/cpu-memory-limit.md +++ b/cn/docs/tasks/administer-cluster/cpu-memory-limit.md @@ -178,7 +178,7 @@ $ kubectl get pods valid-pod --namespace=limit-example -o yaml | grep -C 6 resou uid: 3b1bfd7a-f53c-11e5-b066-64510658e388 spec: containers: - - image: gcr.io/google_containers/serve_hostname + - image: k8s.gcr.io/serve_hostname imagePullPolicy: Always name: kubernetes-serve-hostname resources: diff --git a/cn/docs/tasks/administer-cluster/dns-horizontal-autoscaler.yaml b/cn/docs/tasks/administer-cluster/dns-horizontal-autoscaler.yaml index f29dd2e275..b427829b5f 100644 --- a/cn/docs/tasks/administer-cluster/dns-horizontal-autoscaler.yaml +++ b/cn/docs/tasks/administer-cluster/dns-horizontal-autoscaler.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: autoscaler - image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0 + image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.0.0 resources: requests: cpu: "20m" diff --git a/cn/docs/tasks/administer-cluster/pod1.yaml b/cn/docs/tasks/administer-cluster/pod1.yaml index 733aa97d99..560b6aa0fb 100644 --- a/cn/docs/tasks/administer-cluster/pod1.yaml +++ b/cn/docs/tasks/administer-cluster/pod1.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: pod-with-no-annotation-container - image: gcr.io/google_containers/pause:2.0 \ No newline at end of file + image: k8s.gcr.io/pause:2.0 \ No newline at end of file diff --git a/cn/docs/tasks/administer-cluster/pod2.yaml b/cn/docs/tasks/administer-cluster/pod2.yaml index e1e280ff09..2f065efe65 100644 --- a/cn/docs/tasks/administer-cluster/pod2.yaml +++ b/cn/docs/tasks/administer-cluster/pod2.yaml @@ -8,4 +8,4 @@ spec: schedulerName: default-scheduler containers: - name: pod-with-default-annotation-container - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 diff --git a/cn/docs/tasks/administer-cluster/pod3.yaml b/cn/docs/tasks/administer-cluster/pod3.yaml index 63be0e0aa3..a1b8db3200 100644 --- a/cn/docs/tasks/administer-cluster/pod3.yaml +++ b/cn/docs/tasks/administer-cluster/pod3.yaml @@ -8,4 +8,4 @@ spec: schedulerName: my-scheduler containers: - name: pod-with-second-annotation-container - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 diff --git a/cn/docs/tasks/configure-pod-container/exec-liveness.yaml b/cn/docs/tasks/configure-pod-container/exec-liveness.yaml index 7b04a5eb8d..1ecb6cc25f 100644 --- a/cn/docs/tasks/configure-pod-container/exec-liveness.yaml +++ b/cn/docs/tasks/configure-pod-container/exec-liveness.yaml @@ -15,7 +15,7 @@ spec: - -c - touch /tmp/healthy; sleep 30; rm -rf /tmp/healthy; sleep 600 - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox livenessProbe: exec: diff --git a/cn/docs/tasks/configure-pod-container/http-liveness.yaml b/cn/docs/tasks/configure-pod-container/http-liveness.yaml index 6381ab3d1a..9d15abcd02 100644 --- a/cn/docs/tasks/configure-pod-container/http-liveness.yaml +++ b/cn/docs/tasks/configure-pod-container/http-liveness.yaml @@ -9,7 +9,7 @@ spec: - name: liveness args: - /server - image: gcr.io/google_containers/liveness + image: k8s.gcr.io/liveness livenessProbe: httpGet: path: /healthz diff --git a/cn/docs/tasks/configure-pod-container/tcp-liveness-readiness.yaml b/cn/docs/tasks/configure-pod-container/tcp-liveness-readiness.yaml index 08065019c5..08fb77ff0f 100644 --- a/cn/docs/tasks/configure-pod-container/tcp-liveness-readiness.yaml +++ b/cn/docs/tasks/configure-pod-container/tcp-liveness-readiness.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: goproxy - image: gcr.io/google_containers/goproxy:0.1 + image: k8s.gcr.io/goproxy:0.1 ports: - containerPort: 8080 readinessProbe: diff --git a/cn/docs/tasks/inject-data-application/dapi-envars-container.yaml b/cn/docs/tasks/inject-data-application/dapi-envars-container.yaml index 8b3b3a39d3..55bd4dd263 100644 --- a/cn/docs/tasks/inject-data-application/dapi-envars-container.yaml +++ b/cn/docs/tasks/inject-data-application/dapi-envars-container.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox:1.24 + image: k8s.gcr.io/busybox:1.24 command: [ "sh", "-c"] args: - while true; do diff --git a/cn/docs/tasks/inject-data-application/dapi-envars-pod.yaml b/cn/docs/tasks/inject-data-application/dapi-envars-pod.yaml index 00762373b3..071fa82bb3 100644 --- a/cn/docs/tasks/inject-data-application/dapi-envars-pod.yaml +++ b/cn/docs/tasks/inject-data-application/dapi-envars-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "sh", "-c"] args: - while true; do diff --git a/cn/docs/tasks/inject-data-application/dapi-volume-resources.yaml b/cn/docs/tasks/inject-data-application/dapi-volume-resources.yaml index 65770f283f..55af44ac1b 100644 --- a/cn/docs/tasks/inject-data-application/dapi-volume-resources.yaml +++ b/cn/docs/tasks/inject-data-application/dapi-volume-resources.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: client-container - image: gcr.io/google_containers/busybox:1.24 + image: k8s.gcr.io/busybox:1.24 command: ["sh", "-c"] args: - while true; do diff --git a/cn/docs/tasks/inject-data-application/dapi-volume.yaml b/cn/docs/tasks/inject-data-application/dapi-volume.yaml index 7126cefae5..864c99d11e 100644 --- a/cn/docs/tasks/inject-data-application/dapi-volume.yaml +++ b/cn/docs/tasks/inject-data-application/dapi-volume.yaml @@ -12,7 +12,7 @@ metadata: spec: containers: - name: client-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: ["sh", "-c"] args: - while true; do diff --git a/cn/docs/tasks/manage-gpus/scheduling-gpus.md b/cn/docs/tasks/manage-gpus/scheduling-gpus.md index 208d01caf1..6aded77023 100644 --- a/cn/docs/tasks/manage-gpus/scheduling-gpus.md +++ b/cn/docs/tasks/manage-gpus/scheduling-gpus.md @@ -41,13 +41,13 @@ spec: containers: - name: gpu-container-1 - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 resources: limits: alpha.kubernetes.io/nvidia-gpu: 2 # requesting 2 GPUs - name: gpu-container-2 - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 resources: limits: alpha.kubernetes.io/nvidia-gpu: 3 # requesting 3 GPUs @@ -141,7 +141,7 @@ metadata: spec: containers: - name: gpu-container-1 - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 resources: limits: alpha.kubernetes.io/nvidia-gpu: 1 diff --git a/cn/docs/tutorials/services/source-ip.md b/cn/docs/tutorials/services/source-ip.md index 18d0c4f902..92191c5cc4 100644 --- a/cn/docs/tutorials/services/source-ip.md +++ b/cn/docs/tutorials/services/source-ip.md @@ -33,7 +33,7 @@ Kubernetes 集群中运行的应用通过抽象的 Service 查找彼此,相互 你必须拥有一个正常工作的 Kubernetes 1.5 集群,用来运行本文中的示例。该示例使用一个简单的 nginx webserver 回送它接收到的请求的 HTTP 头中的源 IP 地址。你可以像下面这样创建它: ```console -$ kubectl run source-ip-app --image=gcr.io/google_containers/echoserver:1.4 +$ kubectl run source-ip-app --image=k8s.gcr.io/echoserver:1.4 deployment "source-ip-app" created ``` diff --git a/cn/docs/tutorials/stateful-application/basic-stateful-set.md b/cn/docs/tutorials/stateful-application/basic-stateful-set.md index 049c86de11..5f2b5f9edf 100644 --- a/cn/docs/tutorials/stateful-application/basic-stateful-set.md +++ b/cn/docs/tutorials/stateful-application/basic-stateful-set.md @@ -434,7 +434,7 @@ Kubernetes 1.7 版本的 StatefulSet 控制器支持自动更新。更新策略 Patch `web` StatefulSet 的容器镜像。 ```shell -kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"gcr.io/google_containers/nginx-slim:0.7"}]' +kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"k8s.gcr.io/nginx-slim:0.7"}]' "web" patched ``` @@ -470,9 +470,9 @@ web-0 1/1 Running 0 3s ```shell{% raw %} kubectl get pod -l app=nginx -o jsonpath='{range .items[*]}{.metadata.name}{"\t"}{.spec.containers[0].image}{"\n"}{end}' -web-0 gcr.io/google_containers/nginx-slim:0.7 -web-1 gcr.io/google_containers/nginx-slim:0.8 -web-2 gcr.io/google_containers/nginx-slim:0.8 +web-0 k8s.gcr.io/nginx-slim:0.7 +web-1 k8s.gcr.io/nginx-slim:0.8 +web-2 k8s.gcr.io/nginx-slim:0.8 {% endraw %}``` `web-0` has had its image updated, but `web-0` and `web-1` still have the original @@ -513,9 +513,9 @@ web-2 1/1 Running 0 36s ```shell{% raw %} kubectl get pod -l app=nginx -o jsonpath='{range .items[*]}{.metadata.name}{"\t"}{.spec.containers[0].image}{"\n"}{end}' -web-0 gcr.io/google_containers/nginx-slim:0.7 -web-1 gcr.io/google_containers/nginx-slim:0.7 -web-2 gcr.io/google_containers/nginx-slim:0.7 +web-0 k8s.gcr.io/nginx-slim:0.7 +web-1 k8s.gcr.io/nginx-slim:0.7 +web-2 k8s.gcr.io/nginx-slim:0.7 {% endraw %} ``` @@ -539,7 +539,7 @@ statefulset "web" patched 在一个终端窗口中 patch `web` StatefulSet 来再次的改变容器镜像。 ```shell -kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"gcr.io/google_containers/nginx-slim:0.8"}]' +kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"k8s.gcr.io/nginx-slim:0.8"}]' statefulset "web" patched ``` @@ -589,9 +589,9 @@ StatefulSet 里的 Pod 采用和序号相反的顺序更新。在更新下一个 ```shell{% raw %} for p in 0 1 2; do kubectl get po web-$p --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}'; echo; done -gcr.io/google_containers/nginx-slim:0.8 -gcr.io/google_containers/nginx-slim:0.8 -gcr.io/google_containers/nginx-slim:0.8 +k8s.gcr.io/nginx-slim:0.8 +k8s.gcr.io/nginx-slim:0.8 +k8s.gcr.io/nginx-slim:0.8 {% endraw %} ``` @@ -617,7 +617,7 @@ statefulset "web" patched 再次 Patch StatefulSet 来改变容器镜像。 ```shell -kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"gcr.io/google_containers/nginx-slim:0.7"}]' +kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"k8s.gcr.io/nginx-slim:0.7"}]' statefulset "web" patched ``` @@ -646,7 +646,7 @@ web-2 1/1 Running 0 18s ```shell{% raw %} get po web-2 --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}' -gcr.io/google_containers/nginx-slim:0.8 +k8s.gcr.io/nginx-slim:0.8 {% endraw %} ``` @@ -683,7 +683,7 @@ web-2 1/1 Running 0 18s ```shell{% raw %} kubectl get po web-2 --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}' -gcr.io/google_containers/nginx-slim:0.7 +k8s.gcr.io/nginx-slim:0.7 {% endraw %} ``` @@ -721,7 +721,7 @@ web-1 1/1 Running 0 18s ```shell{% raw %} get po web-1 --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}' -gcr.io/google_containers/nginx-slim:0.8 +k8s.gcr.io/nginx-slim:0.8 {% endraw %} ``` @@ -767,9 +767,9 @@ web-0 1/1 Running 0 3s ```shell{% raw %} for p in 0 1 2; do kubectl get po web-$p --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}'; echo; done -gcr.io/google_containers/nginx-slim:0.7 -gcr.io/google_containers/nginx-slim:0.7 -gcr.io/google_containers/nginx-slim:0.7 +k8s.gcr.io/nginx-slim:0.7 +k8s.gcr.io/nginx-slim:0.7 +k8s.gcr.io/nginx-slim:0.7 {% endraw %} ``` diff --git a/cn/docs/tutorials/stateful-application/web.yaml b/cn/docs/tutorials/stateful-application/web.yaml index 6c2770082b..e56d43b76b 100644 --- a/cn/docs/tutorials/stateful-application/web.yaml +++ b/cn/docs/tutorials/stateful-application/web.yaml @@ -26,7 +26,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/cn/docs/tutorials/stateful-application/webp.yaml b/cn/docs/tutorials/stateful-application/webp.yaml index 74a71c90ac..948a1c01d9 100644 --- a/cn/docs/tutorials/stateful-application/webp.yaml +++ b/cn/docs/tutorials/stateful-application/webp.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/docs/admin/cluster-large.md b/docs/admin/cluster-large.md index b443d42132..21c50531aa 100644 --- a/docs/admin/cluster-large.md +++ b/docs/admin/cluster-large.md @@ -86,7 +86,7 @@ For example: ```yaml containers: - name: fluentd-cloud-logging - image: gcr.io/google_containers/fluentd-gcp:1.16 + image: k8s.gcr.io/fluentd-gcp:1.16 resources: limits: cpu: 100m diff --git a/docs/admin/federation/index.md b/docs/admin/federation/index.md index 9127a1aa36..6936a43b20 100644 --- a/docs/admin/federation/index.md +++ b/docs/admin/federation/index.md @@ -87,9 +87,9 @@ images or you can build them yourself from HEAD. ### Using official release images As part of every Kubernetes release, official release images are pushed to -`gcr.io/google_containers`. To use the images in this repository, you can +`k8s.gcr.io`. To use the images in this repository, you can set the container image fields in the following configs to point to the -images in this repository. `gcr.io/google_containers/hyperkube` image +images in this repository. `k8s.gcr.io/hyperkube` image includes the federation-apiserver and federation-controller-manager binaries, so you can point the corresponding configs for those components to the hyperkube image. @@ -315,8 +315,8 @@ official release images or you can build from HEAD. #### Using official release images -As part of every release, images are pushed to `gcr.io/google_containers`. To use -these images, set env var `FEDERATION_PUSH_REPO_BASE=gcr.io/google_containers` +As part of every release, images are pushed to `k8s.gcr.io`. To use +these images, set env var `FEDERATION_PUSH_REPO_BASE=k8s.gcr.io` This will always use the latest image. To use the hyperkube image which includes federation-apiserver and federation-controller-manager from a specific release, set the @@ -345,7 +345,7 @@ Once you have the images, you can run these as pods on your existing kubernetes The command to run these pods on an existing GCE cluster will look like: ```shell -$ KUBERNETES_PROVIDER=gce FEDERATION_DNS_PROVIDER=google-clouddns FEDERATION_NAME=myfederation DNS_ZONE_NAME=myfederation.example FEDERATION_PUSH_REPO_BASE=gcr.io/google_containers ./federation/cluster/federation-up.sh +$ KUBERNETES_PROVIDER=gce FEDERATION_DNS_PROVIDER=google-clouddns FEDERATION_NAME=myfederation DNS_ZONE_NAME=myfederation.example FEDERATION_PUSH_REPO_BASE=k8s.gcr.io ./federation/cluster/federation-up.sh ``` `KUBERNETES_PROVIDER` is the cloud provider. diff --git a/docs/admin/high-availability/etcd.yaml b/docs/admin/high-availability/etcd.yaml index 8bcf52b159..364791da6f 100644 --- a/docs/admin/high-availability/etcd.yaml +++ b/docs/admin/high-availability/etcd.yaml @@ -5,7 +5,7 @@ metadata: spec: hostNetwork: true containers: - - image: gcr.io/google_containers/etcd:3.0.17 + - image: k8s.gcr.io/etcd:3.0.17 name: etcd-container command: - /usr/local/bin/etcd diff --git a/docs/admin/high-availability/kube-apiserver.yaml b/docs/admin/high-availability/kube-apiserver.yaml index 33d5cff5cd..057764fc52 100644 --- a/docs/admin/high-availability/kube-apiserver.yaml +++ b/docs/admin/high-availability/kube-apiserver.yaml @@ -6,7 +6,7 @@ spec: hostNetwork: true containers: - name: kube-apiserver - image: gcr.io/google_containers/kube-apiserver:9680e782e08a1a1c94c656190011bd02 + image: k8s.gcr.io/kube-apiserver:9680e782e08a1a1c94c656190011bd02 command: - /bin/sh - -c diff --git a/docs/admin/high-availability/kube-controller-manager.yaml b/docs/admin/high-availability/kube-controller-manager.yaml index 0ecbebb276..ba481fbfc3 100644 --- a/docs/admin/high-availability/kube-controller-manager.yaml +++ b/docs/admin/high-availability/kube-controller-manager.yaml @@ -10,7 +10,7 @@ spec: - /usr/local/bin/kube-controller-manager --master=127.0.0.1:8080 --cluster-name=e2e-test-bburns --cluster-cidr=10.245.0.0/16 --allocate-node-cidrs=true --cloud-provider=gce --service-account-private-key-file=/srv/kubernetes/server.key --v=2 --leader-elect=true 1>>/var/log/kube-controller-manager.log 2>&1 - image: gcr.io/google_containers/kube-controller-manager:fda24638d51a48baa13c35337fcd4793 + image: k8s.gcr.io/kube-controller-manager:fda24638d51a48baa13c35337fcd4793 livenessProbe: httpGet: path: /healthz diff --git a/docs/admin/high-availability/kube-scheduler.yaml b/docs/admin/high-availability/kube-scheduler.yaml index 40c863da48..b4ef0e466e 100644 --- a/docs/admin/high-availability/kube-scheduler.yaml +++ b/docs/admin/high-availability/kube-scheduler.yaml @@ -6,7 +6,7 @@ spec: hostNetwork: true containers: - name: kube-scheduler - image: gcr.io/google_containers/kube-scheduler:34d0b8f8b31e27937327961528739bc9 + image: k8s.gcr.io/kube-scheduler:34d0b8f8b31e27937327961528739bc9 command: - /bin/sh - -c diff --git a/docs/admin/high-availability/podmaster.yaml b/docs/admin/high-availability/podmaster.yaml index d634225b93..cd20e15b38 100644 --- a/docs/admin/high-availability/podmaster.yaml +++ b/docs/admin/high-availability/podmaster.yaml @@ -6,7 +6,7 @@ spec: hostNetwork: true containers: - name: scheduler-elector - image: gcr.io/google_containers/podmaster:1.1 + image: k8s.gcr.io/podmaster:1.1 command: - /podmaster - --etcd-servers=http://127.0.0.1:4001 @@ -20,7 +20,7 @@ spec: - mountPath: /manifests name: manifests - name: controller-manager-elector - image: gcr.io/google_containers/podmaster:1.1 + image: k8s.gcr.io/podmaster:1.1 command: - /podmaster - --etcd-servers=http://127.0.0.1:4001 diff --git a/docs/admin/limitrange/invalid-pod.yaml b/docs/admin/limitrange/invalid-pod.yaml index b63f25deba..ecb45dd95f 100644 --- a/docs/admin/limitrange/invalid-pod.yaml +++ b/docs/admin/limitrange/invalid-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: kubernetes-serve-hostname - image: gcr.io/google_containers/serve_hostname + image: k8s.gcr.io/serve_hostname resources: limits: cpu: "3" diff --git a/docs/admin/limitrange/valid-pod.yaml b/docs/admin/limitrange/valid-pod.yaml index c1ec54183b..d83e91267a 100644 --- a/docs/admin/limitrange/valid-pod.yaml +++ b/docs/admin/limitrange/valid-pod.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: kubernetes-serve-hostname - image: gcr.io/google_containers/serve_hostname + image: k8s.gcr.io/serve_hostname resources: limits: cpu: "1" diff --git a/docs/admin/multiple-schedulers/pod1.yaml b/docs/admin/multiple-schedulers/pod1.yaml index 6cf8fec25a..60cdab226d 100644 --- a/docs/admin/multiple-schedulers/pod1.yaml +++ b/docs/admin/multiple-schedulers/pod1.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: pod-with-no-annotation-container - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 diff --git a/docs/admin/multiple-schedulers/pod2.yaml b/docs/admin/multiple-schedulers/pod2.yaml index e1e280ff09..2f065efe65 100644 --- a/docs/admin/multiple-schedulers/pod2.yaml +++ b/docs/admin/multiple-schedulers/pod2.yaml @@ -8,4 +8,4 @@ spec: schedulerName: default-scheduler containers: - name: pod-with-default-annotation-container - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 diff --git a/docs/admin/multiple-schedulers/pod3.yaml b/docs/admin/multiple-schedulers/pod3.yaml index 63be0e0aa3..a1b8db3200 100644 --- a/docs/admin/multiple-schedulers/pod3.yaml +++ b/docs/admin/multiple-schedulers/pod3.yaml @@ -8,4 +8,4 @@ spec: schedulerName: my-scheduler containers: - name: pod-with-second-annotation-container - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 diff --git a/docs/admin/node-conformance.md b/docs/admin/node-conformance.md index 5c3997fe53..5b6a1297fa 100644 --- a/docs/admin/node-conformance.md +++ b/docs/admin/node-conformance.md @@ -48,7 +48,7 @@ other Kubelet flags you may care: # $LOG_DIR is the test output path. sudo docker run -it --rm --privileged --net=host \ -v /:/rootfs -v $CONFIG_DIR:$CONFIG_DIR -v $LOG_DIR:/var/result \ - gcr.io/google_containers/node-test:0.2 + k8s.gcr.io/node-test:0.2 ``` ## Running Node Conformance Test for Other Architectures @@ -71,7 +71,7 @@ regular expression of tests you want to run. sudo docker run -it --rm --privileged --net=host \ -v /:/rootfs:ro -v $CONFIG_DIR:$CONFIG_DIR -v $LOG_DIR:/var/result \ -e FOCUS=MirrorPod \ # Only run MirrorPod test - gcr.io/google_containers/node-test:0.2 + k8s.gcr.io/node-test:0.2 ``` To skip specific tests, overwrite the environment variable `SKIP` with the @@ -81,7 +81,7 @@ regular expression of tests you want to skip. sudo docker run -it --rm --privileged --net=host \ -v /:/rootfs:ro -v $CONFIG_DIR:$CONFIG_DIR -v $LOG_DIR:/var/result \ -e SKIP=MirrorPod \ # Run all conformance tests but skip MirrorPod test - gcr.io/google_containers/node-test:0.2 + k8s.gcr.io/node-test:0.2 ``` Node conformance test is a containerized version of [node e2e test](https://github.com/kubernetes/community/blob/{{page.githubbranch}}/contributors/devel/e2e-node-tests.md). diff --git a/docs/api-reference/v1.9/index.html b/docs/api-reference/v1.9/index.html index 18cc2917db..c255107dc7 100644 --- a/docs/api-reference/v1.9/index.html +++ b/docs/api-reference/v1.9/index.html @@ -56950,7 +56950,7 @@ Appears In: names
string array -Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] +Names by which this image is known. e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] sizeBytes
integer diff --git a/docs/concepts/architecture/nodes.md b/docs/concepts/architecture/nodes.md index 4cc4424111..27b9e01e30 100644 --- a/docs/concepts/architecture/nodes.md +++ b/docs/concepts/architecture/nodes.md @@ -265,7 +265,7 @@ metadata: spec: containers: - name: sleep-forever - image: gcr.io/google_containers/pause:0.8.0 + image: k8s.gcr.io/pause:0.8.0 resources: requests: cpu: 100m diff --git a/docs/concepts/cluster-administration/two-files-counter-pod-agent-sidecar.yaml b/docs/concepts/cluster-administration/two-files-counter-pod-agent-sidecar.yaml index 9737f13493..b37b616e6f 100644 --- a/docs/concepts/cluster-administration/two-files-counter-pod-agent-sidecar.yaml +++ b/docs/concepts/cluster-administration/two-files-counter-pod-agent-sidecar.yaml @@ -22,7 +22,7 @@ spec: - name: varlog mountPath: /var/log - name: count-agent - image: gcr.io/google_containers/fluentd-gcp:1.30 + image: k8s.gcr.io/fluentd-gcp:1.30 env: - name: FLUENTD_ARGS value: -c /etc/fluentd-config/fluentd.conf diff --git a/docs/concepts/configuration/manage-compute-resources-container.md b/docs/concepts/configuration/manage-compute-resources-container.md index cced47f00b..679b1eaffb 100644 --- a/docs/concepts/configuration/manage-compute-resources-container.md +++ b/docs/concepts/configuration/manage-compute-resources-container.md @@ -285,7 +285,7 @@ Conditions: Events: FirstSeen LastSeen Count From SubobjectPath Reason Message Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {scheduler } scheduled Successfully assigned simmemleak-hra99 to kubernetes-node-tf0f - Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD pulled Pod container image "gcr.io/google_containers/pause:0.8.0" already present on machine + Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD pulled Pod container image "k8s.gcr.io/pause:0.8.0" already present on machine Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD created Created with docker id 6a41280f516d Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} implicitly required container POD started Started with docker id 6a41280f516d Tue, 07 Jul 2015 12:53:51 -0700 Tue, 07 Jul 2015 12:53:51 -0700 1 {kubelet kubernetes-node-tf0f} spec.containers{simmemleak} created Created with docker id 87348f12526a diff --git a/docs/concepts/configuration/pod-with-node-affinity.yaml b/docs/concepts/configuration/pod-with-node-affinity.yaml index 7c38e19997..253d2b21ea 100644 --- a/docs/concepts/configuration/pod-with-node-affinity.yaml +++ b/docs/concepts/configuration/pod-with-node-affinity.yaml @@ -23,4 +23,4 @@ spec: - another-node-label-value containers: - name: with-node-affinity - image: gcr.io/google_containers/pause:2.0 \ No newline at end of file + image: k8s.gcr.io/pause:2.0 \ No newline at end of file diff --git a/docs/concepts/configuration/pod-with-pod-affinity.yaml b/docs/concepts/configuration/pod-with-pod-affinity.yaml index 3728537d5a..1897af901f 100644 --- a/docs/concepts/configuration/pod-with-pod-affinity.yaml +++ b/docs/concepts/configuration/pod-with-pod-affinity.yaml @@ -26,4 +26,4 @@ spec: topologyKey: kubernetes.io/hostname containers: - name: with-pod-affinity - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 diff --git a/docs/concepts/configuration/secret.md b/docs/concepts/configuration/secret.md index ee8f85d4b5..54db877ce6 100644 --- a/docs/concepts/configuration/secret.md +++ b/docs/concepts/configuration/secret.md @@ -618,7 +618,7 @@ spec: secretName: dotfile-secret containers: - name: dotfile-test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: - ls - "-l" diff --git a/docs/concepts/storage/persistent-volumes.md b/docs/concepts/storage/persistent-volumes.md index 059202db28..50c819fc1e 100644 --- a/docs/concepts/storage/persistent-volumes.md +++ b/docs/concepts/storage/persistent-volumes.md @@ -125,7 +125,7 @@ spec: path: /any/path/it/will/be/replaced containers: - name: pv-recycler - image: "gcr.io/google_containers/busybox" + image: "k8s.gcr.io/busybox" command: ["/bin/sh", "-c", "test -e /scrub && rm -rf /scrub/..?* /scrub/.[!.]* /scrub/* && test -z \"$(ls -A /scrub)\" || exit 1"] volumeMounts: - name: vol diff --git a/docs/concepts/storage/volumes.md b/docs/concepts/storage/volumes.md index 247c593d75..2c5ccf492d 100644 --- a/docs/concepts/storage/volumes.md +++ b/docs/concepts/storage/volumes.md @@ -131,7 +131,7 @@ metadata: name: test-ebs spec: containers: - - image: gcr.io/google_containers/test-webserver + - image: k8s.gcr.io/test-webserver name: test-container volumeMounts: - mountPath: /test-ebs @@ -246,7 +246,7 @@ metadata: name: test-pd spec: containers: - - image: gcr.io/google_containers/test-webserver + - image: k8s.gcr.io/test-webserver name: test-container volumeMounts: - mountPath: /cache @@ -326,7 +326,7 @@ metadata: name: test-pd spec: containers: - - image: gcr.io/google_containers/test-webserver + - image: k8s.gcr.io/test-webserver name: test-container volumeMounts: - mountPath: /test-pd @@ -432,7 +432,7 @@ metadata: name: test-pd spec: containers: - - image: gcr.io/google_containers/test-webserver + - image: k8s.gcr.io/test-webserver name: test-container volumeMounts: - mountPath: /test-pd @@ -665,7 +665,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: /mnt @@ -736,7 +736,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 @@ -866,7 +866,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/docs/concepts/workloads/controllers/statefulset.md b/docs/concepts/workloads/controllers/statefulset.md index 0fd76d4c8d..8fa4c6f8c7 100644 --- a/docs/concepts/workloads/controllers/statefulset.md +++ b/docs/concepts/workloads/controllers/statefulset.md @@ -87,7 +87,7 @@ spec: terminationGracePeriodSeconds: 10 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/docs/concepts/workloads/pods/pod-lifecycle.md b/docs/concepts/workloads/pods/pod-lifecycle.md index 3bf5f80a53..8e22ec2556 100644 --- a/docs/concepts/workloads/pods/pod-lifecycle.md +++ b/docs/concepts/workloads/pods/pod-lifecycle.md @@ -198,7 +198,7 @@ spec: containers: - args: - /server - image: gcr.io/google_containers/liveness + image: k8s.gcr.io/liveness livenessProbe: httpGet: # when "host" is not defined, "PodIP" will be used diff --git a/docs/getting-started-guides/fluentd-gcp.yaml b/docs/getting-started-guides/fluentd-gcp.yaml index a81427bdfc..d212752cca 100644 --- a/docs/getting-started-guides/fluentd-gcp.yaml +++ b/docs/getting-started-guides/fluentd-gcp.yaml @@ -14,7 +14,7 @@ spec: dnsPolicy: Default containers: - name: fluentd-cloud-logging - image: gcr.io/google_containers/fluentd-gcp:2.0.2 + image: k8s.gcr.io/fluentd-gcp:2.0.2 # If fluentd consumes its own logs, the following situation may happen: # fluentd fails to send a chunk to the server => writes it to the log => # tries to send this message to the server => fails to send a chunk and so on. diff --git a/docs/getting-started-guides/minikube.md b/docs/getting-started-guides/minikube.md index 470a452c11..57fbf6cadb 100644 --- a/docs/getting-started-guides/minikube.md +++ b/docs/getting-started-guides/minikube.md @@ -46,7 +46,7 @@ Running pre-create checks... Creating machine... Starting local Kubernetes cluster... -$ kubectl run hello-minikube --image=gcr.io/google_containers/echoserver:1.4 --port=8080 +$ kubectl run hello-minikube --image=k8s.gcr.io/echoserver:1.4 --port=8080 deployment "hello-minikube" created $ kubectl expose deployment hello-minikube --type=NodePort service "hello-minikube" exposed diff --git a/docs/reference/generated/kubefed_init.md b/docs/reference/generated/kubefed_init.md index b8920cb603..d58736792e 100644 --- a/docs/reference/generated/kubefed_init.md +++ b/docs/reference/generated/kubefed_init.md @@ -40,13 +40,13 @@ kubefed init FEDERATION_NAME --host-cluster-context=HOST_CONTEXT --dns-provider-config string Config file path on local file system for configuring DNS provider. --dns-zone-name string DNS suffix for this federation. Federated Service DNS names are published with this suffix. --dry-run dry run without sending commands to server. - --etcd-image string Image to use for etcd server. (default "gcr.io/google_containers/etcd:3.1.10") + --etcd-image string Image to use for etcd server. (default "k8s.gcr.io/etcd:3.1.10") --etcd-persistent-storage Use persistent volume for etcd. Defaults to 'true'. (default true) --etcd-pv-capacity string Size of persistent volume claim to be used for etcd. (default "10Gi") --etcd-pv-storage-class string The storage class of the persistent volume claim used for etcd. Must be provided if a default storage class is not enabled for the host cluster. --federation-system-namespace string Namespace in the host cluster where the federation system components are installed (default "federation-system") --host-cluster-context string Host cluster context - --image string Image to use for federation API server and controller manager binaries. (default "gcr.io/google_containers/hyperkube-amd64:v0.0.0-master_$Format:%h$") + --image string Image to use for federation API server and controller manager binaries. (default "k8s.gcr.io/hyperkube-amd64:v0.0.0-master_$Format:%h$") --image-pull-policy string PullPolicy describes a policy for if/when to pull a container image. The default pull policy is IfNotPresent which will not pull an image if it already exists. (default "IfNotPresent") --image-pull-secrets string Provide secrets that can access the private registry. --kubeconfig string Path to the kubeconfig file to use for CLI requests. diff --git a/docs/reference/generated/kubelet.md b/docs/reference/generated/kubelet.md index 0f3cdf79f1..c97c0bc95c 100644 --- a/docs/reference/generated/kubelet.md +++ b/docs/reference/generated/kubelet.md @@ -167,7 +167,7 @@ VolumeScheduling=true|false (ALPHA - default=false) --node-status-update-frequency duration Specifies how often kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller. (default 10s) --oom-score-adj int32 The oom-score-adj value for kubelet process. Values must be within the range [-1000, 1000] (default -999) --pod-cidr string The CIDR to use for pod IP addresses, only used in standalone mode. In cluster mode, this is obtained from the master. - --pod-infra-container-image string The image whose network/ipc namespaces containers in each pod will use. (default "gcr.io/google_containers/pause-amd64:3.0") + --pod-infra-container-image string The image whose network/ipc namespaces containers in each pod will use. (default "k8s.gcr.io/pause-amd64:3.0") --pod-manifest-path string Path to the directory containing pod manifest files to run, or the path to a single pod manifest file. Files starting with dots will be ignored. --pods-per-core int32 Number of Pods per core that can run on this Kubelet. The total number of Pods on this Kubelet cannot exceed max-pods, so max-pods will be used if this calculation results in a larger number of Pods allowed on the Kubelet. A value of 0 disables this limit. --port int32 The port for the Kubelet to serve on. (default 10250) diff --git a/docs/reference/generated/kubernetes-api/v1.9/index.html b/docs/reference/generated/kubernetes-api/v1.9/index.html index 0f81fe78e8..9097c7be2a 100644 --- a/docs/reference/generated/kubernetes-api/v1.9/index.html +++ b/docs/reference/generated/kubernetes-api/v1.9/index.html @@ -59719,7 +59719,7 @@ Appears In: names
string array -Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] +Names by which this image is known. e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] sizeBytes
integer diff --git a/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_all.md b/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_all.md index edd1b76971..082f3e83cc 100644 --- a/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_all.md +++ b/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_all.md @@ -35,7 +35,7 @@ HighAvailability=true|false (ALPHA - default=false) SelfHosting=true|false (BETA - default=false) StoreCertsInSecrets=true|false (ALPHA - default=false) SupportIPVSProxyMode=true|false (ALPHA - default=false) - --image-repository string Choose a container registry to pull control plane images from (default "gcr.io/google_containers") + --image-repository string Choose a container registry to pull control plane images from (default "k8s.gcr.io") --kubeconfig string The KubeConfig file to use when talking to the cluster (default "/etc/kubernetes/admin.conf") --kubernetes-version string Choose a specific Kubernetes version for the control plane (default "stable-1.8") --pod-network-cidr string The range of IP addresses used for the Pod network diff --git a/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_kube-dns.md b/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_kube-dns.md index 414f2a1b7c..32043b6e91 100644 --- a/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_kube-dns.md +++ b/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_kube-dns.md @@ -24,7 +24,7 @@ HighAvailability=true|false (ALPHA - default=false) SelfHosting=true|false (BETA - default=false) StoreCertsInSecrets=true|false (ALPHA - default=false) SupportIPVSProxyMode=true|false (ALPHA - default=false) - --image-repository string Choose a container registry to pull control plane images from (default "gcr.io/google_containers") + --image-repository string Choose a container registry to pull control plane images from (default "k8s.gcr.io") --kubeconfig string The KubeConfig file to use when talking to the cluster (default "/etc/kubernetes/admin.conf") --kubernetes-version string Choose a specific Kubernetes version for the control plane (default "stable-1.8") --service-cidr string The range of IP address used for service VIPs (default "10.96.0.0/12") diff --git a/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_kube-proxy.md b/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_kube-proxy.md index d1bca6ebff..662f20c924 100644 --- a/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_kube-proxy.md +++ b/docs/reference/setup-tools/kubeadm/generated/kubeadm_alpha_phase_addon_kube-proxy.md @@ -18,7 +18,7 @@ kubeadm alpha phase addon kube-proxy --apiserver-advertise-address string The IP address or DNS name the API server is accessible on --apiserver-bind-port int32 The port the API server is accessible on (default 6443) --config string Path to a kubeadm config file. WARNING: Usage of a configuration file is experimental! - --image-repository string Choose a container registry to pull control plane images from (default "gcr.io/google_containers") + --image-repository string Choose a container registry to pull control plane images from (default "k8s.gcr.io") --kubeconfig string The KubeConfig file to use when talking to the cluster (default "/etc/kubernetes/admin.conf") --kubernetes-version string Choose a specific Kubernetes version for the control plane (default "stable-1.8") --pod-network-cidr string The range of IP addresses used for the Pod network diff --git a/docs/reference/setup-tools/kubeadm/kubeadm-init.md b/docs/reference/setup-tools/kubeadm/kubeadm-init.md index 96419b5ee2..1071eb028b 100755 --- a/docs/reference/setup-tools/kubeadm/kubeadm-init.md +++ b/docs/reference/setup-tools/kubeadm/kubeadm-init.md @@ -156,7 +156,7 @@ More information on custom arguments can be found here: ### Using custom images {#custom-images} -By default, kubeadm pulls images from `gcr.io/google_containers`, unless +By default, kubeadm pulls images from `k8s.gcr.io`, unless the requested Kubernetes version is a CI version. In this case, `gcr.io/kubernetes-ci-images` is used. @@ -164,9 +164,9 @@ You can override this behavior by using [kubeadm with a configuration file](#con Allowed customization are: * To provide an alternative `imageRepository` to be used instead of - `gcr.io/google_containers`. + `k8s.gcr.io`. * To provide a `unifiedControlPlaneImage` to be used instead of different images for control plane components. -* To provide a specific `etcd.image` to be used instead of the image available at`gcr.io/google_containers`. +* To provide a specific `etcd.image` to be used instead of the image available at`k8s.gcr.io`. ### Using custom certificates {#custom-certificates} @@ -370,15 +370,15 @@ For running kubeadm without an internet connection you have to pre-pull the requ | Image Name | v1.8 release branch version | v1.9 release branch version | |----------------------------------------------------------|-----------------------------|-----------------------------| -| gcr.io/google_containers/kube-apiserver-${ARCH} | v1.8.x | v1.9.x | -| gcr.io/google_containers/kube-controller-manager-${ARCH} | v1.8.x | v1.9.x | -| gcr.io/google_containers/kube-scheduler-${ARCH} | v1.8.x | v1.9.x | -| gcr.io/google_containers/kube-proxy-${ARCH} | v1.8.x | v1.9.x | -| gcr.io/google_containers/etcd-${ARCH} | 3.0.17 | 3.1.10 | -| gcr.io/google_containers/pause-${ARCH} | 3.0 | 3.0 | -| gcr.io/google_containers/k8s-dns-sidecar-${ARCH} | 1.14.5 | 1.14.7 | -| gcr.io/google_containers/k8s-dns-kube-dns-${ARCH} | 1.14.5 | 1.14.7 | -| gcr.io/google_containers/k8s-dns-dnsmasq-nanny-${ARCH} | 1.14.5 | 1.14.7 | +| k8s.gcr.io/kube-apiserver-${ARCH} | v1.8.x | v1.9.x | +| k8s.gcr.io/kube-controller-manager-${ARCH} | v1.8.x | v1.9.x | +| k8s.gcr.io/kube-scheduler-${ARCH} | v1.8.x | v1.9.x | +| k8s.gcr.io/kube-proxy-${ARCH} | v1.8.x | v1.9.x | +| k8s.gcr.io/etcd-${ARCH} | 3.0.17 | 3.1.10 | +| k8s.gcr.io/pause-${ARCH} | 3.0 | 3.0 | +| k8s.gcr.io/k8s-dns-sidecar-${ARCH} | 1.14.5 | 1.14.7 | +| k8s.gcr.io/k8s-dns-kube-dns-${ARCH} | 1.14.5 | 1.14.7 | +| k8s.gcr.io/k8s-dns-dnsmasq-nanny-${ARCH} | 1.14.5 | 1.14.7 | Here `v1.8.x` means the "latest patch release of the v1.8 branch". diff --git a/docs/resources-reference/v1.5/index.html b/docs/resources-reference/v1.5/index.html index 36a50de98e..7a19f7f266 100644 --- a/docs/resources-reference/v1.5/index.html +++ b/docs/resources-reference/v1.5/index.html @@ -5643,7 +5643,7 @@ Appears In NodeStatus names
string array -Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] +Names by which this image is known. e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] sizeBytes
integer diff --git a/docs/resources-reference/v1.6/index.html b/docs/resources-reference/v1.6/index.html index fa2c13c0c9..69c9b2c997 100644 --- a/docs/resources-reference/v1.6/index.html +++ b/docs/resources-reference/v1.6/index.html @@ -6169,7 +6169,7 @@ Appears In NodeStatus names
string array -Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] +Names by which this image is known. e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] sizeBytes
integer diff --git a/docs/resources-reference/v1.7/index.html b/docs/resources-reference/v1.7/index.html index 9b6e230640..2d0892a4ec 100644 --- a/docs/resources-reference/v1.7/index.html +++ b/docs/resources-reference/v1.7/index.html @@ -7181,7 +7181,7 @@ Appears In: names
string array -Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] +Names by which this image is known. e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] sizeBytes
integer diff --git a/docs/tasks/access-application-cluster/redis-master.yaml b/docs/tasks/access-application-cluster/redis-master.yaml index 57305a7a35..589de648f5 100644 --- a/docs/tasks/access-application-cluster/redis-master.yaml +++ b/docs/tasks/access-application-cluster/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/docs/tasks/administer-cluster/cloud-controller-manager-daemonset-example.yaml b/docs/tasks/administer-cluster/cloud-controller-manager-daemonset-example.yaml index dd92c686ad..b517e2dc48 100644 --- a/docs/tasks/administer-cluster/cloud-controller-manager-daemonset-example.yaml +++ b/docs/tasks/administer-cluster/cloud-controller-manager-daemonset-example.yaml @@ -42,9 +42,9 @@ spec: serviceAccountName: cloud-controller-manager containers: - name: cloud-controller-manager - # for in-tree providers we use gcr.io/google_containers/cloud-controller-manager + # for in-tree providers we use k8s.gcr.io/cloud-controller-manager # this can be replaced with any other image for out-of-tree providers - image: gcr.io/google_containers/cloud-controller-manager:v1.8.0 + image: k8s.gcr.io/cloud-controller-manager:v1.8.0 command: - /usr/local/bin/cloud-controller-manager - --cloud-provider= # Add your own cloud provider here! diff --git a/docs/tasks/administer-cluster/dns-horizontal-autoscaler.yaml b/docs/tasks/administer-cluster/dns-horizontal-autoscaler.yaml index f29dd2e275..b427829b5f 100644 --- a/docs/tasks/administer-cluster/dns-horizontal-autoscaler.yaml +++ b/docs/tasks/administer-cluster/dns-horizontal-autoscaler.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: autoscaler - image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0 + image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.0.0 resources: requests: cpu: "20m" diff --git a/docs/tasks/administer-cluster/pod1.yaml b/docs/tasks/administer-cluster/pod1.yaml index 733aa97d99..560b6aa0fb 100644 --- a/docs/tasks/administer-cluster/pod1.yaml +++ b/docs/tasks/administer-cluster/pod1.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: pod-with-no-annotation-container - image: gcr.io/google_containers/pause:2.0 \ No newline at end of file + image: k8s.gcr.io/pause:2.0 \ No newline at end of file diff --git a/docs/tasks/administer-cluster/pod2.yaml b/docs/tasks/administer-cluster/pod2.yaml index e1e280ff09..2f065efe65 100644 --- a/docs/tasks/administer-cluster/pod2.yaml +++ b/docs/tasks/administer-cluster/pod2.yaml @@ -8,4 +8,4 @@ spec: schedulerName: default-scheduler containers: - name: pod-with-default-annotation-container - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 diff --git a/docs/tasks/administer-cluster/pod3.yaml b/docs/tasks/administer-cluster/pod3.yaml index 63be0e0aa3..a1b8db3200 100644 --- a/docs/tasks/administer-cluster/pod3.yaml +++ b/docs/tasks/administer-cluster/pod3.yaml @@ -8,4 +8,4 @@ spec: schedulerName: my-scheduler containers: - name: pod-with-second-annotation-container - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 diff --git a/docs/tasks/administer-cluster/pvc-protection.md b/docs/tasks/administer-cluster/pvc-protection.md index 0c1ee061c0..4cc755840d 100644 --- a/docs/tasks/administer-cluster/pvc-protection.md +++ b/docs/tasks/administer-cluster/pvc-protection.md @@ -94,7 +94,7 @@ metadata: spec: containers: - name: test-pod - image: gcr.io/google_containers/busybox:1.24 + image: k8s.gcr.io/busybox:1.24 command: - "/bin/sh" args: diff --git a/docs/tasks/configure-pod-container/configure-liveness-readiness-probes.md b/docs/tasks/configure-pod-container/configure-liveness-readiness-probes.md index 86ad07ecd9..253590b16a 100644 --- a/docs/tasks/configure-pod-container/configure-liveness-readiness-probes.md +++ b/docs/tasks/configure-pod-container/configure-liveness-readiness-probes.md @@ -34,7 +34,7 @@ broken states, and cannot recover except by being restarted. Kubernetes provides liveness probes to detect and remedy such situations. In this exercise, you create a Pod that runs a Container based on the -`gcr.io/google_containers/busybox` image. Here is the configuration file for the Pod: +`k8s.gcr.io/busybox` image. Here is the configuration file for the Pod: {% include code.html language="yaml" file="exec-liveness.yaml" ghlink="/docs/tasks/configure-pod-container/exec-liveness.yaml" %} @@ -75,8 +75,8 @@ The output indicates that no liveness probes have failed yet: FirstSeen LastSeen Count From SubobjectPath Type Reason Message --------- -------- ----- ---- ------------- -------- ------ ------- 24s 24s 1 {default-scheduler } Normal Scheduled Successfully assigned liveness-exec to worker0 -23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "gcr.io/google_containers/busybox" -23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "gcr.io/google_containers/busybox" +23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "k8s.gcr.io/busybox" +23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "k8s.gcr.io/busybox" 23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Created Created container with docker id 86849c15382e; Security:[seccomp=unconfined] 23s 23s 1 {kubelet worker0} spec.containers{liveness} Normal Started Started container with docker id 86849c15382e ``` @@ -94,8 +94,8 @@ probes have failed, and the containers have been killed and recreated. FirstSeen LastSeen Count From SubobjectPath Type Reason Message --------- -------- ----- ---- ------------- -------- ------ ------- 37s 37s 1 {default-scheduler } Normal Scheduled Successfully assigned liveness-exec to worker0 -36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "gcr.io/google_containers/busybox" -36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "gcr.io/google_containers/busybox" +36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulling pulling image "k8s.gcr.io/busybox" +36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Pulled Successfully pulled image "k8s.gcr.io/busybox" 36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Created Created container with docker id 86849c15382e; Security:[seccomp=unconfined] 36s 36s 1 {kubelet worker0} spec.containers{liveness} Normal Started Started container with docker id 86849c15382e 2s 2s 1 {kubelet worker0} spec.containers{liveness} Warning Unhealthy Liveness probe failed: cat: can't open '/tmp/healthy': No such file or directory @@ -117,7 +117,7 @@ liveness-exec 1/1 Running 1 1m ## Define a liveness HTTP request Another kind of liveness probe uses an HTTP GET request. Here is the configuration -file for a Pod that runs a container based on the `gcr.io/google_containers/liveness` +file for a Pod that runs a container based on the `k8s.gcr.io/liveness` image. {% include code.html language="yaml" file="http-liveness.yaml" ghlink="/docs/tasks/configure-pod-container/http-liveness.yaml" %} diff --git a/docs/tasks/configure-pod-container/configure-pod-configmap.md b/docs/tasks/configure-pod-container/configure-pod-configmap.md index 89310d1241..91fdbb0932 100644 --- a/docs/tasks/configure-pod-container/configure-pod-configmap.md +++ b/docs/tasks/configure-pod-container/configure-pod-configmap.md @@ -38,7 +38,7 @@ This page provides a series of usage examples demonstrating how to configure Pod spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh", "-c", "env" ] env: # Define the environment variable @@ -88,7 +88,7 @@ This page provides a series of usage examples demonstrating how to configure Pod spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh", "-c", "env" ] env: - name: SPECIAL_LEVEL_KEY @@ -134,7 +134,7 @@ This page provides a series of usage examples demonstrating how to configure Pod spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh", "-c", "env" ] envFrom: - configMapRef: @@ -161,7 +161,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh", "-c", "echo $(SPECIAL_LEVEL_KEY) $(SPECIAL_TYPE_KEY)" ] env: - name: SPECIAL_LEVEL_KEY @@ -214,7 +214,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh", "-c", "ls /etc/config/" ] volumeMounts: - name: config-volume @@ -248,7 +248,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh","-c","cat /etc/config/keys" ] volumeMounts: - name: config-volume diff --git a/docs/tasks/configure-pod-container/exec-liveness.yaml b/docs/tasks/configure-pod-container/exec-liveness.yaml index 6978ca0069..07bf75f85c 100644 --- a/docs/tasks/configure-pod-container/exec-liveness.yaml +++ b/docs/tasks/configure-pod-container/exec-liveness.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: liveness - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox args: - /bin/sh - -c diff --git a/docs/tasks/configure-pod-container/http-liveness.yaml b/docs/tasks/configure-pod-container/http-liveness.yaml index 1d05e49163..23d37b480a 100644 --- a/docs/tasks/configure-pod-container/http-liveness.yaml +++ b/docs/tasks/configure-pod-container/http-liveness.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: liveness - image: gcr.io/google_containers/liveness + image: k8s.gcr.io/liveness args: - /server livenessProbe: diff --git a/docs/tasks/configure-pod-container/tcp-liveness-readiness.yaml b/docs/tasks/configure-pod-container/tcp-liveness-readiness.yaml index 08065019c5..08fb77ff0f 100644 --- a/docs/tasks/configure-pod-container/tcp-liveness-readiness.yaml +++ b/docs/tasks/configure-pod-container/tcp-liveness-readiness.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: goproxy - image: gcr.io/google_containers/goproxy:0.1 + image: k8s.gcr.io/goproxy:0.1 ports: - containerPort: 8080 readinessProbe: diff --git a/docs/tasks/debug-application-cluster/debug-service.md b/docs/tasks/debug-application-cluster/debug-service.md index a2cd6b6e9c..761e8f3725 100644 --- a/docs/tasks/debug-application-cluster/debug-service.md +++ b/docs/tasks/debug-application-cluster/debug-service.md @@ -66,7 +66,7 @@ probably debugging your own `Service` you can substitute your own details, or yo can follow along and get a second data point. ```shell -$ kubectl run hostnames --image=gcr.io/google_containers/serve_hostname \ +$ kubectl run hostnames --image=k8s.gcr.io/serve_hostname \ --labels=app=hostnames \ --port=9376 \ --replicas=3 @@ -93,7 +93,7 @@ spec: spec: containers: - name: hostnames - image: gcr.io/google_containers/serve_hostname + image: k8s.gcr.io/serve_hostname ports: - containerPort: 9376 protocol: TCP diff --git a/docs/tasks/debug-application-cluster/monitor-node-health.md b/docs/tasks/debug-application-cluster/monitor-node-health.md index 0faad52a33..0578d82c1f 100644 --- a/docs/tasks/debug-application-cluster/monitor-node-health.md +++ b/docs/tasks/debug-application-cluster/monitor-node-health.md @@ -77,7 +77,7 @@ spec: hostNetwork: true containers: - name: node-problem-detector - image: gcr.io/google_containers/node-problem-detector:v0.1 + image: k8s.gcr.io/node-problem-detector:v0.1 securityContext: privileged: true resources: @@ -149,7 +149,7 @@ spec: hostNetwork: true containers: - name: node-problem-detector - image: gcr.io/google_containers/node-problem-detector:v0.1 + image: k8s.gcr.io/node-problem-detector:v0.1 securityContext: privileged: true resources: diff --git a/docs/tasks/inject-data-application/dapi-envars-container.yaml b/docs/tasks/inject-data-application/dapi-envars-container.yaml index 8b3b3a39d3..55bd4dd263 100644 --- a/docs/tasks/inject-data-application/dapi-envars-container.yaml +++ b/docs/tasks/inject-data-application/dapi-envars-container.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox:1.24 + image: k8s.gcr.io/busybox:1.24 command: [ "sh", "-c"] args: - while true; do diff --git a/docs/tasks/inject-data-application/dapi-envars-pod.yaml b/docs/tasks/inject-data-application/dapi-envars-pod.yaml index 00762373b3..071fa82bb3 100644 --- a/docs/tasks/inject-data-application/dapi-envars-pod.yaml +++ b/docs/tasks/inject-data-application/dapi-envars-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "sh", "-c"] args: - while true; do diff --git a/docs/tasks/inject-data-application/dapi-volume-resources.yaml b/docs/tasks/inject-data-application/dapi-volume-resources.yaml index 65770f283f..55af44ac1b 100644 --- a/docs/tasks/inject-data-application/dapi-volume-resources.yaml +++ b/docs/tasks/inject-data-application/dapi-volume-resources.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: client-container - image: gcr.io/google_containers/busybox:1.24 + image: k8s.gcr.io/busybox:1.24 command: ["sh", "-c"] args: - while true; do diff --git a/docs/tasks/inject-data-application/dapi-volume.yaml b/docs/tasks/inject-data-application/dapi-volume.yaml index 7126cefae5..864c99d11e 100644 --- a/docs/tasks/inject-data-application/dapi-volume.yaml +++ b/docs/tasks/inject-data-application/dapi-volume.yaml @@ -12,7 +12,7 @@ metadata: spec: containers: - name: client-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: ["sh", "-c"] args: - while true; do diff --git a/docs/tasks/manage-gpus/scheduling-gpus.md b/docs/tasks/manage-gpus/scheduling-gpus.md index 7e396d51fc..4ad2126b40 100644 --- a/docs/tasks/manage-gpus/scheduling-gpus.md +++ b/docs/tasks/manage-gpus/scheduling-gpus.md @@ -36,13 +36,13 @@ spec: containers: - name: gpu-container-1 - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 resources: limits: alpha.kubernetes.io/nvidia-gpu: 2 # requesting 2 GPUs - name: gpu-container-2 - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 resources: limits: alpha.kubernetes.io/nvidia-gpu: 3 # requesting 3 GPUs @@ -126,7 +126,7 @@ metadata: spec: containers: - name: gpu-container-1 - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 resources: limits: alpha.kubernetes.io/nvidia-gpu: 1 diff --git a/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md b/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md index 6fcf333481..d555c8050c 100644 --- a/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md +++ b/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md @@ -35,7 +35,7 @@ It defines an [index.php](/docs/user-guide/horizontal-pod-autoscaling/image/inde First, we will start a deployment running the image and expose it as a service: ```shell -$ kubectl run php-apache --image=gcr.io/google_containers/hpa-example --requests=cpu=200m --expose --port=80 +$ kubectl run php-apache --image=k8s.gcr.io/hpa-example --requests=cpu=200m --expose --port=80 service "php-apache" created deployment "php-apache" created ``` diff --git a/docs/tools/kompose/user-guide.md b/docs/tools/kompose/user-guide.md index d8811b618d..5e79c975cf 100644 --- a/docs/tools/kompose/user-guide.md +++ b/docs/tools/kompose/user-guide.md @@ -28,7 +28,7 @@ version: "2" services: redis-master: - image: gcr.io/google_containers/redis:e2e + image: k8s.gcr.io/redis:e2e ports: - "6379" diff --git a/docs/tutorials/services/source-ip.md b/docs/tutorials/services/source-ip.md index c9d872465e..7ee2b364f2 100644 --- a/docs/tutorials/services/source-ip.md +++ b/docs/tutorials/services/source-ip.md @@ -33,7 +33,7 @@ document. The examples use a small nginx webserver that echoes back the source IP of requests it receives through an HTTP header. You can create it as follows: ```console -$ kubectl run source-ip-app --image=gcr.io/google_containers/echoserver:1.4 +$ kubectl run source-ip-app --image=k8s.gcr.io/echoserver:1.4 deployment "source-ip-app" created ``` diff --git a/docs/tutorials/stateful-application/basic-stateful-set.md b/docs/tutorials/stateful-application/basic-stateful-set.md index 076829f2bd..2ef3ea627d 100644 --- a/docs/tutorials/stateful-application/basic-stateful-set.md +++ b/docs/tutorials/stateful-application/basic-stateful-set.md @@ -465,7 +465,7 @@ In one terminal window, patch the `web` StatefulSet to change the container image again. ```shell -kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"gcr.io/google_containers/nginx-slim:0.8"}]' +kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"k8s.gcr.io/nginx-slim:0.8"}]' statefulset "web" patched ``` @@ -522,9 +522,9 @@ Get the Pods to view their container images. ```shell{% raw %} for p in 0 1 2; do kubectl get po web-$p --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}'; echo; done -gcr.io/google_containers/nginx-slim:0.8 -gcr.io/google_containers/nginx-slim:0.8 -gcr.io/google_containers/nginx-slim:0.8 +k8s.gcr.io/nginx-slim:0.8 +k8s.gcr.io/nginx-slim:0.8 +k8s.gcr.io/nginx-slim:0.8 {% endraw %} ``` @@ -549,7 +549,7 @@ statefulset "web" patched Patch the StatefulSet again to change the container's image. ```shell -kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"gcr.io/google_containers/nginx-slim:0.7"}]' +kubectl patch statefulset web --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"k8s.gcr.io/nginx-slim:0.7"}]' statefulset "web" patched ``` @@ -575,7 +575,7 @@ Get the Pod's container. ```shell{% raw %} kubectl get po web-2 --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}' -gcr.io/google_containers/nginx-slim:0.8 +k8s.gcr.io/nginx-slim:0.8 {% endraw %} ``` @@ -610,7 +610,7 @@ Get the Pod's container. ```shell{% raw %} kubectl get po web-2 --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}' -gcr.io/google_containers/nginx-slim:0.7 +k8s.gcr.io/nginx-slim:0.7 {% endraw %} ``` @@ -646,7 +646,7 @@ Get the `web-1` Pods container. ```shell{% raw %} kubectl get po web-1 --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}' -gcr.io/google_containers/nginx-slim:0.8 +k8s.gcr.io/nginx-slim:0.8 {% endraw %} ``` `web-1` was restored to its original configuration because the Pod's ordinal @@ -695,9 +695,9 @@ Get the Pod's containers. ```shell{% raw %} for p in 0 1 2; do kubectl get po web-$p --template '{{range $i, $c := .spec.containers}}{{$c.image}}{{end}}'; echo; done -gcr.io/google_containers/nginx-slim:0.7 -gcr.io/google_containers/nginx-slim:0.7 -gcr.io/google_containers/nginx-slim:0.7 +k8s.gcr.io/nginx-slim:0.7 +k8s.gcr.io/nginx-slim:0.7 +k8s.gcr.io/nginx-slim:0.7 {% endraw %} ``` diff --git a/docs/tutorials/stateful-application/web.yaml b/docs/tutorials/stateful-application/web.yaml index 2e9f541460..37c1fabf9c 100644 --- a/docs/tutorials/stateful-application/web.yaml +++ b/docs/tutorials/stateful-application/web.yaml @@ -29,7 +29,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/docs/tutorials/stateful-application/webp.yaml b/docs/tutorials/stateful-application/webp.yaml index 108e670a62..4eab2dc206 100644 --- a/docs/tutorials/stateful-application/webp.yaml +++ b/docs/tutorials/stateful-application/webp.yaml @@ -30,7 +30,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/docs/tutorials/stateful-application/zookeeper.yaml b/docs/tutorials/stateful-application/zookeeper.yaml index e3929613d2..4afa806a54 100644 --- a/docs/tutorials/stateful-application/zookeeper.yaml +++ b/docs/tutorials/stateful-application/zookeeper.yaml @@ -68,7 +68,7 @@ spec: containers: - name: kubernetes-zookeeper imagePullPolicy: Always - image: "gcr.io/google_containers/kubernetes-zookeeper:1.0-3.4.10" + image: "k8s.gcr.io/kubernetes-zookeeper:1.0-3.4.10" resources: requests: memory: "1Gi" diff --git a/docs/tutorials/stateless-application/guestbook/redis-master-deployment.yaml b/docs/tutorials/stateless-application/guestbook/redis-master-deployment.yaml index 685bce7bd7..07d94594eb 100644 --- a/docs/tutorials/stateless-application/guestbook/redis-master-deployment.yaml +++ b/docs/tutorials/stateless-application/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/docs/user-guide/configmap/command-pod.yaml b/docs/user-guide/configmap/command-pod.yaml index 444b4beb66..a9d7411ba6 100644 --- a/docs/user-guide/configmap/command-pod.yaml +++ b/docs/user-guide/configmap/command-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh", "-c", "echo $(KUBE_CONFIG_1) $(KUBE_CONFIG_2)" ] env: - name: KUBE_CONFIG_1 diff --git a/docs/user-guide/configmap/env-pod.yaml b/docs/user-guide/configmap/env-pod.yaml index fe0036e0b2..1fd9ca6702 100644 --- a/docs/user-guide/configmap/env-pod.yaml +++ b/docs/user-guide/configmap/env-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh", "-c", "env" ] env: - name: KUBE_CONFIG_1 diff --git a/docs/user-guide/configmap/mount-file-pod.yaml b/docs/user-guide/configmap/mount-file-pod.yaml index 7efd9b4003..f3ddf3aedb 100644 --- a/docs/user-guide/configmap/mount-file-pod.yaml +++ b/docs/user-guide/configmap/mount-file-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh", "-c", "cat /etc/special-key" ] volumeMounts: - name: config-volume diff --git a/docs/user-guide/configmap/volume-pod.yaml b/docs/user-guide/configmap/volume-pod.yaml index c34332e976..0871f69739 100644 --- a/docs/user-guide/configmap/volume-pod.yaml +++ b/docs/user-guide/configmap/volume-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh", "-c", "cat /etc/config/path/to/special-key" ] volumeMounts: - name: config-volume diff --git a/docs/user-guide/downward-api/dapi-container-resources.yaml b/docs/user-guide/downward-api/dapi-container-resources.yaml index 2a3abb0145..c6c6fc29fc 100644 --- a/docs/user-guide/downward-api/dapi-container-resources.yaml +++ b/docs/user-guide/downward-api/dapi-container-resources.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox:1.24 + image: k8s.gcr.io/busybox:1.24 command: [ "/bin/sh", "-c", "env" ] resources: requests: diff --git a/docs/user-guide/downward-api/dapi-pod.yaml b/docs/user-guide/downward-api/dapi-pod.yaml index 5de0260bfc..06b044bbb6 100644 --- a/docs/user-guide/downward-api/dapi-pod.yaml +++ b/docs/user-guide/downward-api/dapi-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh", "-c", "env" ] env: - name: MY_NODE_NAME diff --git a/docs/user-guide/downward-api/volume/dapi-volume-resources.yaml b/docs/user-guide/downward-api/volume/dapi-volume-resources.yaml index f28bb99e3f..27b8a01c48 100644 --- a/docs/user-guide/downward-api/volume/dapi-volume-resources.yaml +++ b/docs/user-guide/downward-api/volume/dapi-volume-resources.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: client-container - image: gcr.io/google_containers/busybox:1.24 + image: k8s.gcr.io/busybox:1.24 command: ["sh", "-c", "while true; do echo; if [[ -e /etc/cpu_limit ]]; then cat /etc/cpu_limit; fi; if [[ -e /etc/cpu_request ]]; then cat /etc/cpu_request; fi; if [[ -e /etc/mem_limit ]]; then cat /etc/mem_limit; fi; if [[ -e /etc/mem_request ]]; then cat /etc/mem_request; fi; sleep 5; done"] resources: requests: diff --git a/docs/user-guide/downward-api/volume/dapi-volume.yaml b/docs/user-guide/downward-api/volume/dapi-volume.yaml index be926498d1..4db64c6586 100644 --- a/docs/user-guide/downward-api/volume/dapi-volume.yaml +++ b/docs/user-guide/downward-api/volume/dapi-volume.yaml @@ -12,7 +12,7 @@ metadata: spec: containers: - name: client-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: ["sh", "-c", "while true; do if [[ -e /etc/labels ]]; then cat /etc/labels; fi; if [[ -e /etc/annotations ]]; then cat /etc/annotations; fi; sleep 5; done"] volumeMounts: - name: podinfo diff --git a/docs/user-guide/liveness/exec-liveness.yaml b/docs/user-guide/liveness/exec-liveness.yaml index 7b2af47c03..44d7c1cbc6 100644 --- a/docs/user-guide/liveness/exec-liveness.yaml +++ b/docs/user-guide/liveness/exec-liveness.yaml @@ -10,7 +10,7 @@ spec: - /bin/sh - -c - echo ok > /tmp/health; sleep 10; rm -rf /tmp/health; sleep 600 - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox livenessProbe: exec: command: diff --git a/docs/user-guide/liveness/http-liveness-named-port.yaml b/docs/user-guide/liveness/http-liveness-named-port.yaml index 782dfbe339..0449774d47 100644 --- a/docs/user-guide/liveness/http-liveness-named-port.yaml +++ b/docs/user-guide/liveness/http-liveness-named-port.yaml @@ -8,7 +8,7 @@ spec: containers: - args: - /server - image: gcr.io/google_containers/liveness + image: k8s.gcr.io/liveness ports: - name: liveness-port containerPort: 8080 diff --git a/docs/user-guide/liveness/http-liveness.yaml b/docs/user-guide/liveness/http-liveness.yaml index 0f574509e9..57eef7d21b 100644 --- a/docs/user-guide/liveness/http-liveness.yaml +++ b/docs/user-guide/liveness/http-liveness.yaml @@ -8,7 +8,7 @@ spec: containers: - args: - /server - image: gcr.io/google_containers/liveness + image: k8s.gcr.io/liveness livenessProbe: httpGet: path: /healthz diff --git a/docs/user-guide/node-selection/pod-with-node-affinity.yaml b/docs/user-guide/node-selection/pod-with-node-affinity.yaml index 7c38e19997..253d2b21ea 100644 --- a/docs/user-guide/node-selection/pod-with-node-affinity.yaml +++ b/docs/user-guide/node-selection/pod-with-node-affinity.yaml @@ -23,4 +23,4 @@ spec: - another-node-label-value containers: - name: with-node-affinity - image: gcr.io/google_containers/pause:2.0 \ No newline at end of file + image: k8s.gcr.io/pause:2.0 \ No newline at end of file diff --git a/docs/user-guide/node-selection/pod-with-pod-affinity.yaml b/docs/user-guide/node-selection/pod-with-pod-affinity.yaml index 3728537d5a..1897af901f 100644 --- a/docs/user-guide/node-selection/pod-with-pod-affinity.yaml +++ b/docs/user-guide/node-selection/pod-with-pod-affinity.yaml @@ -26,4 +26,4 @@ spec: topologyKey: kubernetes.io/hostname containers: - name: with-pod-affinity - image: gcr.io/google_containers/pause:2.0 + image: k8s.gcr.io/pause:2.0 diff --git a/docs/user-guide/secrets/secret-env-pod.yaml b/docs/user-guide/secrets/secret-env-pod.yaml index a5d9c0ff75..d93d4095e1 100644 --- a/docs/user-guide/secrets/secret-env-pod.yaml +++ b/docs/user-guide/secrets/secret-env-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: gcr.io/google_containers/busybox + image: k8s.gcr.io/busybox command: [ "/bin/sh", "-c", "env" ] env: - name: MY_SECRET_DATA diff --git a/docs/user-guide/update-demo/index.md.orig b/docs/user-guide/update-demo/index.md.orig index a45ca72d97..50679b8b69 100644 --- a/docs/user-guide/update-demo/index.md.orig +++ b/docs/user-guide/update-demo/index.md.orig @@ -62,7 +62,7 @@ $ kubectl rolling-update update-demo-nautilus --update-period=10s -f docs/user-g The rolling-update command in kubectl will do 2 things: -1. Create a new [replication controller](/docs/user-guide/replication-controller/) with a pod template that uses the new image (`gcr.io/google_containers/update-demo:kitten`) +1. Create a new [replication controller](/docs/user-guide/replication-controller/) with a pod template that uses the new image (`k8s.gcr.io/update-demo:kitten`) 2. Scale the old and new replication controllers until the new controller replaces the old. This will kill the current pods one at a time, spinning up new ones to replace them. Watch the [demo website](http://localhost:8001/static/index.html), it will update one pod every 10 seconds until all of the pods have the new image. diff --git a/docs/user-guide/update-demo/kitten-rc.yaml b/docs/user-guide/update-demo/kitten-rc.yaml index 91f1aa06c3..48b15cc190 100644 --- a/docs/user-guide/update-demo/kitten-rc.yaml +++ b/docs/user-guide/update-demo/kitten-rc.yaml @@ -13,7 +13,7 @@ spec: version: kitten spec: containers: - - image: gcr.io/google_containers/update-demo:kitten + - image: k8s.gcr.io/update-demo:kitten name: update-demo ports: - containerPort: 80 diff --git a/docs/user-guide/update-demo/nautilus-rc.yaml b/docs/user-guide/update-demo/nautilus-rc.yaml index cae1a22c16..7518dea901 100644 --- a/docs/user-guide/update-demo/nautilus-rc.yaml +++ b/docs/user-guide/update-demo/nautilus-rc.yaml @@ -14,7 +14,7 @@ spec: version: nautilus spec: containers: - - image: gcr.io/google_containers/update-demo:nautilus + - image: k8s.gcr.io/update-demo:nautilus name: update-demo ports: - containerPort: 80