kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #45160 from windsonsea/admyhf 

[zh] Sync kubeadm-upgrade.md and upgrading-linux-nodes.md
pull/45226/head^2
Kubernetes Prow Robot 2024-02-19 18:12:08 -08:00 committed by GitHub
parent e9c7435bf4 07c1a59f1f
commit 85dd0447c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 76 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ The upgrade workflow at high level is the following:
they could be running CoreDNS Pods or other critical workloads. For more information see they could be running CoreDNS Pods or other critical workloads. For more information see
[Draining nodes](/docs/tasks/administer-cluster/safely-drain-node/). [Draining nodes](/docs/tasks/administer-cluster/safely-drain-node/).
- The Kubernetes project recommends that you match your kubelet and kubeadm versions. - The Kubernetes project recommends that you match your kubelet and kubeadm versions.
You can instead use an a version of kubelet that is older than kubeadm, provided it is within the You can instead use a version of kubelet that is older than kubeadm, provided it is within the
range of supported versions. range of supported versions.
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). 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).
- All containers are restarted after upgrade, because the container spec hash value is changed. - All containers are restarted after upgrade, because the container spec hash value is changed.
@ -139,28 +139,37 @@ Find the latest patch release for Kubernetes {{< skew currentVersion >}} using t
使用操作系统的包管理器找到最新的补丁版本 Kubernetes {{< skew currentVersion >}}： 使用操作系统的包管理器找到最新的补丁版本 Kubernetes {{< skew currentVersion >}}：
{{< tabs name="k8s_install_versions" >}} {{< tabs name="k8s_install_versions" >}}
{{% tab name="Ubuntu, Debian or HypriotOS" %}} {{% tab name="Ubuntu、Debian 或 HypriotOS" %}}
<!-- <!--
```shell
# Find the latest {{< skew currentVersion >}} version in the list. # Find the latest {{< skew currentVersion >}} version in the list.
# It should look like {{< skew currentVersion >}}.x-*, where x is the latest patch. # It should look like {{< skew currentVersion >}}.x-*, where x is the latest patch.
sudo apt update
sudo apt-cache madison kubeadm
```
--> -->
```shell ```shell
# 在列表中查找最新的 {{< skew currentVersion >}} 版本 # 在列表中查找最新的 {{< skew currentVersion >}} 版本
# 它看起来应该是 {{< skew currentVersion >}}.x-*，其中 x 是最新的补丁版本 # 它看起来应该是 {{< skew currentVersion >}}.x-*，其中 x 是最新的补丁版本
apt update sudo apt update
apt-cache madison kubeadm sudo apt-cache madison kubeadm
``` ```
{{% /tab %}} {{% /tab %}}
{{% tab name="CentOS, RHEL or Fedora" %}} {{% tab name="CentOS、RHEL 或 Fedora" %}}
<!-- <!--
```shell
# Find the latest {{< skew currentVersion >}} version in the list. # Find the latest {{< skew currentVersion >}} version in the list.
# It should look like {{< skew currentVersion >}}.x-*, where x is the latest patch. # It should look like {{< skew currentVersion >}}.x-*, where x is the latest patch.
sudo yum list --showduplicates kubeadm --disableexcludes=kubernetes
```
--> -->
```shell ```shell
# 在列表中查找最新的 {{< skew currentVersion >}} 版本 # 在列表中查找最新的 {{< skew currentVersion >}} 版本
# 它看起来应该是 {{< skew currentVersion >}}.x-*，其中 x 是最新的补丁版本 # 它看起来应该是 {{< skew currentVersion >}}.x-*，其中 x 是最新的补丁版本
yum list --showduplicates kubeadm --disableexcludes=kubernetes sudo yum list --showduplicates kubeadm --disableexcludes=kubernetes
``` ```
{{% /tab %}} {{% /tab %}}
@ -195,27 +204,35 @@ Pick a control plane node that you wish to upgrade first. It must have the `/etc
1. 升级 kubeadm： 1. 升级 kubeadm：
{{< tabs name="k8s_install_kubeadm_first_cp" >}} {{< tabs name="k8s_install_kubeadm_first_cp" >}}
{{% tab name="Ubuntu, Debian or HypriotOS" %}} {{% tab name="Ubuntu、Debian 或 HypriotOS" %}}
<!-- <!--
```shell
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
sudo apt-mark unhold kubeadm && \
sudo apt-get update && sudo apt-get install -y kubeadm='{{< skew currentVersion >}}.x-*' && \
sudo apt-mark hold kubeadm
```
--> -->
```shell ```shell
# 用最新的补丁版本号替换 {{< skew currentVersion >}}.x-* 中的 x # 用最新的补丁版本号替换 {{< skew currentVersion >}}.x-* 中的 x
apt-mark unhold kubeadm && \ sudo apt-mark unhold kubeadm && \
apt-get update && apt-get install -y kubeadm='{{< skew currentVersion >}}.x-*' && \ sudo apt-get update && sudo apt-get install -y kubeadm='{{< skew currentVersion >}}.x-*' && \
apt-mark hold kubeadm sudo apt-mark hold kubeadm
``` ```
{{% /tab %}} {{% /tab %}}
{{% tab name="CentOS, RHEL or Fedora" %}} {{% tab name="CentOS、RHEL 或 Fedora" %}}
<!-- <!--
```shell
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
```
--> -->
```shell ```shell
# 用最新的补丁版本号替换 {{< skew currentVersion >}}.x-* 中的 x # 用最新的补丁版本号替换 {{< skew currentVersion >}}.x-* 中的 x
yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
``` ```
{{% /tab %}} {{% /tab %}}
@ -236,7 +253,7 @@ Pick a control plane node that you wish to upgrade first. It must have the `/etc
3. 验证升级计划： 3. 验证升级计划：
```shell ```shell
kubeadm upgrade plan sudo kubeadm upgrade plan
``` ```
<!-- <!--
@ -402,27 +419,35 @@ kubectl drain <node-to-drain> --ignore-daemonsets
1. 升级 kubelet 和 kubectl： 1. 升级 kubelet 和 kubectl：
{{< tabs name="k8s_install_kubelet" >}} {{< tabs name="k8s_install_kubelet" >}}
{{% tab name="Ubuntu, Debian or HypriotOS" %}} {{% tab name="Ubuntu、Debian 或 HypriotOS" %}}
<!-- <!--
```shell
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
sudo apt-mark unhold kubelet kubectl && \
sudo apt-get update && sudo apt-get install -y kubelet='{{< skew currentVersion >}}.x-*' kubectl='{{< skew currentVersion >}}.x-*' && \
sudo apt-mark hold kubelet kubectl
```
--> -->
```shell ```shell
# 用最新的补丁版本替换 {{< skew currentVersion >}}.x-* 中的 x # 用最新的补丁版本替换 {{< skew currentVersion >}}.x-* 中的 x
apt-mark unhold kubelet kubectl && \ sudo apt-mark unhold kubelet kubectl && \
apt-get update && apt-get install -y kubelet='{{< skew currentVersion >}}.x-*' kubectl='{{< skew currentVersion >}}.x-*' && \ sudo apt-get update && sudo apt-get install -y kubelet='{{< skew currentVersion >}}.x-*' kubectl='{{< skew currentVersion >}}.x-*' && \
apt-mark hold kubelet kubectl sudo apt-mark hold kubelet kubectl
``` ```
{{% /tab %}} {{% /tab %}}
{{% tab name="CentOS, RHEL or Fedora" %}} {{% tab name="CentOS、RHEL 或 Fedora" %}}
<!-- <!--
```shell
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
```
--> -->
```shell ```shell
# 用最新的补丁版本号替换 {{< skew currentVersion >}}.x-* 中的 x # 用最新的补丁版本号替换 {{< skew currentVersion >}}.x-* 中的 x
yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
``` ```
{{% /tab %}} {{% /tab %}}
@ -517,9 +542,9 @@ This command is idempotent and eventually makes sure that the actual state is th
此命令是幂等的，并最终确保实际状态是你声明的期望状态。 此命令是幂等的，并最终确保实际状态是你声明的期望状态。
<!-- <!--
To recover from a bad state, you can also run `kubeadm upgrade apply --force` without changing the version that your cluster is running. To recover from a bad state, you can also run `sudo kubeadm upgrade apply --force` without changing the version that your cluster is running.
--> -->
要从故障状态恢复，你还可以运行 `kubeadm upgrade apply --force` 而无需更改集群正在运行的版本。 要从故障状态恢复，你还可以运行 `sudo kubeadm upgrade apply --force` 而无需更改集群正在运行的版本。
<!-- <!--
During upgrade kubeadm writes the following backup folders under `/etc/kubernetes/tmp`: During upgrade kubeadm writes the following backup folders under `/etc/kubernetes/tmp`:

38
content/zh-cn/docs/tasks/administer-cluster/kubeadm/upgrading-linux-nodes.md
View File

@ -62,22 +62,30 @@ Upgrade kubeadm:
{{< tabs name="k8s_install_kubeadm_worker_nodes" >}} {{< tabs name="k8s_install_kubeadm_worker_nodes" >}}
{{% tab name="Ubuntu、Debian 或 HypriotOS" %}} {{% tab name="Ubuntu、Debian 或 HypriotOS" %}}
<!-- <!--
```shell
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
sudo apt-mark unhold kubeadm && \
sudo apt-get update && sudo apt-get install -y kubeadm='{{< skew currentVersion >}}.x-*' && \
sudo apt-mark hold kubeadm
```
--> -->
```shell ```shell
# 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本 # 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本
apt-mark unhold kubeadm && \ sudo apt-mark unhold kubeadm && \
apt-get update && apt-get install -y kubeadm='{{< skew currentVersion >}}.x-*' && \ sudo apt-get update && sudo apt-get install -y kubeadm='{{< skew currentVersion >}}.x-*' && \
apt-mark hold kubeadm sudo apt-mark hold kubeadm
``` ```
{{% /tab %}} {{% /tab %}}
{{% tab name="CentOS、RHEL 或 Fedora" %}} {{% tab name="CentOS、RHEL 或 Fedora" %}}
<!-- <!--
```shell
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
```
--> -->
```shell ```shell
# 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本 # 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本
yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes sudo yum install -y kubeadm-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
``` ```
{{% /tab %}} {{% /tab %}}
{{< /tabs >}} {{< /tabs >}}
@ -105,8 +113,11 @@ Prepare the node for maintenance by marking it unschedulable and evicting the wo
将节点标记为不可调度并驱逐所有负载，准备节点的维护： 将节点标记为不可调度并驱逐所有负载，准备节点的维护：
<!-- <!--
```shell
# execute this command on a control plane node # execute this command on a control plane node
# replace <node-to-drain> with the name of your node you are draining # replace <node-to-drain> with the name of your node you are draining
kubectl drain <node-to-drain> --ignore-daemonsets
```
--> -->
```shell ```shell
# 在控制平面节点上执行此命令 # 在控制平面节点上执行此命令
@ -126,22 +137,30 @@ kubectl drain <node-to-drain> --ignore-daemonsets
{{< tabs name="k8s_kubelet_and_kubectl" >}} {{< tabs name="k8s_kubelet_and_kubectl" >}}
{{% tab name="Ubuntu、Debian 或 HypriotOS" %}} {{% tab name="Ubuntu、Debian 或 HypriotOS" %}}
<!-- <!--
```shell
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
sudo apt-mark unhold kubelet kubectl && \
sudo apt-get update && sudo apt-get install -y kubelet='{{< skew currentVersion >}}.x-*' kubectl='{{< skew currentVersion >}}.x-*' && \
sudo apt-mark hold kubelet kubectl
```
--> -->
```shell ```shell
# 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本 # 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本
apt-mark unhold kubelet kubectl && \ sudo apt-mark unhold kubelet kubectl && \
apt-get update && apt-get install -y kubelet='{{< skew currentVersion >}}.x-*' kubectl='{{< skew currentVersion >}}.x-*' && \ sudo apt-get update && sudo apt-get install -y kubelet='{{< skew currentVersion >}}.x-*' kubectl='{{< skew currentVersion >}}.x-*' && \
apt-mark hold kubelet kubectl sudo apt-mark hold kubelet kubectl
``` ```
{{% /tab %}} {{% /tab %}}
{{% tab name="CentOS、RHEL 或 Fedora" %}} {{% tab name="CentOS、RHEL 或 Fedora" %}}
<!-- <!--
```shell
# replace x in {{< skew currentVersion >}}.x-* with the latest patch version # replace x in {{< skew currentVersion >}}.x-* with the latest patch version
sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
```
--> -->
```shell ```shell
# 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本 # 将 {{< skew currentVersion >}}.x-* 中的 x 替换为最新的补丁版本
yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes sudo yum install -y kubelet-'{{< skew currentVersion >}}.x-*' kubectl-'{{< skew currentVersion >}}.x-*' --disableexcludes=kubernetes
``` ```
{{% /tab %}} {{% /tab %}}
{{< /tabs >}} {{< /tabs >}}
@ -166,8 +185,11 @@ Bring the node back online by marking it schedulable:
通过将节点标记为可调度，让节点重新上线： 通过将节点标记为可调度，让节点重新上线：
<!-- <!--
```shell
# execute this command on a control plane node # execute this command on a control plane node
# replace <node-to-uncordon> with the name of your node # replace <node-to-uncordon> with the name of your node
kubectl uncordon <node-to-uncordon>
```
--> -->
```shell ```shell
# 在控制平面节点上执行此命令 # 在控制平面节点上执行此命令