Merge pull request #33639 from kinzhi/kinzhi104

[zh]Sync kubeadm-8
2022-05-13 18:01:17 -07:00 · 2022-05-13 18:01:17 -07:00 · bf46c15bdf
parent bec848d9fd a7b02618ac
commit bf46c15bdf
6 changed files with 84 additions and 72 deletions
--- a/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_renew_apiserver.md
+++ b/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_renew_apiserver.md
@ -87,6 +87,3 @@ kubeadm certs renew apiserver [flags]

 </tbody>
 </table>
-
-
-
--- a/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_certs_sa.md
+++ b/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_certs_sa.md
@ -69,6 +69,3 @@ kubeadm init phase certs sa [flags]

 </tbody>
 </table>
-
-
-
--- a/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase_preflight.md
+++ b/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase_preflight.md
@ -67,6 +67,3 @@ kubeadm upgrade node phase preflight [flags]

 </tbody>
 </table>
-
-
-
--- a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_renew_apiserver.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_certs_renew_apiserver.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.
+-->
+
+
+<!--
+Renew the certificate for serving the Kubernetes API
+-->
+续订用于提供 Kubernetes API 的证书

 <!--
 ### Synopsis
@ -12,7 +28,6 @@ Renew the certificate for serving the Kubernetes API.
 <!--
 Renewals run unconditionally, regardless of certificate expiration date; extra attributes such as SANs will be based on the existing file/certificates, there is no need to resupply them.
 -->
-
 无论证书的到期日期如何，续订都会无条件地进行；SAN 等额外属性将基于现有文件/证书，因此无需重新提供它们。

 <!--
@ -22,7 +37,7 @@ Renewal by default tries to use the certificate authority in the local PKI manag
 可以使用 K8s 证书 API 进行证书更新，或者作为最后一个选择来生成 CSR 请求。

 <!--
-After renewal, in order to make changes effective, is is required to restart control-plane components and eventually re-distribute the renewed certificate in case the file is used elsewhere.
+After renewal, in order to make changes effective, is required to restart control-plane components and eventually re-distribute the renewed certificate in case the file is used elsewhere.
 -->
 续订后，为了使更改生效，需要重新启动控制平面组件，并最终重新分发更新的证书，以防文件在其他地方使用。

@ -55,7 +70,9 @@ kubeadm certs renew apiserver [flags]
 <!--
 The path where to save the certificates.
 -->
+<p>
 保存证书的路径。
+</p>
 </td>
 </tr>

@ -67,31 +84,9 @@ The path where to save the certificates.
 <!--
 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>
 </td>
 </tr>

@ -103,37 +98,26 @@ Create CSRs instead of generating certificates
 <!--
 help for apiserver
 -->
+<p>
 apiserver 子操作的帮助命令
+</p>
 </td>
 </tr>

 <tr>
-<td colspan="2">
-<!--
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"
-->
+<td colspan="2"><!-- --kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf" -->
 --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;">
-<!--
-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.
-->
-与集群通信时使用的 kubeconfig 文件。
-如果未设置该参数，则可以在一组标准位置中搜索现有的 kubeconfig 文件。
-</td>
-</tr>

 <tr>
-<td colspan="2">--use-api</td>
-</tr>
-<tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">
-<!--
-Use the Kubernetes certificate API to renew certificates
+<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.
 -->
-使用 Kubernetes 证书 API 续订证书
+<p>
+与集群通信时使用的 kubeconfig 文件。
+如果未设置该参数，则可以在一组标准位置中搜索现有的 kubeconfig 文件。
+</p>
 </td>
 </tr>

@ -143,7 +127,6 @@ Use the Kubernetes certificate API to renew certificates
 <!--
 ### Options inherited from parent commands
 -->
-
 ### 从父命令继承的选项

   <table style="width: 100%; table-layout: fixed;">
@ -161,10 +144,11 @@ Use the Kubernetes certificate API to renew certificates
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
+<p>
 [实验] 到 '真实' 主机根文件系统的路径。
+</p>
 </td>
 </tr>

 </tbody>
 </table>
-
--- a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_certs_sa.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_certs_sa.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.
+-->
+
+
+<!--
+Generate a private key for signing service account tokens along with its public key
+-->
+生成用来签署服务账号令牌的私钥及其公钥

 <!--
 ### Synopsis
@ -8,20 +24,21 @@
 <!--
 Generate the private key for signing service account tokens along with its public key, and save them into sa.key and sa.pub files. If both files already exist, kubeadm skips the generation step and existing files will be used.
 -->
-
-生成用于签名 service account 令牌的私钥及其公钥，并将其保存到 sa.key 和 sa.pub 文件中。如果两个文件都已存在，则 kubeadm 会跳过生成步骤，而将使用现有文件。
+生成用来签署服务账号令牌的私钥及其公钥，并将其保存到 sa.key 和 sa.pub 文件中。
+如果两个文件都已存在，则 kubeadm 会跳过生成步骤，而将使用现有文件。

 <!--
 Alpha Disclaimer: this command is currently alpha.
 -->
-
 Alpha 免责声明：此命令当前为 alpha 阶段。

 ```
 kubeadm init phase certs sa [flags]
 ```

-<!-- ### Options -->
+<!--
+### Options
+-->

 ### 选项

@ -45,7 +62,9 @@ kubeadm init phase certs sa [flags]
 <!--
 The path where to save and store the certificates.
 -->
+<p>
 保存和存储证书的路径。
+</p>
 </td>
 </tr>

@ -57,7 +76,9 @@ The path where to save and store the certificates.
 <!--
 help for sa
 -->
+<p>
 sa 操作的帮助命令
+</p>
 </td>
 </tr>

@ -67,7 +88,6 @@ sa 操作的帮助命令
 <!--
 ### Options inherited from parent commands
 -->
-
 ### 继承于父命令的选项

   <table style="width: 100%; table-layout: fixed;">
@ -85,10 +105,11 @@ sa 操作的帮助命令
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
+<p>
 [实验] 到 '真实' 主机根文件系统的路径。
+</p>
 </td>
 </tr>

 </tbody>
 </table>
-
--- a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase_preflight.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade_node_phase_preflight.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.
+-->
+
+<!--
+Run upgrade node pre-flight checks
+-->
+执行升级节点的预检

 <!-- ### Synopsis -->
 ### 概要
@ -11,7 +26,9 @@
 kubeadm upgrade node phase preflight [flags]
 ```

-<!-- ### Options -->
+<!--
+### Options
+-->
 ### 选项

   <table style="width: 100%; table-layout: fixed;">
@ -26,17 +43,17 @@ kubeadm upgrade node phase preflight [flags]
 </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;">preflight 操作的帮助命令</td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>preflight 操作的帮助命令</p></td>
 </tr>

 <tr>
-<td colspan="2">--ignore-preflight-errors stringSlice</td>
+<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;">错误将显示为警告的检查清单。示例：'IsPrivilegedUser,Swap'。值为'all'表示忽略所有检查的错误。</td>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>错误将显示为警告的检查清单。示例：'IsPrivilegedUser,Swap'。值为'all'表示忽略所有检查的错误。</p></td>
 </tr>

 </tbody>
@ -44,7 +61,9 @@ kubeadm upgrade node phase preflight [flags]



-<!-- ### Options inherited from parent commands -->
+<!--
+### Options inherited from parent commands
+-->
 ### 继承于父命令的选项

   <table style="width: 100%; table-layout: fixed;">
@ -59,11 +78,8 @@ kubeadm upgrade node phase preflight [flags]
 </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>[实验] 到'真实'主机根文件系统的路径。</p></td>
 </tr>

 </tbody>
 </table>
-
-
-