`, preserving Ma
| --- | --- | --- |
| `term_id` | N/A (Required) | The `id` of the glossary term whose definition will be used. (This `id` is the same as the filename of the term, i.e. `_data/glossary/
.yml`.) |
| `length` | "short" | Specifies which term definition should be used ("short" for the `short-definition`, "long" for `long-description`, "all" when both should be included). |
+| `prepend` | "Service Catalog is" | A prefix which can be attached in front of a term's short definition (which is one or more sentence fragments). |
#### (2) `glossary_tooltip` tag
diff --git a/_plugins/glossary_tags.rb b/_plugins/glossary_tags.rb
index c59ccf0e9f..8faaedfb37 100644
--- a/_plugins/glossary_tags.rb
+++ b/_plugins/glossary_tags.rb
@@ -55,11 +55,17 @@ module Jekyll
class Definition < Base
VALID_PARAM_NAMES = [
:term_id,
- :length
+ :length,
+ :prepend,
].freeze
def render(context)
- include_snippet(context)
+ text = include_snippet(context)
+ if @args[:prepend]
+ text.sub(/(.)/) { "
#{@args[:prepend]} #{$1.downcase}" }
+ else
+ text
+ end
end
end
diff --git a/_redirects b/_redirects
index f10c8d57d0..fbd6069238 100644
--- a/_redirects
+++ b/_redirects
@@ -76,11 +76,10 @@
/docs/api-reference/v1.5/* https://v1-5.docs.kubernetes.io/docs/reference/ 301
/docs/api-reference/v1.6/* https://v1-6.docs.kubernetes.io/docs/reference/ 301
/docs/api-reference/v1.7/* https://v1-7.docs.kubernetes.io/docs/reference/ 301
-/docs/api-reference/v1.8/* https://v1-8.docs.kubernetes.io/docs/reference/ 301
+/docs/api-reference/v1.8/* https://v1-8.docs.kubernetes.io/docs/api-reference/v1.8/:splat 301
/docs/api-reference/v1/definitions/ /docs/api-reference/v1.9/ 301
/docs/api-reference/v1/operations/ /docs/api-reference/v1.9/ 301
-
/docs/concepts/abstractions/controllers/garbage-collection/ /docs/concepts/workloads/controllers/garbage-collection/ 301
/docs/concepts/abstractions/controllers/petsets/ /docs/concepts/workloads/controllers/statefulset/ 301
/docs/concepts/abstractions/controllers/statefulsets/ /docs/concepts/workloads/controllers/statefulset/ 301
@@ -197,9 +196,9 @@
/docs/resources-reference/1_5/* /docs/resources-reference/v1.5/ 301
/docs/resources-reference/1_5/* https://v1-5.docs.kubernetes.io/docs/resources-reference/v1.5/ 301
+/docs/resources-reference/v1.5/node_modules/* https://v1-5.docs.kubernetes.io/docs/resources-reference/v1.5/ 301
/docs/resources-reference/1_6/* /docs/resources-reference/v1.6/ 301
/docs/resources-reference/1_7/* /docs/resources-reference/v1.7/ 301
-/docs/resources-reference/v1.5/node_modules/* https://v1-5.docs.kubernetes.io/docs/resources-reference/v1.5/ 301
/docs/resources-reference/v1.8/* /docs/api-reference/v1.8/:splat 301
/docs/roadmap/ https://github.com/kubernetes/kubernetes/milestones/ 301
@@ -218,7 +217,7 @@
/docs/tasks/administer-cluster/default-cpu-request-limit/ /docs/tasks/configure-pod-container/assign-cpu-resource/#specify-a-cpu-request-and-a-cpu-limit/ 301
/docs/tasks/administer-cluster/default-memory-request-limit/ /docs/tasks/configure-pod-container/assign-memory-resource/#specify-a-memory-request-and-a-memory-limit/ 301
/docs/tasks/administer-cluster/developing-cloud-controller-manager.md /docs/tasks/administer-cluster/developing-cloud-controller-manager/ 301
-/docs/tasks/administer-cluster/out-of-resource/memory-available.sh /docs/concepts/cluster-administration/out-of-resource/memory-available.sh 301
+/docs/tasks/administer-cluster/out-of-resource/memory-available.sh /docs/tasks/administer-cluster/memory-available.sh 301
/docs/tasks/administer-cluster/overview/ /docs/concepts/cluster-administration/cluster-administration-overview/ 301
/docs/tasks/administer-cluster/reserve-compute-resources/out-of-resource.md /docs/tasks/administer-cluster/out-of-resource/ 301
/docs/tasks/administer-cluster/running-cloud-controller.md /docs/tasks/administer-cluster/running-cloud-controller/ 301
@@ -341,7 +340,8 @@
/docs/user-guide/kubeconfig-file/ /docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig/ 301
/docs/user-guide/kubectl-overview/ /docs/reference/kubectl/overview/
/docs/user-guide/kubectl/ /docs/reference/generated/kubectl/kubectl-options/
-/docs/user-guide/kubectl/v1.8/ /docs/reference/generated/kubectl/kubectl-commands/
+/docs/user-guide/kubectl/v1.8/* https://v1-8.docs.kubernetes.io/docs/reference/generated/kubectl/kubectl-commands/:splat 301
+/docs/user-guide/kubectl/v1.9/* /docs/reference/generated/kubectl/kubectl-commands/:splat 301
/docs/user-guide/kubectl-conventions/ /docs/reference/kubectl/conventions/
/docs/user-guide/kubectl-cheatsheet/ /docs/reference/kubectl/cheatsheet/
/docs/user-guide/kubectl/1_5/* https://v1-5.docs.kubernetes.io/docs/user-guide/kubectl/v1.5/ 301
@@ -443,3 +443,4 @@ https://kubernetes-io-v1-7.netlify.com/* https://v1-7.docs.kubernetes.io/:spl
/docs/admin/kubefed_unjoin/ /docs/reference/generated/kubefed_unjoin/ 301
/docs/admin/kubefed_version/ /docs/reference/generated/kubefed_version/ 301
+/docs/reference/generated/kubeadm/ /docs/reference/setup-tools/kubeadm/kubeadm/ 301
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/cloud-controller.md b/cn/docs/concepts/architecture/cloud-controller.md
index 644e3e7d0a..15840fd8b5 100644
--- a/cn/docs/concepts/architecture/cloud-controller.md
+++ b/cn/docs/concepts/architecture/cloud-controller.md
@@ -172,7 +172,7 @@ v1/ServiceAccount:
针对CCM的RBAC ClusterRole如下所示：
```yaml
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: cloud-controller-manager
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/connecting-frontend-backend.md b/cn/docs/tasks/access-application-cluster/connecting-frontend-backend.md
index f2d82fae7e..a63ad90777 100644
--- a/cn/docs/tasks/access-application-cluster/connecting-frontend-backend.md
+++ b/cn/docs/tasks/access-application-cluster/connecting-frontend-backend.md
@@ -160,7 +160,7 @@ service "frontend" created
**注意**：这个 nginx 配置文件是被打包在 [容器镜像](/docs/tasks/access-application-cluster/frontend/Dockerfile) 里的。
-更好的方法是使用 [ConfigMap](/docs/tasks/configure-pod-container/configmap/)，这样的话你可以更轻易地更改配置。
+更好的方法是使用 [ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/)，这样的话你可以更轻易地更改配置。
### 与前端 Service 交互
@@ -216,7 +216,7 @@ curl http://
* 了解更多 [Services](/docs/concepts/services-networking/service/)
-* 了解更多 [ConfigMaps](/docs/tasks/configure-pod-container/configmap/)
+* 了解更多 [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/)
{% endcapture %}
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/debug-application-cluster/debug-application.md b/cn/docs/tasks/debug-application-cluster/debug-application.md
index 11538f35de..cc4513e204 100644
--- a/cn/docs/tasks/debug-application-cluster/debug-application.md
+++ b/cn/docs/tasks/debug-application-cluster/debug-application.md
@@ -8,10 +8,6 @@ title: 应用故障排查
* TOC
{:toc}
-## FAQ
-
-强烈建议用户参考我们的[FAQ](https://github.com/kubernetes/kubernetes/wiki/User-FAQ).
-
## 诊断问题
故障排查的第一步是先给问题分下类。这个问题是什么？Pods，Replication Controller或者Service？
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/inject-data-application/define-command-argument-container.md b/cn/docs/tasks/inject-data-application/define-command-argument-container.md
index 23fce58e28..abcef87811 100644
--- a/cn/docs/tasks/inject-data-application/define-command-argument-container.md
+++ b/cn/docs/tasks/inject-data-application/define-command-argument-container.md
@@ -63,7 +63,7 @@ title: 为容器设置启动时要执行的命令及其入参
args: ["$(MESSAGE)"]
这样一来，我们就可以将那些用来设置环境变量的方法应用于设置命令的入参，其
-中包括了[ConfigMaps](/docs/tasks/configure-pod-container/configmap/)
+中包括了[ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/)
与
[Secrets](/docs/concepts/configuration/secret/).
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/configuration/configure-redis-using-configmap.md b/cn/docs/tutorials/configuration/configure-redis-using-configmap.md
index 1c4b339df8..1b633e20c3 100644
--- a/cn/docs/tutorials/configuration/configure-redis-using-configmap.md
+++ b/cn/docs/tutorials/configuration/configure-redis-using-configmap.md
@@ -7,7 +7,7 @@ title: 使用ConfigMap来配置Redis
{% capture overview %}
-这篇文档基于[在Pods中使用ConfigMap数据](/docs/tasks/configure-pod-container/configure-pod-configmap/) 和 [使用ConfigMap来配置Containers](/docs/tasks/configure-pod-container/configmap/) 两个任务，提供了一个使用ConfigMap来配置Redis的真实案例。
+这篇文档基于[使用ConfigMap来配置Containers](/docs/tasks/configure-pod-container/configure-pod-configmap/) 这个任务，提供了一个使用ConfigMap来配置Redis的真实案例。
{% endcapture %}
@@ -23,8 +23,7 @@ title: 使用ConfigMap来配置Redis
{% capture prerequisites %}
* {% include task-tutorial-prereqs.md %}
-* 理解[在Pods中使用ConfigMap数据](/docs/tasks/configure-pod-container/configure-pod-configmap/)。
-* 理解[使用ConfigMap来配置Containers](/docs/tasks/configure-pod-container/configmap/)。
+* 理解[使用ConfigMap来配置Containers](/docs/tasks/configure-pod-container/configure-pod-configmap/)。
{% endcapture %}
@@ -120,8 +119,7 @@ title: 使用ConfigMap来配置Redis
{% capture whatsnext %}
-* 了解关于[ConfigMaps](/docs/tasks/configure-pod-container/configmap/)的更多知识。
-* 参见[在Pods中使用ConfigMap数据](/docs/tasks/configure-pod-container/configure-pod-configmap/)。
+* 了解关于[ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/)的更多知识。
{% endcapture %}
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 f5f246c47f..e9f9b7e5d0 100644
--- a/cn/docs/tutorials/stateful-application/web.yaml
+++ b/cn/docs/tutorials/stateful-application/web.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/cn/docs/tutorials/stateful-application/webp.yaml b/cn/docs/tutorials/stateful-application/webp.yaml
index 0a56f234e0..c2ab595cf2 100644
--- a/cn/docs/tutorials/stateful-application/webp.yaml
+++ b/cn/docs/tutorials/stateful-application/webp.yaml
@@ -28,7 +28,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/zookeeper.md b/cn/docs/tutorials/stateful-application/zookeeper.md
index f6f3ef46f9..d6578d32e1 100644
--- a/cn/docs/tutorials/stateful-application/zookeeper.md
+++ b/cn/docs/tutorials/stateful-application/zookeeper.md
@@ -25,7 +25,7 @@ title: 运行 ZooKeeper， 一个 CP 分布式系统
* [Headless Services](/docs/concepts/services-networking/service/#headless-services)
* [PersistentVolumes](/docs/concepts/storage/volumes/)
* [PersistentVolume Provisioning](http://releases.k8s.io/{{page.githubbranch}}/examples/persistent-volume-provisioning/)
-* [ConfigMaps](/docs/tasks/configure-pod-container/configmap/)
+* [ConfigMaps](/docs/tasks/configure-pod-container/configure-pod-configmap/)
* [StatefulSets](/docs/concepts/abstractions/controllers/statefulsets/)
* [PodDisruptionBudgets](/docs/admin/disruptions/#specifying-a-poddisruptionbudget)
* [PodAntiAffinity](/docs/user-guide/node-selection/#inter-pod-affinity-and-anti-affinity-beta-feature)
@@ -67,7 +67,7 @@ ZooKeeper 在内存中保存它们的整个状态机，但是每个改变都被
## 创建一个 ZooKeeper Ensemble
-下面的清单包含一个 [Headless Service](/docs/user-guide/services/#headless-services)，一个 [ConfigMap](/docs/tasks/configure-pod-container/configmap/)，一个 [PodDisruptionBudget](/docs/admin/disruptions/#specifying-a-poddisruptionbudget) 和 一个 [StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/)。
+下面的清单包含一个 [Headless Service](/docs/user-guide/services/#headless-services)，一个 [ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/)，一个 [PodDisruptionBudget](/docs/admin/disruptions/#specifying-a-poddisruptionbudget) 和 一个 [StatefulSet](/docs/concepts/abstractions/controllers/statefulsets/)。
{% include code.html language="yaml" file="zookeeper.yaml" ghlink="/docs/tutorials/stateful-application/zookeeper.yaml" %}
diff --git a/cn/index.html b/cn/index.html
index 63e059c497..7443e05d59 100644
--- a/cn/index.html
+++ b/cn/index.html
@@ -107,7 +107,7 @@ cid: home
Kubernetes 逐渐部署对应用程序或其配置的更改，同时监视应用程序运行状况，以确保它不会同时终止所有实例。 如果出现问题，Kubernetes会为您恢复更改，利用日益增长的部署解决方案的生态系统。