From bad685f6f5fee52d1c599052c02bb6c418f4118c Mon Sep 17 00:00:00 2001 From: howieyuen Date: Sat, 11 Jun 2022 17:09:14 +0800 Subject: [PATCH] [zh]Resync files after zh language renaming(#34221, misc-1) --- .../zh-cn/docs/home/supported-doc-versions.md | 23 ++++++++++++++++++- .../container-runtimes.md | 4 ++-- .../debug/debug-application/debug-pods.md | 4 ++-- .../debug/debug-application/debug-service.md | 8 +++---- .../debug/debug-cluster/local-debugging.md | 2 +- .../resource-metrics-pipeline.md | 4 ++-- 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/content/zh-cn/docs/home/supported-doc-versions.md b/content/zh-cn/docs/home/supported-doc-versions.md index 1556a62497..d455a039a3 100644 --- a/content/zh-cn/docs/home/supported-doc-versions.md +++ b/content/zh-cn/docs/home/supported-doc-versions.md @@ -7,7 +7,28 @@ card: weight: 10 title: Kubernetes 文档支持的版本 --- - + + + 本网站包含当前版本和之前四个版本的 Kubernetes 文档。 + +Kubernetes 版本的文档可用性与当前是否支持该版本是分开的。 +阅读[支持期限](/zh/releases/patch-releases/#support-period)，了解官方支持 Kubernetes 的哪些版本，以及支持多长时间。 diff --git a/content/zh-cn/docs/setup/production-environment/container-runtimes.md b/content/zh-cn/docs/setup/production-environment/container-runtimes.md index 431232cd64..971752fd0b 100644 --- a/content/zh-cn/docs/setup/production-environment/container-runtimes.md +++ b/content/zh-cn/docs/setup/production-environment/container-runtimes.md @@ -385,10 +385,10 @@ sudo systemctl restart containerd 当使用 kubeadm 时，请手动配置 -[kubelet 的 cgroup 驱动](/zh/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#configure-cgroup-driver-used-by-kubelet-on-control-plane-node). +[kubelet 的 cgroup 驱动](/zh/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver/#configuring-the-kubelet-cgroup-driver). ### CRI-O diff --git a/content/zh-cn/docs/tasks/debug/debug-application/debug-pods.md b/content/zh-cn/docs/tasks/debug/debug-application/debug-pods.md index e3fe206b3a..2e66213ab1 100644 --- a/content/zh-cn/docs/tasks/debug/debug-application/debug-pods.md +++ b/content/zh-cn/docs/tasks/debug/debug-application/debug-pods.md @@ -295,11 +295,11 @@ to make sure that your `Service` is running, has `Endpoints`, and your `Pods` ar actually serving; you have DNS working, iptables rules installed, and kube-proxy does not seem to be misbehaving. -You may also visit [troubleshooting document](/docs/tasks/debug/overview/) for more information. +You may also visit [troubleshooting document](/docs/tasks/debug/) for more information. --> 如果上述方法都不能解决你的问题， 请按照[调试 Service 文档](/zh/docs/tasks/debug/debug-applications/debug-service/)中的介绍， 确保你的 `Service` 处于 Running 态，有 `Endpoints` 被创建，`Pod` 真的在提供服务； DNS 服务已配置并正常工作，iptables 规则也以安装并且 `kube-proxy` 也没有异常行为。 -你也可以访问[故障排查文档](/zh/docs/tasks/debug/overview/)来获取更多信息。 +你也可以访问[故障排查文档](/zh/docs/tasks/debug/)来获取更多信息。 diff --git a/content/zh-cn/docs/tasks/debug/debug-application/debug-service.md b/content/zh-cn/docs/tasks/debug/debug-application/debug-service.md index 8c6d6e954f..176727512b 100644 --- a/content/zh-cn/docs/tasks/debug/debug-application/debug-service.md +++ b/content/zh-cn/docs/tasks/debug/debug-application/debug-service.md @@ -1093,7 +1093,7 @@ Service is not working. Please let us know what is going on, so we can help investigate! Contact us on -[Slack](/docs/tasks/debug/overview/#slack) or +[Slack](https://slack.k8s.io/) or [Forum](https://discuss.kubernetes.io) or [GitHub](https://github.com/kubernetes/kubernetes). --> @@ -1104,7 +1104,7 @@ Contact us on 然而 Service 还是没有正常工作。这种情况下，请告诉我们，以便我们可以帮助调查！ 通过 -[Slack](/zh/docs/tasks/debug/overview/#slack) 或者 +[Slack](https://slack.k8s.io/) 或者 [Forum](https://discuss.kubernetes.io) 或者 [GitHub](https://github.com/kubernetes/kubernetes) 联系我们。 @@ -1112,6 +1112,6 @@ Contact us on ## {{% heading "whatsnext" %}} -访问[故障排查文档](/zh/docs/tasks/debug-application-cluster/troubleshooting/) 获取更多信息。 +访问[故障排查文档](/zh/docs/tasks/debug/) 获取更多信息。 diff --git a/content/zh-cn/docs/tasks/debug/debug-cluster/local-debugging.md b/content/zh-cn/docs/tasks/debug/debug-cluster/local-debugging.md index c6755e9e17..995534fe27 100644 --- a/content/zh-cn/docs/tasks/debug/debug-cluster/local-debugging.md +++ b/content/zh-cn/docs/tasks/debug/debug-cluster/local-debugging.md @@ -52,7 +52,7 @@ This document describes using `telepresence` to develop and debug services runni ## 从本机连接到远程 Kubernetes 集群 diff --git a/content/zh-cn/docs/tasks/debug/debug-cluster/resource-metrics-pipeline.md b/content/zh-cn/docs/tasks/debug/debug-cluster/resource-metrics-pipeline.md index 6b9a4c70dd..491079912e 100644 --- a/content/zh-cn/docs/tasks/debug/debug-cluster/resource-metrics-pipeline.md +++ b/content/zh-cn/docs/tasks/debug/debug-cluster/resource-metrics-pipeline.md @@ -362,7 +362,7 @@ To learn more about the metrics-server, see the You can also check out the following: -* [metrics-server design](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/instrumentation/metrics-server.md) +* [metrics-server design](https://github.com/kubernetes/design-proposals-archive/blob/main/instrumentation/metrics-server.md) * [metrics-server FAQ](https://github.com/kubernetes-sigs/metrics-server/blob/master/FAQ.md) * [metrics-server known issues](https://github.com/kubernetes-sigs/metrics-server/blob/master/KNOWN_ISSUES.md) * [metrics-server releases](https://github.com/kubernetes-sigs/metrics-server/releases) @@ -373,7 +373,7 @@ You can also check out the following: 你还可以查看以下内容： -* [metrics-server 设计](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/instrumentation/metrics-server.md) +* [metrics-server 设计](https://github.com/kubernetes/design-proposals-archive/blob/main/instrumentation/metrics-server.md) * [metrics-server FAQ](https://github.com/kubernetes-sigs/metrics-server/blob/master/FAQ.md) * [metrics-server known issues](https://github.com/kubernetes-sigs/metrics-server/blob/master/KNOWN_ISSUES.md) * [metrics-server releases](https://github.com/kubernetes-sigs/metrics-server/releases)