Merge pull request #42802 from windsonsea/upgradey

k8s-ci-robot · web-flow · commit 54c666d73c48 · 2023-08-31T06:12:48.000-07:00
[zh] sync kubeadm_upgrade 3 files
diff --git a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade.md b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade.md
@@ -1,32 +1,17 @@
-<!--
-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.
--->
-
-
 <!-- 
 Upgrade your cluster smoothly to a newer version with this command 
 -->
-
-此命令能将集群平滑升级到新版本
+此命令能将集群平滑升级到新版本。
 
 <!--
 ### Synopsis
 -->
-
 ### 概要
 
 <!--
 Upgrade your cluster smoothly to a newer version with this command
 -->
-
-此命令能将集群平滑升级到新版本
+此命令能将集群平滑升级到新版本。
 
 ```
 kubeadm upgrade [flags]
@@ -35,7 +20,6 @@ kubeadm upgrade [flags]
 <!--
 ### Options
 -->
-
 ### 选项
 
    <table style="width: 100%; table-layout: fixed;">
@@ -53,7 +37,7 @@ kubeadm upgrade [flags]
 <!--
 <p>help for upgrade</p>
 -->
-<p>upgrade 操作的帮助命令<p>
+<p>upgrade 操作的帮助命令。<p>
 </td>
 </tr>
 
@@ -63,7 +47,6 @@ kubeadm upgrade [flags]
 <!--
 ### Options inherited from parent commands
 -->
-
 ### 继承于父命令的选项
 
    <table style="width: 100%; table-layout: fixed;">
@@ -87,4 +70,3 @@ kubeadm upgrade [flags]
 
 </tbody>
 </table>
-
diff --git a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_apply.md b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_apply.md
@@ -1,30 +1,17 @@
-<!--
-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.
--->
-
 <!--
 Upgrade your Kubernetes cluster to the specified version
 -->
-将 Kubernetes 集群升级到指定版本
+将 Kubernetes 集群升级到指定版本。
 
 <!--
 ### Synopsis
 -->
-
 ### 概要
 
 <!--
 Upgrade your Kubernetes cluster to the specified version
 -->
-
-将 Kubernetes 集群升级到指定版本
+将 Kubernetes 集群升级到指定版本。
 
 ```
 kubeadm upgrade apply [version]
@@ -33,7 +20,6 @@ kubeadm upgrade apply [version]
 <!--
 ### Options
 -->
-
 ### 选项
 
    <table style="width: 100%; table-layout: fixed;">
@@ -52,7 +38,7 @@ kubeadm upgrade apply [version]
 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 版本。
+显示 Kubernetes 的不稳定版本作为升级替代方案，并允许升级到 Kubernetes 的 Alpha、Beta 或 RC 版本。
 </p>
 </td>
 </tr>
@@ -138,13 +124,18 @@ Perform the upgrade of etcd.
 <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/>EtcdLearnerMode=true|false (ALPHA - 默认值=false)
-<br/>PublicKeysECDSA=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>
@@ -172,7 +163,7 @@ Force upgrading although some requirements might not be met. This also implies n
 help for apply
 -->
 <p>
-apply 操作的帮助命令
+apply 操作的帮助命令。
 </p>
 </td>
 </tr>
@@ -221,7 +212,7 @@ Path to a directory that contains files named &quot;target[suffix][+patchtype].e
 <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; 之一。
+&quot;target&quot; 可以是 &quot;kube-apiserver&quot;、&quot;kube-controller-manager&quot;、&quot;kube-scheduler&quot;、&quot;etcd&quot;、&quot;kubeletconfiguration&quot; 之一。
 &quot;patchtype&quot; 可以是 &quot;strategic&quot;、&quot;merge&quot; 或者 &quot;json&quot; 之一，
 并且它们与 kubectl 支持的补丁格式相同。
 默认的 &quot;patchtype&quot; 是 &quot;strategic&quot;。
@@ -265,7 +256,6 @@ Perform the upgrade and do not prompt for confirmation (non-interactive mode).
 <!--
 ### Options inherited from parent commands
 -->
-
 ### 从父命令继承的选项
 
    <table style="width: 100%; table-layout: fixed;">
@@ -291,4 +281,3 @@ Perform the upgrade and do not prompt for confirmation (non-interactive mode).
 
 </tbody>
 </table>
-
diff --git a/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_diff.md b/content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_diff.md
@@ -1,24 +1,11 @@
-<!--
-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.
--->
-
-
 <!--
 Show what differences would be applied to existing static pod manifests. See also: kubeadm upgrade apply --dry-run
 -->
-显示哪些差异将被应用于现有的静态 pod 资源清单。参考: kubeadm upgrade apply --dry-run
+显示哪些差异将被应用于现有的静态 Pod 资源清单。参考：kubeadm upgrade apply --dry-run
 
 <!--
 ### Synopsis
 
-
 Show what differences would be applied to existing static pod manifests. See also: kubeadm upgrade apply --dry-run
 
 ```
@@ -27,14 +14,13 @@ kubeadm upgrade diff [version] [flags]
 -->
 ### 概述
 
-
-显示哪些差异将被应用于现有的静态 pod 资源清单。参考: kubeadm upgrade apply --dry-run 
+显示哪些差异将被应用于现有的静态 Pod 资源清单。参考：kubeadm upgrade apply --dry-run
 
 ```
 kubeadm upgrade diff [version] [flags]
 ```
-<!--
 
+<!--
 ### Options
 
    <table style="width: 100%; table-layout: fixed;">
@@ -64,8 +50,9 @@ kubeadm upgrade diff [version] [flags]
 <td colspan="2">--api-server-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值："/etc/kubernetes/manifests/kube-apiserver.yaml"</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>API服务器清单的路径</p></td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>API 服务器清单的路径。</p></td>
 </tr>
+
 <!--
 <tr>
 <td colspan="2">--config string</td>
@@ -78,8 +65,9 @@ kubeadm upgrade diff [version] [flags]
 <td colspan="2">--config string</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>kubeadm 配置文件的路径</p></td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>kubeadm 配置文件的路径。</p></td>
 </tr>
+
 <!--
 <tr>
 <td colspan="2">-c, --context-lines int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: 3</td>
@@ -92,8 +80,9 @@ kubeadm upgrade diff [version] [flags]
 <td colspan="2">-c, --context-lines int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值：3</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">差异中有多少行上下文</td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;">diff 涉及了多少行上下文。</td>
 </tr>
+
 <!--
 <tr>
 <td colspan="2">--controller-manager-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/manifests/kube-controller-manager.yaml"</td>
@@ -103,11 +92,12 @@ kubeadm upgrade diff [version] [flags]
 </tr>
 -->
 <tr>
-<td colspan="2">--controller-manager-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值： "/etc/kubernetes/manifests/kube-controller-manager.yaml"</td>
+<td colspan="2">--controller-manager-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值："/etc/kubernetes/manifests/kube-controller-manager.yaml"</td>
 </tr>
 <tr>
-<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>控制器清单的路径。</p></td>
 </tr>
+
 <!--
 <tr>
 <td colspan="2">-h, --help</td>
@@ -120,8 +110,9 @@ kubeadm upgrade diff [version] [flags]
 <td colspan="2">-h, --help</td>
 </tr>
 <tr>
-<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>diff 操作的帮助命令</p></td>
 </tr>
+
 <!--
 <tr>
 <td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"</td>
@@ -136,22 +127,20 @@ kubeadm upgrade diff [version] [flags]
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;"><p>与集群通信时使用的 kubeconfig 文件，如果标志是未设置，则可以在一组标准位置中搜索现有的 kubeconfig 文件。</p></td>
 </tr>
+
 <!--
 <tr>
 <td colspan="2">--scheduler-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/manifests/kube-scheduler.yaml"</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">path to scheduler manifest</td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>path to scheduler manifest</p></td>
 </tr>
-
-</tbody>
-</table>
 -->
 <tr>
 <td colspan="2">--scheduler-manifest string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值："/etc/kubernetes/manifests/kube-scheduler.yaml"</td>
 </tr>
 <tr>
-<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>调度程序清单的路径。</p></td>
 </tr>
 
 </tbody>
@@ -176,9 +165,7 @@ kubeadm upgrade diff [version] [flags]
 
 </tbody>
 </table>
-
 -->
-
 ### 从父命令继承的选项
 
    <table style="width: 100%; table-layout: fixed;">
@@ -192,7 +179,7 @@ kubeadm upgrade diff [version] [flags]
 <td colspan="2">--rootfs string</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>[EXPERIMENTAL] “真实”主机根文件系统的路径。</p></td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>[实验] 指向“真实”主机根文件系统的路径。</p></td>
 </tr>
 
 </tbody>
