Skip to content

Commit f694c4c

Browse files
authored
Merge pull request #37661 from windsonsea/admupg
[zh] sync kubeadm-upgrade.md
2 parents 734ad18 + 6fa33ae commit f694c4c

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ they could be running CoreDNS Pods or other critical workloads. For more informa
8484
- All containers are restarted after upgrade, because the container spec hash value is changed.
8585
-->
8686
- 下述说明了在升级过程中何时腾空每个节点。如果你正在对任何 kubelet 进行小版本升级,
87-
你需要先腾空待升级的节点(或多个节点)。对于控制面节点,其上可能运行着 CoreDNS Pods
87+
你需要先腾空待升级的节点(或多个节点)。对于控制面节点,其上可能运行着 CoreDNS Pod
8888
或者其它非常重要的负载。更多信息见[腾空节点](/zh-cn/docs/tasks/administer-cluster/safely-drain-node/)
8989
- 升级后,因为容器规约的哈希值已更改,所有容器都会被重新启动。
9090

@@ -98,9 +98,10 @@ with the purpose of reconfiguring the cluster is not recommended and can have un
9898
-->
9999
- 要验证 kubelet 服务在升级后是否成功重启,可以执行 `systemctl status kubelet`
100100
`journalctl -xeu kubelet` 查看服务日志。
101-
- 不建议使用 `kubeadm upgrade``--config` 参数和 [kubeadm 配置 API 类型](/zh-cn/docs/reference/config-api/kubeadm-config.v1beta3)
102-
来重新配置集群,这样会产生意想不到的结果。请按照[重新配置 kubeadm 集群](/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-reconfigure)
103-
中的步骤来进行。
101+
- 不建议使用 `kubeadm upgrade``--config` 参数和
102+
[kubeadm 配置 API 类型](/zh-cn/docs/reference/config-api/kubeadm-config.v1beta3)来重新配置集群,
103+
这样会产生意想不到的结果。
104+
请按照[重新配置 kubeadm 集群](/zh-cn/docs/tasks/administer-cluster/kubeadm/kubeadm-reconfigure)中的步骤来进行。
104105

105106
<!-- steps -->
106107

@@ -220,8 +221,8 @@ Pick a control plane node that you wish to upgrade first. It must have the `/etc
220221
a config file with replacement configs to `kubeadm upgrade apply` via the `--config` command line flag.
221222
Failing to do so will cause `kubeadm upgrade apply` to exit with an error and not perform an upgrade.
222223
-->
223-
如果 `kubeadm upgrade plan` 给出任何需要手动升级的组件配置,用户必须
224-
通过 `--config` 命令行标志向 `kubeadm upgrade apply` 命令提供替代的配置文件。
224+
如果 `kubeadm upgrade plan` 给出任何需要手动升级的组件配置,
225+
用户必须通过 `--config` 命令行标志向 `kubeadm upgrade apply` 命令提供替代的配置文件。
225226
如果不这样做,`kubeadm upgrade apply` 会出错并退出,不再执行升级操作。
226227
{{</ note >}}
227228

@@ -307,7 +308,7 @@ Also calling `kubeadm upgrade plan` and upgrading the CNI provider plugin is no
307308
<!--
308309
- Prepare the node for maintenance by marking it unschedulable and evicting the workloads:
309310
-->
310-
- 通过将节点标记为不可调度并腾空节点为节点作升级准备
311+
- 将节点标记为不可调度并驱逐所有负载,准备节点的维护
311312

312313
<!--
313314
```shell
@@ -370,13 +371,13 @@ Also calling `kubeadm upgrade plan` and upgrading the CNI provider plugin is no
370371

371372
<!--
372373
```shell
373-
# replace <node-to-drain> with the name of your node
374-
kubectl uncordon <node-to-drain>
374+
# replace <node-to-uncordon> with the name of your node
375+
kubectl uncordon <node-to-uncordon>
375376
```
376377
-->
377378
```shell
378-
# 将 <node-to-drain> 替换为你的节点名称
379-
kubectl uncordon <node-to-drain>
379+
# 将 <node-to-uncordon> 替换为你的节点名称
380+
kubectl uncordon <node-to-uncordon>
380381
```
381382

382383
<!--
@@ -448,6 +449,7 @@ without compromising the minimum required capacity for running your workloads.
448449
kubectl drain <node-to-drain> --ignore-daemonsets
449450
```
450451
-->
452+
451453
```shell
452454
# 将 <node-to-drain> 替换为你正在腾空的节点的名称
453455
kubectl drain <node-to-drain> --ignore-daemonsets
@@ -503,17 +505,17 @@ without compromising the minimum required capacity for running your workloads.
503505
<!--
504506
- Bring the node back online by marking it schedulable:
505507
-->
506-
- 通过将节点标记为可调度,让节点重新上线:
508+
- 通过将节点标记为可调度,让节点重新上线
507509

508510
<!--
509511
```shell
510-
# replace <node-to-drain> with the name of your node
511-
kubectl uncordon <node-to-drain>
512+
# replace <node-to-uncordon> with the name of your node
513+
kubectl uncordon <node-to-uncordon>
512514
```
513515
-->
514516
```shell
515-
# 将 <node-to-drain> 替换为当前节点的名称
516-
kubectl uncordon <node-to-drain>
517+
# 将 <node-to-uncordon> 替换为当前节点的名称
518+
kubectl uncordon <node-to-uncordon>
517519
```
518520

519521
<!--
@@ -581,8 +583,7 @@ and post-upgrade manifest file for a certain component, a backup file for it wil
581583
`kubeadm-backup-manifests` 包含当前控制面节点的静态 Pod 清单文件的备份版本。
582584
如果升级失败并且无法自动回滚,则此文件夹中的内容可以复制到
583585
`/etc/kubernetes/manifests` 目录实现手工恢复。
584-
如果由于某些原因,在升级前后某个组件的清单未发生变化,则 kubeadm 也不会为之
585-
生成备份版本。
586+
如果由于某些原因,在升级前后某个组件的清单未发生变化,则 kubeadm 也不会为之生成备份版本。
586587

587588
<!--
588589
## How it works

0 commit comments

Comments
 (0)