Skip to content

Commit 44bff43

Browse files
committed
sync addons kubeadm-upgrade-phase labels-annotations-taints/_index
1 parent e3bc5a7 commit 44bff43

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

content/zh-cn/docs/concepts/cluster-administration/addons.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ Add-on 扩展了 Kubernetes 的功能。
148148
* [Spiderpool](https://github.com/spidernet-io/spiderpool) is an underlay and RDMA
149149
networking solution for Kubernetes. Spiderpool is supported on bare metal, virtual machines,
150150
and public cloud environments.
151+
* [Terway](https://github.com/AliyunContainerService/terway/) is a suite of CNI plugins
152+
based on AlibabaCloud's VPC and ECS network products. It provides native VPC networking
153+
and network policies in AlibabaCloud environments.
151154
* [Weave Net](https://github.com/rajch/weave#using-weave-on-kubernetes)
152155
provides networking and network policy, will carry on working on both sides
153156
of a network partition, and does not require an external database.
@@ -161,6 +164,8 @@ Add-on 扩展了 Kubernetes 的功能。
161164
[NetworkPolicy](/zh-cn/docs/concepts/services-networking/network-policies/) API。
162165
* [Spiderpool](https://github.com/spidernet-io/spiderpool) 为 Kubernetes
163166
提供了下层网络和 RDMA 高速网络解决方案,兼容裸金属、虚拟机和公有云等运行环境。
167+
* [Terway](https://github.com/AliyunContainerService/terway/)
168+
是一套基于阿里云 VPC 和 ECS 网络产品的 CNI 插件,能够在阿里云环境中提供原生的 VPC 网络和网络策略支持。
164169
* [Weave Net](https://github.com/rajch/weave#using-weave-on-kubernetes)
165170
提供在网络分组两端参与工作的联网和网络策略,并且不需要额外的数据库。
166171

content/zh-cn/docs/reference/labels-annotations-taints/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3612,11 +3612,11 @@ This allows the Pods on the out-of-service node to recover quickly on a differen
36123612

36133613
{{< caution >}}
36143614
<!--
3615-
Refer to [Non-graceful node shutdown](/docs/concepts/architecture/nodes/#non-graceful-node-shutdown)
3615+
Refer to [Non-graceful node shutdown](/docs/concepts/cluster-administration/node-shutdown/#non-graceful-node-shutdown)
36163616
for further details about when and how to use this taint.
36173617
-->
36183618
有关何时以及如何使用此污点的更多详细信息,
3619-
请参阅[非正常节点关闭](/zh-cn/docs/concepts/architecture/nodes/#non-graceful-node-shutdown)。
3619+
请参阅[非正常节点关闭](/zh-cn/docs/concepts/cluster-administration/node-shutdown/#non-graceful-node-shutdown)。
36203620
{{< /caution >}}
36213621

36223622
<!--

content/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-upgrade-phase.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ of a control plane node.
1515
使用 `kubeadm upgrade apply` 的各个阶段,
1616
你可以选择执行控制平面节点初始升级的单独步骤。
1717

18-
{{< tabs name="tab-phase" >}}
18+
{{< tabs name="tab-apply-phase" >}}
1919
{{< tab name="phase" include="generated/kubeadm_upgrade/kubeadm_upgrade_apply_phase.md" />}}
2020
{{< tab name="preflight" include="generated/kubeadm_upgrade/kubeadm_upgrade_apply_phase_preflight.md" />}}
2121
{{< tab name="control-plane" include="generated/kubeadm_upgrade/kubeadm_upgrade_apply_phase_control-plane.md" />}}
@@ -37,7 +37,7 @@ secondary control-plane or worker nodes.
3737
-->
3838
使用 `kubeadm upgrade node` 的各个阶段,你可以选择执行次要控制平面节点或工作节点升级的单独步骤。
3939

40-
{{< tabs name="tab-phase" >}}
40+
{{< tabs name="tab-apply-phase" >}}
4141
{{< tab name="phase" include="generated/kubeadm_upgrade/kubeadm_upgrade_node_phase.md" />}}
4242
{{< tab name="preflight" include="generated/kubeadm_upgrade/kubeadm_upgrade_node_phase_preflight.md" />}}
4343
{{< tab name="control-plane" include="generated/kubeadm_upgrade/kubeadm_upgrade_node_phase_control-plane.md" />}}

0 commit comments

Comments
 (0)