Merge pull request #42805 from windsonsea/upgrade2

k8s-ci-robot · web-flow · commit 919f5e9a67b9 · 2023-08-31T15:26:30.000-07:00
[zh] sync kubeadm_upgrade 5 files
diff --git a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node.md b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node.md
@@ -1,34 +1,21 @@
-<!--
-The file is auto-generated from the Go source code of the component using a generic
-[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
-to generate the reference documentation, please read
-[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
-To update the reference conent, please follow the 
-[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
-guide. You can file document formatting bugs against the
-[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
--->
-
 <!--
 Upgrade commands for a node in the cluster
 -->
-升级集群中某个节点的命令
+升级集群中某个节点的命令。
 
 <!--
 ### Synopsis
 -->
-
 ### 概要
 
 <!--
 Upgrade commands for a node in the cluster
 -->
-升级集群中某个节点的命令
+升级集群中某个节点的命令。
 
 <!--
 The "node" command executes the following phases:
 -->
-
 "node" 命令执行以下阶段：
 
 <!--
@@ -38,7 +25,6 @@ control-plane   Upgrade the control plane instance deployed on this node, if any
 kubelet-config  Upgrade the kubelet configuration for this node
 ```
 -->
-
 ```
 preflight       执行节点升级前检查
 control-plane   如果存在的话，升级部署在该节点上的管理面实例
@@ -52,7 +38,6 @@ kubeadm upgrade node [flags]
 <!--
 ### Options
 -->
-
 ### 选项
 
    <table style="width: 100%; table-layout: fixed;">
@@ -71,7 +56,7 @@ kubeadm upgrade node [flags]
 Perform the renewal of certificates used by component changed during upgrades.
 -->
 <p>
-对升级期间变化的组件所使用的证书执行更新。
+对升级期间变化的组件所使用的证书执行续订。
 </p>
 </td>
 </tr>
@@ -117,7 +102,7 @@ Perform the upgrade of etcd.
 help for node
 -->
 <p>
-node 操作的帮助命令
+node 操作的帮助命令。
 </p>
 </td>
 </tr>
@@ -128,11 +113,10 @@ node 操作的帮助命令
 <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. -->
-其错误将显示为警告的检查列表。示例：'IsPrivilegedUser,Swap'。 值 'all' 忽略所有检查中的错误。
+其错误将显示为警告的检查列表。示例：'IsPrivilegedUser,Swap'。值 'all' 忽略所有检查中的错误。
 </p></td>
 </tr>
 
-
 <tr>
 <!-- 
 <td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"</td>
@@ -155,7 +139,9 @@ 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. -->
+<!--
+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.
+-->
 包含名为 &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; 之一。
@@ -177,7 +163,7 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
 List of phases to be skipped
 -->
 <p>
-要跳过的阶段的列表
+要跳过的阶段的列表。
 </p>
 </td>
 </tr>
@@ -188,7 +174,6 @@ List of phases to be skipped
 <!--
 ### Options inherited from parent commands
 -->
-
 ### 从父命令继承的选项
 
    <table style="width: 100%; table-layout: fixed;">
diff --git a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase.md b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase.md
@@ -1,35 +1,21 @@
-<!--
-The file is auto-generated from the Go source code of the component using a generic
-[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
-to generate the reference documentation, please read
-[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
-To update the reference content, please follow the 
-[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
-guide. You can file document formatting bugs against the
-[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
--->
-
 <!--
 Use this command to invoke single phase of the node workflow
 -->
-使用此命令调用 node 工作流的某个阶段
+使用此命令调用 node 工作流的某个阶段。
 
 <!--
 ### Synopsis
 -->
-
 ### 概要
 
 <!--
 Use this command to invoke single phase of the node workflow
 -->
-
-使用此命令调用 node 工作流的某个阶段
+使用此命令调用 node 工作流的某个阶段。
 
 <!--
 ### Options
 -->
-
 ### 选项
 
    <table style="width: 100%; table-layout: fixed;">
@@ -48,7 +34,7 @@ Use this command to invoke single phase of the node workflow
 help for phase
 -->
 <p>
-phase 操作的帮助命令
+phase 操作的帮助命令。
 </p>
 </td>
 </tr>
diff --git a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase_kubelet-config.md b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase_kubelet-config.md
@@ -1,17 +1,17 @@
 <!--
 Upgrade the kubelet configuration for this node
 -->
-升级此节点的 kubelet 配置
-
-<!-- ### Synopsis -->
+升级此节点的 kubelet 配置。
 
+<!--
+### Synopsis
+-->
 ### 概要
 
 <!--
 Download the kubelet configuration from the kubelet-config ConfigMap stored in the cluster
 -->
-
-从集群中 ConfigMap kubelet-config 下载 kubelet 配置
+从集群中 ConfigMap kubelet-config 下载 kubelet 配置。
 
 ```
 kubeadm upgrade node phase kubelet-config [flags]
@@ -20,7 +20,6 @@ kubeadm upgrade node phase kubelet-config [flags]
 <!--
 ### Options
 -->
-
 ### 选项
 
    <table style="width: 100%; table-layout: fixed;">
@@ -39,7 +38,7 @@ kubeadm upgrade node phase kubelet-config [flags]
 Do not change any state, just output the actions that would be performed.
 -->
 <p>
-不改变任何状态，只输出将要执行的操作
+不改变任何状态，只输出将要执行的操作。
 </p>
 </td>
 </tr>
@@ -53,7 +52,7 @@ Do not change any state, just output the actions that would be performed.
 help for kubelet-config
 -->
 <p>
-kubelet-config 操作的帮助信息
+kubelet-config 操作的帮助命令。
 </p>
 </td>
 </tr>
@@ -72,7 +71,7 @@ kubelet-config 操作的帮助信息
 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 文件。
+用于和集群通信的 kubeconfig 文件。如果它没有被设置，那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件。
 </p>
 </td>
 </tr>
@@ -97,12 +96,10 @@ Path to a directory that contains files named &quot;target[suffix][+patchtype].e
 </tbody>
 </table>
 
-
-### 从父命令继承的选项
-
 <!--
 ### Options inherited from parent commands
 -->
+### 从父命令继承的选项
 
    <table style="width: 100%; table-layout: fixed;">
 <colgroup>
@@ -127,4 +124,3 @@ Path to a directory that contains files named &quot;target[suffix][+patchtype].e
 
 </tbody>
 </table>
-
diff --git a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase_preflight.md b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase_preflight.md
@@ -1,7 +1,7 @@
 <!--
 Run upgrade node pre-flight checks
 -->
-执行升级节点的预检
+执行升级节点的预检。
 
 <!--
 ### Synopsis
@@ -33,18 +33,28 @@ kubeadm upgrade node phase preflight [flags]
 <td colspan="2">-h, --help</td>
 </tr>
 <tr>
-<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;">help for preflight</td> -->
-<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>preflight 操作的帮助命令</p></td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
+<!--
+help for preflight
+-->
+preflight 操作的帮助命令。
+</p>
+</td>
 </tr>
 
 <tr>
 <td colspan="2">--ignore-preflight-errors strings</td>
 </tr>
 <tr>
-<!-- 
-<td></td><td style="line-height: 130%; word-wrap: break-word;">A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.</td> 
+<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.
 -->
-<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>错误将显示为警告的检查清单。示例：'IsPrivilegedUser,Swap'。值为'all'表示忽略所有检查的错误。</p></td>
+错误将显示为警告的检查清单。示例：'IsPrivilegedUser,Swap'。值为 'all' 表示忽略所有检查的错误。
+</p>
+</td>
 </tr>
 
 </tbody>
@@ -66,10 +76,15 @@ kubeadm upgrade node phase preflight [flags]
 <td colspan="2">--rootfs string</td>
 </tr>
 <tr>
-<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;">[EXPERIMENTAL] The path to the 'real' host root filesystem.</td> -->
-<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>[实验] 到'真实'主机根文件系统的路径。</p></td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
+<!--
+[EXPERIMENTAL] The path to the 'real' host root filesystem.
+-->
+[实验] 指向 “真实” 主机根文件系统的路径。
+</p>
+</td>
 </tr>
 
 </tbody>
 </table>
-
diff --git a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_plan.md b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_plan.md
@@ -32,7 +32,7 @@ kubeadm upgrade plan [version] [flags]
 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/发行候选版本。
+显示不稳定版本的 Kubernetes 作为升级替代方案，并允许升级到 Kubernetes 的 Alpha、Beta 或 RC 版本。
 </p>
 </td>
 </tr>
@@ -46,7 +46,7 @@ Show unstable versions of Kubernetes as an upgrade alternative and allow upgradi
 Show release candidate versions of Kubernetes as an upgrade alternative and allow upgrading to a release candidate versions of Kubernetes.
 -->
 <p>
-显示 Kubernetes 的发行候选版本作为升级选择，并允许升级到 Kubernetes 的发行候选版本。
+显示 Kubernetes 的发行候选版本作为升级选择，并允许升级到 Kubernetes 的 RC 版本。
 </p>
 </td>
 </tr>
@@ -71,13 +71,18 @@ Path to a kubeadm configuration file.
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
 <!--
-A set of key=value pairs that describe feature gates for various features. Options are:<br/>EtcdLearnerMode=true|false (ALPHA - default=false)<br/>PublicKeysECDSA=true|false (ALPHA - default=false)<br/>RootlessControlPlane=true|false (ALPHA - default=false)
+A set of key=value pairs that describe feature gates for various features. Options are:<br/>
+EtcdLearnerMode=true|false (ALPHA - default=false)<br/>
+PublicKeysECDSA=true|false (ALPHA - default=false)<br/>
+RootlessControlPlane=true|false (ALPHA - default=false)<br/>
+UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - default=false)
 -->
 <p>
-一组描述各种特征特性门控的键值对。选项有：
-<br/>PublicKeysECDSA=true|false (ALPHA - 默认值=false)
-<br/>EtcdLearnerMode=true|false (ALPHA - 默认值=false)
-<br/>RootlessControlPlane=true|false (ALPHA - 默认值=false)
+一组描述各种特征特性门控的键值对。选项有：<br/>
+EtcdLearnerMode=true|false (ALPHA - 默认值=false)<br/>
+PublicKeysECDSA=true|false (ALPHA - 默认值=false)<br/>
+RootlessControlPlane=true|false (ALPHA - 默认值=false)<br/>
+UpgradeAddonsBeforeControlPlane=true|false (DEPRECATED - 默认值=false)
 </p>
 </td>
 </tr>
@@ -91,7 +96,7 @@ A set of key=value pairs that describe feature gates for various features. Optio
 help for plan
 -->
 <p>
-plan 的帮助信息
+plan 操作的帮助命令。
 </p>
 </td>
 </tr>
@@ -105,7 +110,7 @@ plan 的帮助信息
 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' 忽略所有检查错误。
+其错误将显示为警告的检查列表。例如：'IsPrivilegedUser,Swap'。值 'all' 忽略所有检查错误。
 </p>
 </td>
 </tr>
@@ -196,7 +201,7 @@ If true, keep the managedFields when printing objects in JSON or YAML format.
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
 <p>
-[EXPERIMENTAL] “真实”主机根文件系统的路径。
+[实验] 指向 “真实” 宿主机根文件系统的路径。
 </p>
 </td>
 </tr>
