Merge pull request #33577 from kinzhi/kinzhi99

k8s-ci-robot · web-flow · commit d0fdb1cca6bc · 2022-05-11T18:47:14.000-07:00
[zh]Sync kubeadm-5
diff --git a/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_kubelet-start.md b/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_kubelet-start.md
@@ -88,6 +88,3 @@ kubeadm init phase kubelet-start [flags]
 
 </tbody>
 </table>
-
-
-
diff --git a/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-prepare.md b/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-prepare.md
@@ -67,6 +67,3 @@ kubeadm join phase control-plane-prepare [flags]
 
 </tbody>
 </table>
-
-
-
diff --git a/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-prepare_all.md b/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-prepare_all.md
@@ -151,6 +151,3 @@ kubeadm join phase control-plane-prepare all [api-server-endpoint] [flags]
 
 </tbody>
 </table>
-
-
-
diff --git a/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_diff.md b/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_diff.md
@@ -102,6 +102,3 @@ kubeadm upgrade diff [version] [flags]
 
 </tbody>
 </table>
-
-
-
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_kubelet-start.md b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_kubelet-start.md
@@ -1,3 +1,19 @@
+<!--
+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.
+-->
+
+
+<!--
+Write kubelet settings and (re)start the kubelet
+-->
+编写 kubelet 配置并（重新）启动 kubelet
 
 <!-- 
 ### Synopsis
@@ -51,7 +67,9 @@ kubeadm init phase kubelet-start --config config.yaml
 <!--
 Path to a kubeadm configuration file.
 -->
+<p>
 kubeadm 配置文件的路径。
+</p>
 </td>
 </tr>
 
@@ -63,7 +81,9 @@ kubeadm 配置文件的路径。
 <!--
 Path to the CRI socket to connect. If empty kubeadm will try to auto-detect this value; use this option only if you have more than one CRI installed or if you have non-standard CRI socket.
 -->
+<p>
 连接到 CRI 套接字的路径。如果为空，则 kubeadm 将尝试自动检测该值；仅当安装了多个 CRI 或具有非标准 CRI 套接字时，才使用此选项。
+</p>
 </td>
 </tr>
 
@@ -75,7 +95,9 @@ Path to the CRI socket to connect. If empty kubeadm will try to auto-detect this
 <!--
 help for kubelet-start
 -->
+<p>
 kubelet-start 操作的帮助命令
+</p>
 </td>
 </tr>
 
@@ -87,7 +109,9 @@ kubelet-start 操作的帮助命令
 <!--
 Specify the node name.
 -->
+<p>
 指定节点名称。
+</p>
 </td>
 </tr>
 
@@ -115,10 +139,11 @@ Specify the node name.
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
+<p>
 [实验] 到 '真实' 主机根文件系统的路径。
+</p>
 </td>
 </tr>
 
 </tbody>
 </table>
-
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-prepare.md b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-prepare.md
@@ -1,3 +1,19 @@
+<!--
+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.
+-->
+
+
+<!--
+Prepare the machine for serving a control plane
+-->
+准备为控制平面服务的机器
 
 <!--
 ### Synopsis
@@ -50,7 +66,9 @@ kubeadm join phase control-plane-prepare all
 <!--
 help for control-plane-prepare
 -->
+<p>
 control-plane-prepare 操作的帮助命令
+</p>
 </td>
 </tr>
 
@@ -78,10 +96,11 @@ control-plane-prepare 操作的帮助命令
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
+<p>
 [实验] 指向 '真实' 宿主机根文件系统的路径。
+</p>
 </td>
 </tr>
 
 </tbody>
 </table>
-
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-prepare_all.md b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_control-plane-prepare_all.md
@@ -1,3 +1,19 @@
+<!--
+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.
+-->
+
+
+<!--
+Prepare the machine for serving a control plane
+-->
+准备为控制平面服务的机器
 
 <!--
 ### Synopsis
@@ -36,7 +52,9 @@ kubeadm join phase control-plane-prepare all [api-server-endpoint] [flags]
 <!--
 If the node should host a new control plane instance, the IP address the API Server will advertise it's listening on. If not set the default network interface will be used.
 -->
+<p>
 如果该节点托管一个新的控制平面实例，则 API 服务器将公布其正在侦听的 IP 地址。如果未设置，则使用默认网络接口。
+</p>
 </td>
 </tr>
 
@@ -53,7 +71,9 @@ If the node should host a new control plane instance, the IP address the API Ser
 <!--
 If the node should host a new control plane instance, the port for the API Server to bind to.
 -->
+<p>
 如果该节点托管一个新的控制平面实例，则为 API 服务器要绑定的端口。
+</p>
 </td>
 </tr>
 
@@ -65,7 +85,9 @@ If the node should host a new control plane instance, the port for the API Serve
 <!--
 Use this key to decrypt the certificate secrets uploaded by init.
 -->
+<p>
 使用此密钥解密由 init 上传的证书 secrets。
+</p>
 </td>
 </tr>
 
@@ -77,7 +99,9 @@ Use this key to decrypt the certificate secrets uploaded by init.
 <!--
 Path to kubeadm config file.
 -->
+<p>
 kubeadm 配置文件的路径。
+</p>
 </td>
 </tr>
 
@@ -89,7 +113,9 @@ kubeadm 配置文件的路径。
 <!--
 Create a new control plane instance on this node
 -->
+<p>
 在此节点上创建一个新的控制平面实例
+</p>
 </td>
 </tr>
 
@@ -101,7 +127,9 @@ Create a new control plane instance on this node
 <!--
 For file-based discovery, a file or URL from which to load cluster information.
 -->
+<p>
 对于基于文件的发现，给出用于加载集群信息的文件或者 URL。
+</p>
 </td>
 </tr>
 
@@ -113,19 +141,23 @@ For file-based discovery, a file or URL from which to load cluster information.
 <!--
 For token-based discovery, the token used to validate cluster information fetched from the API server.
 -->
+<p>
 对于基于令牌的发现，该令牌用于验证从 API 服务器获取的集群信息。
+</p>
 </td>
 </tr>
 
 <tr>
-<td colspan="2">--discovery-token-ca-cert-hash stringSlice</td>
+<td colspan="2">--discovery-token-ca-cert-hash strings</td>
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
 <!--
 For token-based discovery, validate that the root CA public key matches this hash (format: "&lt;type&gt;:&lt;value&gt;").
 -->
+<p>
 对于基于令牌的发现，请验证根 CA 公钥是否匹配此哈希值（格式："&lt;type&gt;:&lt;value&gt;"）。
+</p>
 </td>
 </tr>
 
@@ -137,47 +169,54 @@ For token-based discovery, validate that the root CA public key matches this has
 <!--
 For token-based discovery, allow joining without --discovery-token-ca-cert-hash pinning.
 -->
+<p>
 对于基于令牌的发现，允许在未关联 --discovery-token-ca-cert-hash 参数的情况下添加节点。
+</p>
 </td>
 </tr>
 
 <tr>
-<td colspan="2">--experimental-patches string</td>
+<td colspan="2">-h, --help</td>
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
-<!--  
-Path to a directory that contains files named "target[suffix][+patchtype].extension". For example, "kube-apiserver0+merge.yaml" or just "etcd.json". "patchtype" can be one of "strategic", "merge" or "json" and they match the patch formats supported by kubectl. The default "patchtype" is "strategic". "extension" must be either "json" or "yaml". "suffix" is an optional string that can be used to determine which patches are applied first alpha-numerically.
+<!--
+help for all
 -->
-包含名为 "target[suffix][+patchtype].extension" 的文件的目录的路径。
-例如，"kube-apiserver0+merge.yaml" 或仅仅是 "etcd.json"。
-"patchtype" 可以是 "strategic"、"merge" 或 "json" 之一，并且它们与 kubectl 支持的补丁格式匹配。
-默认的 "patchtype" 为 "strategic"。 "extension" 必须为 "json" 或 "yaml"。 
-"suffix" 是一个可选字符串，可用于确定首先按字母顺序应用哪些补丁。
+all 操作的帮助命令
 </td>
 </tr>
 
 <tr>
-<td colspan="2">-h, --help</td>
+<td colspan="2">--node-name string</td>
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
 <!--
-help for all
+Specify the node name.
 -->
-all 操作的帮助命令
+<p>
+指定节点名称。
+</p>
 </td>
 </tr>
 
 <tr>
-<td colspan="2">--node-name string</td>
+<td colspan="2">--patches string</td>
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
-<!--
-Specify the node name.
+<!--  
+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;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>
+包含名为 “target[suffix][+patchtype].extension” 的文件的目录的路径。
+例如，“kube-apiserver0+merge.yaml” 或只是 “etcd.json”。
+“target” 可以是 “kube-apiserver”、“kube-controller-manager”、“kube-scheduler”、“etcd” 之一。
+“patchtype” 可以是 “strategic”、“merge” 或 “json”，它们匹配 kubectl 支持的补丁格式。
+默认的 “patchtype” 是 “strategic”。“extension” 必须是 “json” 或 “yaml”。
+“suffix” 是一个可选字符串，可用于基于字母数字顺序确定首先应用哪些补丁。
+</p>
 </td>
 </tr>
 
@@ -189,7 +228,9 @@ Specify the node name.
 <!--
 Specify the token used to temporarily authenticate with the Kubernetes Control Plane while joining the node.
 -->
+<p>
 指定在加入节点时用于临时通过 Kubernetes 控制平面进行身份验证的令牌。
+</p>
 </td>
 </tr>
 
@@ -201,17 +242,19 @@ Specify the token used to temporarily authenticate with the Kubernetes Control P
 <!--
 Use this token for both discovery-token and tls-bootstrap-token when those values are not provided.
 -->
+<p>
 如果未提供这些值，则将它们用于 discovery-token 令牌和 tls-bootstrap 令牌。
+</p>
 </td>
 </tr>
 
 </tbody>
 </table>
 
+
 <!--
 ### Options inherited from parent commands
 -->
-
 ### 从父命令继承的选项
 
    <table style="width: 100%; table-layout: fixed;">
@@ -229,10 +272,11 @@ Use this token for both discovery-token and tls-bootstrap-token when those value
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
+<p>
 [实验] 指向 '真实' 宿主机根文件系统的路径。
+</p>
 </td>
 </tr>
 
 </tbody>
 </table>
-
diff --git a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_diff.md b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_diff.md
