Skip to content

Commit a49eac0

Browse files
authored
Merge pull request #29815 from steven-my/29329-translation-for-admin-3
[zh] translation for admin3
2 parents 9fc70b4 + 583ead2 commit a49eac0

File tree

3 files changed

+22
-51
lines changed

3 files changed

+22
-51
lines changed

content/zh/docs/tasks/administer-cluster/coredns.md

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ For manual deployment or replacement of kube-dns, see the documentation at the
6767
<!--
6868
In Kubernetes version 1.10 and later, you can also move to CoreDNS when you use `kubeadm` to upgrade
6969
a cluster that is using `kube-dns`. In this case, `kubeadm` will generate the CoreDNS configuration
70-
("Corefile") based upon the `kube-dns` ConfigMap, preserving configurations for federation,
70+
("Corefile") based upon the `kube-dns` ConfigMap, preserving configurations for
7171
stub domains, and upstream name server.
7272
-->
7373
在 Kubernetes 1.10 及更高版本中,当你使用 `kubeadm` 升级使用 `kube-dns` 的集群时,你还可以迁移到 CoreDNS。
7474
在本例中 `kubeadm` 将生成 CoreDNS 配置("Corefile")基于 `kube-dns` ConfigMap,
75-
保存联邦、存根域和上游名称服务器的配置
75+
保存存根域和上游名称服务器的配置
7676

7777
<!--
7878
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
8787

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

9794
<!--
9895
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.
110107
如果你在 Kubernetes 1.11 及更高版本中运行 CoreDNS,则在升级期间,将保留现有的 Corefile。
111108

112109
<!--
113-
## Installing kube-dns instead of CoreDNS with kubeadm
110+
In Kubernetes version 1.21, support for `kube-dns` is removed from kubeadm.
114111
-->
115-
## 使用 kubeadm 安装 kube-dns 而不是 CoreDNS
116-
117-
<!--
118-
In Kubernetes 1.11, CoreDNS has graduated to General Availability (GA)
119-
and is installed by default.
120-
-->
121-
{{< note >}}
122-
在 Kubernetes 1.11 中,CoreDNS 已经升级到通用可用性(GA),并默认安装。
123-
{{< /note >}}
124-
125-
<!--
126-
In Kubernetes 1.18, kube-dns usage with kubeadm has been deprecated and will be removed in a future version.
127-
-->
128-
{{< warning >}}
129-
在 Kubernetes 1.18 中,用 kubeadm 来安装 kube-dns 这一做法已经被废弃,
130-
会在将来版本中移除。
131-
{{< /warning >}}
132-
133-
<!--
134-
To install kube-dns on versions prior to 1.13, set the `CoreDNS` feature gate
135-
value to `false`:
136-
-->
137-
若要在 1.13 之前版本上安装 kube-dns,请将 `CoreDNS` 特性门控设置为 `false`
138-
139-
```shell
140-
kubeadm init --feature-gates=CoreDNS=false
141-
```
142-
143-
<!--
144-
For versions 1.13 and later, follow the guide outlined [here](/docs/reference/setup-tools/kubeadm/kubeadm-init-phase#cmd-phase-addon).
145-
-->
146-
对于 1.13 版和更高版本,请遵循
147-
[此处](/zh/docs/reference/setup-tools/kubeadm/kubeadm-init-phase#cmd-phase-addon)概述到指南。
112+
在 kubernetes 1.21 中,kubeadm 移除了对 `kube-dns` 的支持。
148113

149114
<!--
150115
## Upgrading CoreDNS

content/zh/docs/tasks/administer-cluster/namespaces.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,16 @@ A namespace can be in one of two phases:
108108
* `Active` the namespace is in use
109109
* `Terminating` the namespace is being deleted, and can not be used for new objects
110110
111-
See the [design doc](https://git.k8s.io/community/contributors/design-proposals/architecture/namespaces.md#phases) for more details. -->
111+
For more details, see [Namespace](/docs/reference/kubernetes-api/cluster-resources/namespace-v1/)
112+
in the API reference.
113+
-->
112114

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

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

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

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

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

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

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

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

content/zh/docs/tasks/administer-cluster/reconfigure-kubelet.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ content_type: task
1616
{{< feature-state for_k8s_version="v1.22" state="deprecated" >}}
1717

1818
<!--
19-
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.
19+
{{< caution >}}
20+
[Dynamic Kubelet Configuration](https://github.com/kubernetes/enhancements/issues/281)
21+
feature is deprecated and should not be used.
22+
Please switch to alternative means distributing configuration to the Nodes of your cluster.
23+
{{< /caution >}}
2024
-->
2125
{{< caution >}}
2226
[动态 kubelet 配置](https://github.com/kubernetes/enhancements/issues/281)

0 commit comments

Comments
 (0)