Skip to content

Commit 319a08a

Browse files
authored
Merge pull request #44943 from asa3311/sync-zh-98
[zh] sync endpoint-slices create-cluster-kubeadm kubeadm-upgrade
2 parents 20fc684 + eeb2480 commit 319a08a

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

content/zh-cn/docs/concepts/services-networking/endpoint-slices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ perfectly full distribution of EndpointSlices. As an example, if there are 10
380380
new endpoints to add and 2 EndpointSlices with room for 5 more endpoints each,
381381
this approach will create a new EndpointSlice instead of filling up the 2
382382
existing EndpointSlices. In other words, a single EndpointSlice creation is
383-
preferrable to multiple EndpointSlice updates.
383+
preferable to multiple EndpointSlice updates.
384384
-->
385385
这里比较重要的是,与在 EndpointSlice 之间完成最佳的分布相比,第三步中更看重限制
386386
EndpointSlice 更新的操作次数。例如,如果有 10 个端点待添加,有两个 EndpointSlice

content/zh-cn/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,10 +614,10 @@ support [Network Policy](/docs/concepts/services-networking/network-policies/).
614614

615615
<!--
616616
See a list of add-ons that implement the
617-
[Kubernetes networking model](/docs/concepts/cluster-administration/networking/#how-to-implement-the-kubernetes-networking-model).
617+
[Kubernetes networking model](/docs/concepts/cluster-administration/networking/#how-to-implement-the-kubernetes-network-model).
618618
-->
619619
请参阅实现
620-
[Kubernetes 网络模型](/zh-cn/docs/concepts/cluster-administration/networking/#how-to-implement-the-kubernetes-networking-model)的附加组件列表。
620+
[Kubernetes 网络模型](/zh-cn/docs/concepts/cluster-administration/networking/#how-to-implement-the-kubernetes-network-model)的附加组件列表。
621621

622622
<!--
623623
You can install a Pod network add-on with the following command on the

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,18 @@ The upgrade workflow at high level is the following:
8181
first drain the node (or nodes) that you are upgrading. In the case of control plane nodes,
8282
they could be running CoreDNS Pods or other critical workloads. For more information see
8383
[Draining nodes](/docs/tasks/administer-cluster/safely-drain-node/).
84+
- The Kubernetes project recommends that you match your kubelet and kubeadm versions.
85+
You can instead use an a version of kubelet that is older than kubeadm, provided it is within the
86+
range of supported versions.
87+
For more details, please visit [kubeadm's skew against the kubelet](/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/#kubeadm-s-skew-against-the-kubelet).
8488
- All containers are restarted after upgrade, because the container spec hash value is changed.
8589
-->
8690
- 下述说明了在升级过程中何时腾空每个节点。如果你正在对任何 kubelet 进行小版本升级,
8791
你需要先腾空待升级的节点(或多个节点)。对于控制面节点,其上可能运行着 CoreDNS Pod
8892
或者其它非常重要的负载。更多信息见[腾空节点](/zh-cn/docs/tasks/administer-cluster/safely-drain-node/)
93+
- Kubernetes 项目推荐你使用版本匹配的 kubelet 和 kubeadm。
94+
但你也可以使用比 kubeadm 版本更低的 kubelet 版本,前提是该版本仍处于支持的版本范围内。
95+
欲了解更多信息,请访问 [kubeadm 与 kubelet 的版本差异](/zh-cn/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/#kubeadm-s-skew-against-the-kubelet)
8996
- 升级后,因为容器规约的哈希值已更改,所有容器都会被重新启动。
9097

9198
<!--

0 commit comments

Comments
 (0)