Skip to content

Commit 9fc9bd9

Browse files
authored
Merge pull request #36415 from my-git9/cni5
[zh-cn] sync content/zh-cn/docs/reference/glossary/cni.md
2 parents 47cfba1 + 9ba94cd commit 9fc9bd9

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

content/zh-cn/docs/reference/glossary/cni.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,11 @@ tags:
3131
<!--
3232
Container network interface (CNI) plugins are a type of Network plugin that adheres to the appc/CNI specification.
3333
-->
34-
3534
容器网络接口 (CNI) 插件是遵循 appc/CNI 协议的一类网络插件。
3635

3736
<!--more-->
3837

3938
<!--
40-
* For information on Kubernetes and CNI refer to [this](/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#cni).
41-
* For information on Kubernetes and CNI, see ["Network plugins"](/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#cni).
39+
* For information on Kubernetes and CNI, see [**Network plugins**](/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#cni).
4240
-->
43-
44-
* 想了解 Kubernetes 和 CNI 请参考 ["网络插件"](/zh-cn/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#cni)
41+
* 想了解 Kubernetes 和 CNI 请参考[**网络插件**](/zh-cn/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#cni)

content/zh-cn/docs/tasks/administer-cluster/configure-upgrade-etcd.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -552,14 +552,14 @@ where `trusted-ca-file`, `cert-file` and `key-file` can be obtained from the des
552552
可以从 etcd Pod 的描述中获得 `trusted-ca-file``cert-file``key-file`
553553

554554
<!--
555-
## Scaling up etcd clusters
555+
## Scaling out etcd clusters
556556
-->
557-
## 为 etcd 集群扩容 {#scaling-up-etcd-clusters}
557+
## 为 etcd 集群扩容 {#scaling-out-etcd-clusters}
558558

559559
<!--
560-
Scaling up etcd clusters increases availability by trading off performance.
560+
Scaling out etcd clusters increases availability by trading off performance.
561561
Scaling does not increase cluster performance nor capability. A general rule
562-
is not to scale up or down etcd clusters. Do not configure any auto scaling
562+
is not to scale out or in etcd clusters. Do not configure any auto scaling
563563
groups for etcd clusters. It is highly recommended to always run a static
564564
five-member etcd cluster for production Kubernetes clusters at any officially
565565
supported scale.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ kube-dns in an existing deployment, or by using tools like kubeadm
4444
that will deploy and upgrade the cluster for you.
4545
-->
4646
通过替换现有集群部署中的 kube-dns,或者使用 kubeadm 等工具来为你部署和升级集群,
47-
可以在你的集群中使用 CoreDNS 而非 kube-dns
47+
可以在你的集群中使用 CoreDNS 而非 kube-dns
4848

4949
<!--
5050
## Installing CoreDNS

content/zh-cn/docs/tasks/administer-cluster/cpu-management-policies.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ using the [cpuset cgroup controller](https://www.kernel.org/doc/Documentation/cg
182182
-->
183183
### static 策略
184184

185-
`static` 策略针对具有整数型 CPU `requests``Guaranteed` Pod ,它允许该类 Pod
186-
中的容器访问节点上的独占 CPU 资源。这种独占性是使用
187-
[cpuset cgroup 控制器](https://www.kernel.org/doc/Documentation/cgroup-v1/cpusets.txt) 来实现的。
185+
`static` 策略针对具有整数型 CPU `requests``Guaranteed` Pod
186+
它允许该类 Pod 中的容器访问节点上的独占 CPU 资源。这种独占性是使用
187+
[cpuset cgroup 控制器](https://www.kernel.org/doc/Documentation/cgroup-v1/cpusets.txt)来实现的。
188188

189189
<!--
190190
System services such as the container runtime and the kubelet itself can continue to run on these exclusive CPUs.  The exclusivity only extends to other pods.
@@ -200,7 +200,7 @@ the node must be drained and CPU manager manually reset by deleting the
200200
state file `cpu_manager_state` in the kubelet root directory.
201201
-->
202202
{{< note >}}
203-
CPU 管理器不支持运行时下线和上线 CPUs。此外,如果节点上的在线 CPUs 集合发生变化,
203+
CPU 管理器不支持运行时下线和上线 CPU。此外,如果节点上的在线 CPU 集合发生变化,
204204
则必须驱逐节点上的 Pod,并通过删除 kubelet 根目录中的状态文件 `cpu_manager_state`
205205
来手动重置 CPU 管理器。
206206
{{< /note >}}

0 commit comments

Comments
 (0)