[zh] translation for admin3

2021-09-26 11:59:26 +08:00 · 2021-09-26 11:59:26 +08:00 · 583ead2dd6
parent 0297612be4
commit 583ead2dd6
3 changed files with 22 additions and 51 deletions
--- a/content/zh/docs/tasks/administer-cluster/coredns.md
+++ b/content/zh/docs/tasks/administer-cluster/coredns.md
@ -67,12 +67,12 @@ For manual deployment or replacement of kube-dns, see the documentation at the
 <!--
 In Kubernetes version 1.10 and later, you can also move to CoreDNS when you use `kubeadm` to upgrade
 a cluster that is using `kube-dns`. In this case, `kubeadm` will generate the CoreDNS configuration
-("Corefile") based upon the `kube-dns` ConfigMap, preserving configurations for federation,
+("Corefile") based upon the `kube-dns` ConfigMap, preserving configurations for 
 stub domains, and upstream name server.
 -->
 在 Kubernetes 1.10 及更高版本中，当你使用 `kubeadm` 升级使用 `kube-dns` 的集群时，你还可以迁移到 CoreDNS。
 在本例中 `kubeadm` 将生成 CoreDNS 配置（"Corefile"）基于 `kube-dns` ConfigMap，
-保存联邦、存根域和上游名称服务器的配置。
+保存存根域和上游名称服务器的配置。

 <!--
 If you are moving from kube-dns to CoreDNS, make sure to set the `CoreDNS` feature gate to `true`
@ -87,12 +87,9 @@ kubeadm upgrade apply v1.11.0 --feature-gates=CoreDNS=true

 <!--
 In Kubernetes version 1.13 and later the `CoreDNS` feature gate is removed and CoreDNS
-is used by default. Follow the guide outlined [here](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase#cmd-phase-addon) if you want
-your upgraded cluster to use kube-dns.
+is used by default. 
 -->
 在 Kubernetes 版本 1.13 和更高版本中，`CoreDNS`特性门已经删除，CoreDNS 在默认情况下使用。
-如果你想升级集群以使用 kube-dns，请遵循
-[此处](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init-phase#cmd-phase-addon) 。

 <!--
 In versions prior to 1.11 the Corefile will be **overwritten** by the one created during upgrade.
@ -110,41 +107,9 @@ your existing Corefile will be retained.
 如果你在 Kubernetes 1.11 及更高版本中运行 CoreDNS，则在升级期间，将保留现有的 Corefile。

 <!--
-## Installing kube-dns instead of CoreDNS with kubeadm
+In Kubernetes version 1.21, support for `kube-dns` is removed from kubeadm.
 -->
-## 使用 kubeadm 安装 kube-dns 而不是 CoreDNS
-
-<!--
-In Kubernetes 1.11, CoreDNS has graduated to General Availability (GA)
-and is installed by default.
-->
-{{< note >}}
-在 Kubernetes 1.11 中，CoreDNS 已经升级到通用可用性（GA），并默认安装。
-{{< /note >}}
-
-<!--
-In Kubernetes 1.18, kube-dns usage with kubeadm has been deprecated and will be removed in a future version.
-->
-{{< warning >}}
-在 Kubernetes 1.18 中，用 kubeadm 来安装 kube-dns 这一做法已经被废弃，
-会在将来版本中移除。
-{{< /warning >}}
-
-<!--
-To install kube-dns on versions prior to 1.13, set the `CoreDNS` feature gate
-value to `false`:
-->
-若要在 1.13 之前版本上安装 kube-dns，请将 `CoreDNS` 特性门控设置为 `false`：
-
-```shell
-kubeadm init --feature-gates=CoreDNS=false
-```
-
-<!--
-For versions 1.13 and later, follow the guide outlined [here](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase#cmd-phase-addon).
-->
-对于 1.13 版和更高版本，请遵循
-[此处](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init-phase#cmd-phase-addon)概述到指南。
+在 kubernetes 1.21 中，kubeadm 移除了对 `kube-dns` 的支持。

 <!--
 ## Upgrading CoreDNS 
--- a/content/zh/docs/tasks/administer-cluster/namespaces.md
+++ b/content/zh/docs/tasks/administer-cluster/namespaces.md
@ -108,14 +108,16 @@ A namespace can be in one of two phases:
 * `Active` the namespace is in use
 * `Terminating` the namespace is being deleted, and can not be used for new objects

-See the [design doc](https://git.k8s.io/community/contributors/design-proposals/architecture/namespaces.md#phases) for more details. -->
+For more details, see [Namespace](/docs/reference/kubernetes-api/cluster-resources/namespace-v1/)
+in the API reference.
+ -->

 名字空间可以处于下列两个阶段中的一个:

 * `Active` 名字空间正在被使用中
 * `Terminating` 名字空间正在被删除，且不能被用于新对象。

-参见[设计文档](https://git.k8s.io/community/contributors/design-proposals/architecture/namespaces.md#phases) 查看更多细节。
+更多细节，参阅 API 参考中的[命名空间](/docs/reference/kubernetes-api/cluster-resources/namespace-v1/)。

 <!-- ## Creating a new namespace -->
 ## 创建名字空间
@ -312,11 +314,11 @@ kubectl delete namespaces <insert-some-namespace-name>
   ```

   <!--
-   We have just created a deployment whose replica size is 2 that is running the pod
-   called `snowflake` with a basic container that just serves the hostname.
+   We have created a deployment whose replica size is 2 that is running the pod
+   called `snowflake` with a basic container that serves the hostname.
   -->
-   我们刚刚创建了一个副本个数为 2 的 Deployment，运行名为 `snowflake` 的
-   Pod，其中包含一个仅负责提供主机名的基本容器。
+   我们创建了一个副本个数为 2 的 Deployment，运行名为 `snowflake` 的
+   Pod，其中包含一个负责提供主机名的基本容器。

   ```shell
   kubectl get deployment -n=development
@ -486,7 +488,7 @@ Use cases include:
 <!--
 When you create a [Service](/docs/concepts/services-networking/service/), it creates a corresponding [DNS entry](/docs/concepts/services-networking/dns-pod-service/).
 This entry is of the form `<service-name>.<namespace-name>.svc.cluster.local`, which means
-that if a container just uses `<service-name>` it will resolve to the service which
+that if a container uses `<service-name>` it will resolve to the service which
 is local to a namespace.  This is useful for using the same configuration across
 multiple namespaces such as Development, Staging and Production.  If you want to reach
 across namespaces, you need to use the fully qualified domain name (FQDN).
@ -494,7 +496,7 @@ across namespaces, you need to use the fully qualified domain name (FQDN).
 当你创建[服务](/zh/docs/concepts/services-networking/service/)时，Kubernetes
 会创建相应的 [DNS 条目](/zh/docs/concepts/services-networking/dns-pod-service/)。
 此条目的格式为 `<服务名称>.<名字空间名称>.svc.cluster.local`。
-这意味着如果容器只使用 `<服务名称>`，它将解析为名字空间本地的服务。
+这意味着如果容器使用 `<服务名称>`，它将解析为名字空间本地的服务。
 这对于在多个名字空间（如开发、暂存和生产）中使用相同的配置非常有用。
 如果要跨名字空间访问，则需要使用完全限定的域名（FQDN）。

@ -503,10 +505,10 @@ across namespaces, you need to use the fully qualified domain name (FQDN).
 <!--
 * Learn more about [setting the namespace preference](/docs/concepts/overview/working-with-objects/namespaces/#setting-the-namespace-preference).
 * Learn more about [setting the namespace for a request](/docs/concepts/overview/working-with-objects/namespaces/#setting-the-namespace-for-a-request)
-* See [namespaces design](https://github.com/kubernetes/community/blob/{{< param "githubbranch" >}}/contributors/design-proposals/architecture/namespaces.md).
+* See [namespaces design](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/architecture/namespaces.md).
 -->

 * 进一步了解[设置名字空间偏好](/zh/docs/concepts/overview/working-with-objects/namespaces/#setting-the-namespace-preference)
 * 进一步了解[设置请求的名字空间](/zh/docs/concepts/overview/working-with-objects/namespaces/#setting-the-namespace-for-a-request)
-* 参阅[名字空间的设计文档](https://github.com/kubernetes/community/blob/{{< param "githubbranch" >}}/contributors/design-proposals/architecture/namespaces.md)
+* 参阅[名字空间的设计文档](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/architecture/namespaces.md)

--- a/content/zh/docs/tasks/administer-cluster/reconfigure-kubelet.md
+++ b/content/zh/docs/tasks/administer-cluster/reconfigure-kubelet.md
@ -16,7 +16,11 @@ content_type: task
 {{< feature-state for_k8s_version="v1.22" state="deprecated" >}}

 <!--
-Caution: Dynamic Kubelet Configuration feature is deprecated and should not be used. Please switch to alternative means distributing configuration to the Nodes of your cluster.
+{{< caution >}}
+[Dynamic Kubelet Configuration](https://github.com/kubernetes/enhancements/issues/281)
+feature is deprecated and should not be used.
+Please switch to alternative means distributing configuration to the Nodes of your cluster.
+{{< /caution >}}
 -->
 {{< caution >}}
 [动态 kubelet 配置](https://github.com/kubernetes/enhancements/issues/281)