Merge pull request #33561 from kinzhi/kinzhi97

[zh]Sync kubeadm-3
2022-05-10 08:39:43 -07:00 · 2022-05-10 08:39:43 -07:00 · 06afdec634
parent 4c7c7b88c8 58c174b864
commit 06afdec634
8 changed files with 125 additions and 14 deletions
--- a/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_upload-certs.md
+++ b/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_upload-certs.md
@ -95,6 +95,3 @@ kubeadm init phase upload-certs [flags]

 </tbody>
 </table>
-
-
-
--- a/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_token.md
+++ b/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_token.md
@ -91,6 +91,3 @@ kubeadm token [flags]

 </tbody>
 </table>
-
-
-
--- a/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_token_create.md
+++ b/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_token_create.md
@ -9,7 +9,6 @@ guide. You can file document formatting bugs against the
 [reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
 -->

-
 Create bootstrap tokens on the server

 ### Synopsis
--- a/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_version.md
+++ b/content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_version.md
@ -67,6 +67,3 @@ kubeadm version [flags]

 </tbody>
 </table>
-
-
-
--- a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_upload-certs.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_upload-certs.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.
+-->
+
+<!--
+Upload certificates to kubeadm-certs
+-->
+将证书上传到 kubeadm-certs

 <!-- 
 ### Synopsis
@ -33,7 +48,9 @@ kubeadm init phase upload-certs [flags]
 <!--
 Key used to encrypt the control-plane certificates in the kubeadm-certs Secret.
 -->
+<p>
 用于加密 kubeadm-certs Secret 中的控制平面证书的密钥。
+</p>
 </td>
 </tr>

@ -45,7 +62,9 @@ Key used to encrypt the control-plane certificates in the kubeadm-certs Secret.
 <!--
 Path to a kubeadm configuration file.
 -->
+<p>
 kubeadm 配置文件的路径。
+</p>
 </td>
 </tr>

@ -57,7 +76,9 @@ kubeadm 配置文件的路径。
 <!--
 help for upload-certs
 -->
+<p>
 upload-certs 操作的帮助命令
+</p>
 </td>
 </tr>

@ -68,8 +89,10 @@ upload-certs 操作的帮助命令
 <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.</td -->
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 用来与集群通信的 kubeconfig 文件。
 如果此标志未设置，则可以在一组标准的位置搜索现有的 kubeconfig 文件。
+</p>
 </td>
 </tr>

@ -81,7 +104,9 @@ upload-certs 操作的帮助命令
 <!--
 Don't print the key used to encrypt the control-plane certificates.
 -->
+<p>
 不要打印输出用于加密控制平面证书的密钥。
+</p>
 </td>
 </tr>

@ -93,7 +118,9 @@ Don't print the key used to encrypt the control-plane certificates.
 <!--
 Upload control-plane certificates to the kubeadm-certs Secret.
 -->
+<p>
 将控制平面证书上传到 kubeadm-certs Secret。
+</p>
 </td>
 </tr>

@ -120,10 +147,11 @@ Upload control-plane certificates to the kubeadm-certs Secret.
 <!--
 [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_token.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_token.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.
+-->
+
+<!--
+Manage bootstrap tokens
+-->
+管理引导令牌

 <!--
 ### Synopsis
@ -78,7 +93,9 @@ kubeadm token [flags]
 <!--
 Whether to enable dry-run mode or not
 -->
+<p>
 是否启用 `dry-run` 模式
+</p>
 </td>
 </tr>

@ -93,7 +110,9 @@ Whether to enable dry-run mode or not
 <!--
 help for token
 -->
+<p>
 token 操作的帮助命令
+</p>
 </td>
 </tr>

@ -113,7 +132,9 @@ token 操作的帮助命令
 <!--
 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>
 </td>
 </tr>

@ -140,10 +161,11 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
 <!--
 [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_token_create.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_token_create.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.
+-->
+
+<!--
+Create bootstrap tokens on the server
+-->
+在服务器上创建引导令牌

 <!--
 ### Synopsis
@ -38,6 +53,19 @@ kubeadm token create [token]
 </colgroup>
 <tbody>

+<tr>
+<td colspan="2">--certificate-key string</td>
+</tr>
+<tr>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
+<!--
+When used together with '--print-join-command', print the full 'kubeadm join' flag needed to join the cluster as a control-plane. To create a new certificate key you must use 'kubeadm init phase upload-certs --upload-certs'.
+-->
+当与 “--print-join-command” 一起使用时，打印作为控制平面加入集群时所需的所有 “kubeadm join” 标志。
+要创建新的证书密钥，你必须使用 “kubeadm init phase upload-certs --upload-certs”。
+</p></td>
+</tr>
+
 <tr>
 <td colspan="2">--config string</td>
 </tr>
@ -46,7 +74,9 @@ kubeadm token create [token]
 <!--
 Path to a kubeadm configuration file.
 -->
+<p>
 kubeadm 配置文件的路径。
+</p>
 </td>
 </tr>

@ -58,7 +88,9 @@ kubeadm 配置文件的路径。
 <!--
 A human friendly description of how this token is used.
 -->
+<p>
 针对令牌用途的人性化的描述。
+</p>
 </td>
 </tr>

@ -67,7 +99,9 @@ A human friendly description of how this token is used.
 <!--
 --groups stringSlice&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: [system:bootstrappers:kubeadm:default-node-token]
 -->
+<p>
 --groups stringSlice&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值：[system:bootstrappers:kubeadm:default-node-token]
+</p>
 </td>
 </tr>
 <tr>
@ -75,7 +109,9 @@ A human friendly description of how this token is used.
 <!--
 Extra groups that this token will authenticate as when used for authentication. Must match "\\Asystem:bootstrappers:[a-z0-9:-]{0,255}[a-z0-9]\\z"
 -->
+<p>
 此令牌用于身份验证时将进行身份验证的其他组。必须匹配  "\\Asystem:bootstrappers:[a-z0-9:-]{0,255}[a-z0-9]\\z"
+</p>
 </td>
 </tr>

@ -87,7 +123,9 @@ Extra groups that this token will authenticate as when used for authentication.
 <!--
 help for create
 -->
+<p>
 create 操作的帮助命令
+</p>
 </td>
 </tr>

@ -99,7 +137,9 @@ create 操作的帮助命令
 <!--
 Instead of printing only the token, print the full 'kubeadm join' flag needed to join the cluster using the token.
 -->
+<p>
 不仅仅打印令牌，而是打印使用令牌加入集群所需的完整 'kubeadm join' 参数。
+</p>
 </td>
 </tr>

@ -116,7 +156,9 @@ Instead of printing only the token, print the full 'kubeadm join' flag needed to
 <!--
 The duration before the token is automatically deleted (e.g. 1s, 2m, 3h). If set to '0', the token will never expire
 -->
+<p>
 令牌有效时间，超过该时间令牌被自动删除。(例如： 1s, 2m, 3h)。如果设置为 '0'，令牌将永远不过期。
+</p>
 </td>
 </tr>

@ -133,7 +175,9 @@ The duration before the token is automatically deleted (e.g. 1s, 2m, 3h). If set
 <!--
 Describes the ways in which this token can be used. You can pass --usages multiple times or provide a comma separated list of options. Valid options: [signing,authentication]
 -->
+<p>
 描述可以使用此令牌的方式。你可以多次使用 `--usages` 或者提供一个以逗号分隔的选项列表。合法选项有: [signing,authentication]
+</p>
 </td>
 </tr>

@ -143,7 +187,6 @@ Describes the ways in which this token can be used. You can pass --usages multip
 <!--
 ### Options inherited from parent commands
 -->
-
 ### 从父命令继承的选项

   <table style="width: 100%; table-layout: fixed;">
@ -161,7 +204,9 @@ Describes the ways in which this token can be used. You can pass --usages multip
 <!--
 Whether to enable dry-run mode or not
 -->
+<p>
 是否启用 `dry-run` 运行模式
+</p>
 </td>
 </tr>

@ -178,7 +223,9 @@ Whether to enable dry-run mode or not
 <!--
 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 文件。
+</p>
 </td>
 </tr>

@ -190,7 +237,9 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
+<p>
 [实验] 指向 '真实' 宿主机根文件系统的路径。
+</p>
 </td>
 </tr>

--- a/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_version.md
+++ b/content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_version.md
@ -1,3 +1,20 @@
+<!--
+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.
+-->
+
+
+<!--
+Print the version of kubeadm
+-->
+打印 kubeadm 的版本
+
 <!--
 ### Synopsis
 -->
@ -7,7 +24,6 @@
 <!--
 Print the version of kubeadm
 -->
-
 打印 kubeadm 的版本

 ```
@ -35,7 +51,9 @@ kubeadm version [flags]
 <!--
 help for version
 -->
+<p>
 version 操作的帮助命令
+</p>
 </td>
 </tr>

@ -47,7 +65,9 @@ version 操作的帮助命令
 <!--
 Output format; available options are 'yaml', 'json' and 'short'
 -->
+<p>
 输出格式；可用的选项有 'yaml', 'json' 和 'short'
+</p>
 </td>
 </tr>

@ -75,7 +95,9 @@ Output format; available options are 'yaml', 'json' and 'short'
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
+<p>
 [实验] 指向 '真实' 宿主机根文件系统的路径。
+</p>
 </td>
 </tr>