Merge pull request #33806 from JarHMJ/kubeadm-13

[zh] sync v1.24 kubeadm-13
2022-05-18 17:32:06 -07:00 · 2022-05-18 17:32:06 -07:00 · cc9d12c9f7
parent a315f237fd a26e231c2f
commit cc9d12c9f7
3 changed files with 100 additions and 84 deletions
--- a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_renew_controller-manager.conf.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_renew_controller-manager.conf.md
@ -1,3 +1,18 @@
+<!--
+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.
+-->
+
+<!-- 
+Renew the certificate embedded in the kubeconfig file for the controller manager to use 
+-->
+续订 kubeconfig 文件中嵌入的证书，以供控制器管理器（Controller Manager）使用。

 <!--
 ### Synopsis
@ -52,9 +67,9 @@ kubeadm alpha renew controller-manager.conf [flags]
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
 <!--
-The path where to save the certificates.
+<p>The path where to save the certificates.</p>
 -->
-保存证书的路径。
+<p>保存证书的路径。</p>
 </td>
 </tr>

@ -64,33 +79,9 @@ The path where to save the certificates.
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
 <!--
-Path to a kubeadm configuration file.
+<p>Path to a kubeadm configuration file.</p>
 -->
-kubeadm 配置文件的路径。
-</td>
-</tr>
-
-<tr>
-<td colspan="2">--csr-dir string</td>
-</tr>
-<tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">
-<!--
-The path to output the CSRs and private keys to
-->
-CSR 和私钥的输出路径
-</td>
-</tr>
-
-<tr>
-<td colspan="2">--csr-only</td>
-</tr>
-<tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">
-<!--
-Create CSRs instead of generating certificates
-->
-创建 CSR 而不是生成证书
+<p>kubeadm 配置文件的路径。</p>
 </td>
 </tr>

@ -100,9 +91,9 @@ Create CSRs instead of generating certificates
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
 <!--
-help for controller-manager.conf
+<p>help for controller-manager.conf</p>
 -->
-controller-manager.conf 操作的帮助命令
+<p>controller-manager.conf 操作的帮助命令</p>
 </td>
 </tr>

@ -117,10 +108,10 @@ controller-manager.conf 操作的帮助命令
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
 <!--
-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>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>与集群通信时使用的 kubeconfig 文件。
+如果未设置该参数，则可以在一组标准位置中搜索现有的 kubeconfig 文件。</p>
 </td>
 </tr>

@ -157,9 +148,9 @@ Use the Kubernetes certificate API to renew certificates
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
 <!--
-[EXPERIMENTAL] The path to the 'real' host root filesystem.
+<p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p>
 -->
-[实验] 到 '真实' 主机根文件系统的路径。
+<p>[实验] 到 '真实' 主机根文件系统的路径。</p>
 </td>
 </tr>

--- a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_kubelet-finalize_experimental-cert-rotation.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_kubelet-finalize_experimental-cert-rotation.md
@ -1,9 +1,22 @@
+<!--
+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.
+-->
+
+<!-- 
+Enable kubelet client certificate rotation 
+-->
+启用 kubelet 客户端证书轮换

 <!-- ### Synopsis -->
 ### 概要

-
-
 <!-- Enable kubelet client certificate rotation -->
 启用 kubelet 客户端证书轮换

@ -25,24 +38,24 @@ kubeadm init phase kubelet-finalize experimental-cert-rotation [flags]
 <td colspan="2">--cert-dir string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/pki"</td>
 </tr>
 <tr>
-<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;">The path where to save and store the certificates.</td> -->
-<td></td><td style="line-height: 130%; word-wrap: break-word;">保存和存储证书的路径。</td>
+<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;"><p>The path where to save and store the certificates.</p></td> -->
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>保存和存储证书的路径。</p></td>
 </tr>

 <tr>
 <td colspan="2">--config string</td>
 </tr>
 <tr>
-<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;">Path to a kubeadm configuration file.</td> -->
-<td></td><td style="line-height: 130%; word-wrap: break-word;">kubeadm 配置文件的路径。</td>
+<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;"><p>Path to a kubeadm configuration file.</p></td> -->
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>kubeadm 配置文件的路径。</p></td>
 </tr>

 <tr>
 <td colspan="2">-h, --help</td>
 </tr>
 <tr>
-<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;">help for experimental-cert-rotation</td> -->
-<td></td><td style="line-height: 130%; word-wrap: break-word;">experimental-cert-rotation 操作的帮助命令</td>
+<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;"><p>help for experimental-cert-rotation</p></td> -->
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>experimental-cert-rotation 操作的帮助命令</p></td>
 </tr>

 </tbody>
@ -64,8 +77,8 @@ kubeadm init phase kubelet-finalize experimental-cert-rotation [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;">[实验] 到'真实'主机根文件系统的路径。</td>
+<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;"><p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p></td> -->
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>[实验] 到'真实'主机根文件系统的路径。</p></td>
 </tr>

 </tbody>
--- a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase_control-plane.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase_control-plane.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.
+-->
+
+<!-- 
+Upgrade the control plane instance deployed on this node, if any 
+-->
+升级部署在此节点上的控制平面实例，如果有的话
+
 <!--
 ### Synopsis
 -->
@ -31,38 +47,64 @@ kubeadm upgrade node phase control-plane [flags]
 <td colspan="2">--certificate-renewal</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;"><p>更新在升级期间变更的组件使用的证书。</p></td>
 </tr>
 <!-- 
-<td></td><td style="line-height: 130%; word-wrap: break-word;">Perform the renewal of certificates used by component changed during upgrades.</td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>Perform the renewal of certificates used by component changed during upgrades.</p></td>
 -->

 <tr>
 <td colspan="2">--dry-run</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;"><p>不改变任何状态，只输出将要执行的动作。</p></td>
 </tr>
 <!--
-<td></td><td style="line-height: 130%; word-wrap: break-word;">Do not change any state, just output the actions that would be performed.</td>
+<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></td>
 -->

 <tr>
 <td colspan="2">--etcd-upgrade&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: true</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">执行 etcd 的升级。</td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>执行 etcd 的升级。</p></td>
 </tr>
 <!--
 <td colspan="2">--etcd-upgrade&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: true</td> 
 -->

 <!--
-<td></td><td style="line-height: 130%; word-wrap: break-word;">Perform the upgrade of etcd.</td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>Perform the upgrade of etcd.</p></td>
 -->

 <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;"><p>control-plane 的帮助信息</p></td>
+</tr>
+
+<!--
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>help for control-plane</p></td>
+-->
+
+<tr>
+<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: "/etc/kubernetes/admin.conf"</td>
+</tr>
+<tr>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>用于和集群通信的 KubeConfig 文件。如果它没有被设置，那么 kubeadm 将会搜索一个已经存在于标准路径的 KubeConfig 文件。</p></td>
+</tr>
+
+<!--
+<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"</td>
+-->
+
+<!--
+<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></td>
+-->
+
+<tr>
+<td colspan="2">--patches string</td>
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
@ -77,36 +119,6 @@ Path to a directory that contains files named "target[suffix][+patchtype].extens
 </td>
 </tr>

-<!--
-<td></td><td style="line-height: 130%; word-wrap: break-word;">The path where kustomize patches for static pod manifests are stored.</td>
-->
-
-<tr>
-<td colspan="2">-h, --help</td>
-</tr>
-<tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">control-plane 的帮助信息</td>
-</tr>
-
-<!--
-<td></td><td style="line-height: 130%; word-wrap: break-word;">help for control-plane</td>
-->
-
-<tr>
-<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: "/etc/kubernetes/admin.conf"</td>
-</tr>
-<tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">用于和集群通信的 KubeConfig 文件。如果它没有被设置，那么 kubeadm 将会搜索一个已经存在于标准路径的 KubeConfig 文件。</td>
-</tr>
-
-<!--
-<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"</td>
-->
-
-<!--
-<td></td><td style="line-height: 130%; word-wrap: break-word;">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.</td>
-->
-
 </tbody>
 </table>

@ -129,10 +141,10 @@ Path to a directory that contains files named "target[suffix][+patchtype].extens
 <td colspan="2">--rootfs string</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;"><p>[实验] 到'真实'主机根文件系统的路径。</p></td>
 </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>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p></td>
 -->

 </tbody>