Merge pull request #33547 from kinzhi/kinzhi96

[zh]Sync kubeadm-2
This commit is contained in:
Kubernetes Prow Robot 2022-05-07 18:13:17 -07:00 committed by GitHub
commit b2a12488d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 90 additions and 18 deletions

View File

@ -74,6 +74,3 @@ kubeadm init phase upload-config all [flags]
</tbody> </tbody>
</table> </table>

View File

@ -83,6 +83,3 @@ kubeadm init phase upload-config kubeadm [flags]
</tbody> </tbody>
</table> </table>

View File

@ -110,8 +110,6 @@ kubeadm join phase control-plane-prepare certs [api-server-endpoint] [flags]
</tbody> </tbody>
</table> </table>
### Options inherited from parent commands ### Options inherited from parent commands
<table style="width: 100%; table-layout: fixed;"> <table style="width: 100%; table-layout: fixed;">
@ -130,6 +128,3 @@ kubeadm join phase control-plane-prepare certs [api-server-endpoint] [flags]
</tbody> </tbody>
</table> </table>

View File

@ -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.
-->
<!--
Upload all configuration to a config map
-->
将所有配置上传到 ConfigMap
<!-- <!--
### Synopsis ### Synopsis
@ -36,7 +52,9 @@ kubeadm init phase upload-config all [flags]
<!-- <!--
Path to a kubeadm configuration file. Path to a kubeadm configuration file.
--> -->
<p>
kubeadm 配置文件的路径。 kubeadm 配置文件的路径。
</p>
</td> </td>
</td> </td>
</tr> </tr>
@ -49,7 +67,9 @@ kubeadm 配置文件的路径。
<!-- <!--
help for all help for all
--> -->
<p>
all 操作的帮助命令 all 操作的帮助命令
</p>
</td> </td>
</tr> </tr>
@ -58,7 +78,9 @@ all 操作的帮助命令
<!-- <!--
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf" --kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"
--> -->
<p>
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值:"/etc/kubernetes/admin.conf" --kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值:"/etc/kubernetes/admin.conf"
</p>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -66,7 +88,9 @@ all 操作的帮助命令
<!-- <!--
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. 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 文件。 与集群通信时使用的 kubeconfig 文件。如果未设置该参数,则可以在一组标准位置中搜索现有的 kubeconfig 文件。
</p>
</td> </td>
</tr> </tr>
@ -94,10 +118,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. [EXPERIMENTAL] The path to the 'real' host root filesystem.
--> -->
<p>
[实验] 到 '真实' 主机根文件系统的路径。 [实验] 到 '真实' 主机根文件系统的路径。
</p>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View File

@ -1,4 +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.
-->
<!--
Upload the kubeadm ClusterConfiguration to a ConfigMap
-->
将 kubeadm ClusterConfiguration 上传到 ConfigMap
<!-- <!--
### Synopsis ### Synopsis
--> -->
@ -58,7 +73,9 @@ kubeadm init phase upload-config --config=myConfig.yaml
<!-- <!--
Path to a kubeadm configuration file. Path to a kubeadm configuration file.
--> -->
<p>
kubeadm 配置文件的路径。 kubeadm 配置文件的路径。
</p>
</td> </td>
</tr> </tr>
@ -70,7 +87,9 @@ kubeadm 配置文件的路径。
<!-- <!--
help for kubeadm help for kubeadm
--> -->
<p>
kubeadm 操作的帮助命令 kubeadm 操作的帮助命令
</p>
</td> </td>
</tr> </tr>
@ -87,7 +106,9 @@ kubeadm 操作的帮助命令
<!-- <!--
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. 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 文件。 与集群通信时使用的 kubeconfig 文件。如果未设置该参数,则可以在一组标准位置中搜索现有的 kubeconfig 文件。
</p>
</td> </td>
</tr> </tr>
@ -115,10 +136,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. [EXPERIMENTAL] The path to the 'real' host root filesystem.
--> -->
<p>
[实验] 到 '真实' 主机根文件系统的路径。 [实验] 到 '真实' 主机根文件系统的路径。
</p>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View File

@ -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 the certificates for the new control plane components
-->
为新的控制平面组件生成证书
<!-- <!--
### Synopsis ### Synopsis
@ -8,7 +24,6 @@
<!-- <!--
Generate the certificates for the new control plane components Generate the certificates for the new control plane components
--> -->
为新的控制平面组件生成证书 为新的控制平面组件生成证书
``` ```
@ -18,7 +33,6 @@ kubeadm join phase control-plane-prepare certs [api-server-endpoint] [flags]
<!-- <!--
### Options ### Options
--> -->
### 选项 ### 选项
<table style="width: 100%; table-layout: fixed;"> <table style="width: 100%; table-layout: fixed;">
@ -36,7 +50,9 @@ kubeadm join phase control-plane-prepare certs [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. 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 地址。如果未设置,则使用默认网络接口。 如果该节点托管一个新的控制平面实例,则 API 服务器将公布其正在侦听的 IP 地址。如果未设置,则使用默认网络接口。
</p>
</td> </td>
</tr> </tr>
@ -48,7 +64,9 @@ If the node should host a new control plane instance, the IP address the API Ser
<!-- <!--
Path to kubeadm config file. Path to kubeadm config file.
--> -->
<p>
kubeadm 配置文件的路径。 kubeadm 配置文件的路径。
</p>
</td> </td>
</tr> </tr>
@ -60,7 +78,9 @@ kubeadm 配置文件的路径。
<!-- <!--
Create a new control plane instance on this node Create a new control plane instance on this node
--> -->
<p>
在此节点上创建一个新的控制平面实例 在此节点上创建一个新的控制平面实例
</p>
</td> </td>
</tr> </tr>
@ -72,7 +92,9 @@ Create a new control plane instance on this node
<!-- <!--
For file-based discovery, a file or URL from which to load cluster information. For file-based discovery, a file or URL from which to load cluster information.
--> -->
<p>
对于基于文件的发现,给出用于加载集群信息的文件或者 URL。 对于基于文件的发现,给出用于加载集群信息的文件或者 URL。
</p>
</td> </td>
</tr> </tr>
@ -84,19 +106,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. For token-based discovery, the token used to validate cluster information fetched from the API server.
--> -->
<p>
对于基于令牌的发现,该令牌用于验证从 API 服务器获取的集群信息。 对于基于令牌的发现,该令牌用于验证从 API 服务器获取的集群信息。
</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2">--discovery-token-ca-cert-hash stringSlice</td> <td colspan="2">--discovery-token-ca-cert-hash strings</td>
</tr> </tr>
<tr> <tr>
<td></td><td style="line-height: 130%; word-wrap: break-word;"> <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;"). 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;")。 对于基于令牌的发现,请验证根 CA 公钥是否匹配此哈希值(格式:"&lt;type&gt;:&lt;value&gt;")。
</p>
</td> </td>
</tr> </tr>
@ -108,7 +134,9 @@ 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. For token-based discovery, allow joining without --discovery-token-ca-cert-hash pinning.
--> -->
<p>
对于基于令牌的发现,允许在未关联 --discovery-token-ca-cert-hash 参数的情况下添加节点。 对于基于令牌的发现,允许在未关联 --discovery-token-ca-cert-hash 参数的情况下添加节点。
</p>
</td> </td>
</tr> </tr>
@ -120,7 +148,9 @@ For token-based discovery, allow joining without --discovery-token-ca-cert-hash
<!-- <!--
help for certs help for certs
--> -->
<p>
certs 操作的帮助命令 certs 操作的帮助命令
</p>
</td> </td>
</tr> </tr>
@ -132,7 +162,9 @@ certs 操作的帮助命令
<!-- <!--
Specify the node name. Specify the node name.
--> -->
<p>
指定节点名称。 指定节点名称。
</p>
</td> </td>
</tr> </tr>
@ -144,7 +176,9 @@ Specify the node name.
<!-- <!--
Specify the token used to temporarily authenticate with the Kubernetes Control Plane while joining the node. Specify the token used to temporarily authenticate with the Kubernetes Control Plane while joining the node.
--> -->
<p>
指定在加入节点时用于临时通过 Kubernetes 控制平面进行身份验证的令牌。 指定在加入节点时用于临时通过 Kubernetes 控制平面进行身份验证的令牌。
</p>
</td> </td>
</tr> </tr>
@ -156,7 +190,9 @@ 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. Use this token for both discovery-token and tls-bootstrap-token when those values are not provided.
--> -->
<p>
如果未提供这些值,则将它们用于 discovery-token 令牌和 tls-bootstrap 令牌。 如果未提供这些值,则将它们用于 discovery-token 令牌和 tls-bootstrap 令牌。
</p>
</td> </td>
</tr> </tr>
@ -166,7 +202,6 @@ Use this token for both discovery-token and tls-bootstrap-token when those value
<!-- <!--
### Options inherited from parent commands ### Options inherited from parent commands
--> -->
### 从父命令继承的选项 ### 从父命令继承的选项
<table style="width: 100%; table-layout: fixed;"> <table style="width: 100%; table-layout: fixed;">
@ -184,10 +219,11 @@ Use this token for both discovery-token and tls-bootstrap-token when those value
<!-- <!--
[EXPERIMENTAL] The path to the 'real' host root filesystem. [EXPERIMENTAL] The path to the 'real' host root filesystem.
--> -->
<p>
[实验] 指向 '真实' 宿主机根文件系统的路径。 [实验] 指向 '真实' 宿主机根文件系统的路径。
</p>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>