Merge pull request #47695 from windsonsea/upgyhf

Sync kubeadm-upgrade and kubeadm-upgrade-phase and its dependencies

Author: k8s-ci-robot

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade/_index.md

@@ -34,10 +34,10 @@ kubeadm upgrade apply [version]
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Show unstable versions of Kubernetes as an upgrade alternative and allow upgrading to an alpha/beta/release candidate versions of Kubernetes.
 -->
-<p>
 显示 Kubernetes 的不稳定版本作为升级替代方案，并允许升级到 Kubernetes 的 Alpha、Beta 或 RC 版本。
 </p>
 </td>
@@ -48,10 +48,10 @@ Show unstable versions of Kubernetes as an upgrade alternative and allow upgradi
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Show release candidate versions of Kubernetes as an upgrade alternative and allow upgrading to a release candidate versions of Kubernetes.
 -->
-<p>
 显示 Kubernetes 的候选版本作为升级替代方案，并允许升级到 Kubernetes 的 RC 版本。
 </p>
 </td>
@@ -62,10 +62,10 @@ Show release candidate versions of Kubernetes as an upgrade alternative and allo
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Perform the renewal of certificates used by component changed during upgrades.
 -->
-<p>
 执行升级期间更改的组件所使用的证书的更新。
 </p>
 </td>
@@ -76,10 +76,10 @@ Perform the renewal of certificates used by component changed during upgrades.
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Path to a kubeadm configuration file.
 -->
-<p>
 kubeadm 配置文件的路径。
 </p>
 </td>
@@ -90,10 +90,10 @@ kubeadm 配置文件的路径。
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Do not change any state, just output what actions would be performed.
 -->
-<p>
 不要更改任何状态，只输出要执行的操作。
 </p>
 </td>
@@ -109,10 +109,10 @@ Do not change any state, just output what actions would be performed.
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Perform the upgrade of etcd.
 -->
-<p>
 执行 etcd 的升级。
 </p>
 </td>
@@ -123,6 +123,7 @@ Perform the upgrade of etcd.
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 A set of key=value pairs that describe feature gates for various features. Options are:<br/>
 EtcdLearnerMode=true|false (BETA - default=true)<br/>
@@ -131,7 +132,6 @@ RootlessControlPlane=true|false (ALPHA - default=false)<br/>
 UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)<br/>
 WaitForAllControlPlaneComponents=true|false (ALPHA - default=false)
 -->
-<p>
 一组键值对，用于描述各种功能。选项包括：<br/>
 EtcdLearnerMode=true|false (ALPHA - 默认值=false)<br/>
 PublicKeysECDSA=true|false (BETA - 默认值=true)<br/>
@@ -147,10 +147,10 @@ WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Force upgrading although some requirements might not be met. This also implies non-interactive mode.
 -->
-<p>
 强制升级，但可能无法满足某些要求。这也意味着非交互模式。
 </p>
 </td>
@@ -161,10 +161,10 @@ Force upgrading although some requirements might not be met. This also implies n
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 help for apply
 -->
-<p>
 apply 操作的帮助命令。
 </p>
 </td>
@@ -175,10 +175,10 @@ apply 操作的帮助命令。
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.
 -->
-<p>
 错误将显示为警告的检查列表；例如：'IsPrivilegedUser,Swap'。取值为 'all' 时将忽略检查中的所有错误。
 </p>
 </td>
@@ -194,10 +194,10 @@ A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedU
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 The kubeconfig file to use when talking to the cluster. If the flag is not set, a set of standard locations can be searched for an existing kubeconfig file.
 -->
-<p>
 与集群通信时使用的 kubeconfig 文件。如果未设置标志，则在相关目录下搜索以查找现有 kubeconfig 文件。
 </p>
 </td>
@@ -208,10 +208,10 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Path to a directory that contains files named &quot;target[suffix][+patchtype].extension&quot;. For example, &quot;kube-apiserver0+merge.yaml&quot; or just &quot;etcd.json&quot;. &quot;target&quot; can be one of &quot;kube-apiserver&quot;, &quot;kube-controller-manager&quot;, &quot;kube-scheduler&quot;, &quot;etcd&quot;, &quot;kubeletconfiguration&quot;. &quot;patchtype&quot; can be one of &quot;strategic&quot;, &quot;merge&quot; or &quot;json&quot; and they match the patch formats supported by kubectl. The default &quot;patchtype&quot; is &quot;strategic&quot;. &quot;extension&quot; must be either &quot;json&quot; or &quot;yaml&quot;. &quot;suffix&quot; is an optional string that can be used to determine which patches are applied first alpha-numerically.
 -->
-<p>
 包含名为 &quot;target[suffix][+patchtype].extension&quot; 的文件的目录的路径。
 例如，&quot;kube-apiserver0+merge.yaml&quot;或是简单的 &quot;etcd.json&quot;。
 &quot;target&quot; 可以是 &quot;kube-apiserver&quot;、&quot;kube-controller-manager&quot;、&quot;kube-scheduler&quot;、&quot;etcd&quot;、&quot;kubeletconfiguration&quot; 之一。
@@ -229,10 +229,10 @@ Path to a directory that contains files named &quot;target[suffix][+patchtype].e
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Specifies whether the configuration file that will be used in the upgrade should be printed or not.
 -->
-<p>
 指定是否应打印将在升级中使用的配置文件。
 </p>
 </td>
@@ -243,10 +243,10 @@ Specifies whether the configuration file that will be used in the upgrade should
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Perform the upgrade and do not prompt for confirmation (non-interactive mode).
 -->
-<p>
 执行升级，不提示确认（非交互模式）。
 </p>
 </td>
@@ -272,10 +272,10 @@ Perform the upgrade and do not prompt for confirmation (non-interactive mode).
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
-<p>
 [实验] 指向 '真实' 宿主机根文件系统的路径。
 </p>
 </td>

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_apply.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade/kubeadm_upgrade_apply.md

@@ -7,14 +7,10 @@ Show what differences would be applied to existing static pod manifests. See als
 ### Synopsis
 
 Show what differences would be applied to existing static pod manifests. See also: kubeadm upgrade apply --dry-run
-
-```
-kubeadm upgrade diff [version] [flags]
-```
 -->
-### 概述
+### 概要
 
-显示哪些差异将被应用于现有的静态 Pod 资源清单。参考：kubeadm upgrade apply --dry-run
+显示哪些差异将被应用于现有的静态 Pod 资源清单。另请参考：kubeadm upgrade apply --dry-run
 
 ```
 kubeadm upgrade diff [version] [flags]

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_diff.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade/kubeadm_upgrade_diff.md

@@ -34,10 +34,10 @@ kubeadm upgrade node phase kubelet-config [flags]
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Do not change any state, just output the actions that would be performed.
 -->
-<p>
 不改变任何状态，只输出将要执行的操作。
 </p>
 </td>
@@ -48,10 +48,10 @@ Do not change any state, just output the actions that would be performed.
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 help for kubelet-config
 -->
-<p>
 kubelet-config 操作的帮助命令。
 </p>
 </td>
@@ -67,10 +67,10 @@ kubelet-config 操作的帮助命令。
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 The kubeconfig file to use when talking to the cluster. If the flag is not set, a set of standard locations can be searched for an existing kubeconfig file.
 -->
-<p>
 用于和集群通信的 kubeconfig 文件。如果它没有被设置，那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件。
 </p>
 </td>
@@ -113,10 +113,10 @@ Path to a directory that contains files named &quot;target[suffix][+patchtype].e
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
-<p>
 [实验] 到'真实'主机根文件系统的路径。
 </p>
 </td>

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade/kubeadm_upgrade_node.md

@@ -3,33 +3,33 @@ title: kubeadm upgrade phase
 weight: 90
 content_type: concept
 ---
+
 <!--
 In v1.15.0, kubeadm introduced preliminary support for `kubeadm upgrade node` phases.
 Phases for other `kubeadm upgrade` sub-commands such as `apply`, could be added in the
 following releases.
 -->
-
-在 Kubernetes v1.15.0 版本中，kubeadm 引入了对 `kubeadm upgrade node` 阶段的初步支持。其他 `kubeadm upgrade` 子命令如 `apply` 等阶段将在未来发行版中添加。
+在 Kubernetes v1.15.0 版本中，kubeadm 引入了对 `kubeadm upgrade node` 阶段的初步支持。
+其他 `kubeadm upgrade` 子命令如 `apply` 等阶段将在未来发行版中添加。
 
 <!--
 ## kubeadm upgrade node phase {#cmd-node-phase}
 -->
-
-## kubeadm upgrade node phase {#cmd-node-phase}
+## kubeadm upgrade node 阶段    {#cmd-node-phase}
 
 <!--
 Using this phase you can choose to execute the separate steps of the upgrade of
 secondary control-plane or worker nodes. Please note that `kubeadm upgrade apply` still has to
 be called on a primary control-plane node.
 -->
-
-使用此阶段，可以选择执行辅助控制平面或工作节点升级的单独步骤。请注意，`kubeadm upgrade apply` 命令仍然必须在主控制平面节点上调用。
+使用此阶段，你可以选择执行辅助控制平面或工作节点升级的单独步骤。
+请注意，`kubeadm upgrade apply` 命令仍然必须在主控制平面节点上调用。
 
 {{< tabs name="tab-phase" >}}
-{{< tab name="phase" include="generated/kubeadm_upgrade_node_phase.md" />}}
-{{< tab name="preflight" include="generated/kubeadm_upgrade_node_phase_preflight.md" />}}
-{{< tab name="control-plane" include="generated/kubeadm_upgrade_node_phase_control-plane.md" />}}
-{{< tab name="kubelet-config" include="generated/kubeadm_upgrade_node_phase_kubelet-config.md" />}}
+{{< tab name="phase" include="generated/kubeadm_upgrade/kubeadm_upgrade_node_phase.md" />}}
+{{< tab name="preflight" include="generated/kubeadm_upgrade/kubeadm_upgrade_node_phase_preflight.md" />}}
+{{< tab name="control-plane" include="generated/kubeadm_upgrade/kubeadm_upgrade_node_phase_control-plane.md" />}}
+{{< tab name="kubelet-config" include="generated/kubeadm_upgrade/kubeadm_upgrade_node_phase_kubelet-config.md" />}}
 {{< /tabs >}}
 
 ## {{% heading "whatsnext" %}}
@@ -43,6 +43,7 @@ be called on a primary control-plane node.
 -->
 * [kubeadm init](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-init/) 引导一个 Kubernetes 控制平面节点
 * [kubeadm join](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-join/) 将节点加入到集群
-* [kubeadm reset](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-reset/) 还原 `kubeadm init` 或 `kubeadm join` 命令对主机所做的任何更改
+* [kubeadm reset](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-reset/) 还原 `kubeadm init` 或
+  `kubeadm join` 命令对主机所做的任何更改
 * [kubeadm upgrade](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/) 升级 kubeadm 节点
 * [kubeadm alpha](/zh-cn/docs/reference/setup-tools/kubeadm/kubeadm-alpha/) 尝试实验性功能