Merge pull request #52927 from my-git9/npe-31311

[zh-cn]sync kubeadm_join_phase_kubelet-start kubeadm_join_phase_control-plane-join_etcd

Author: k8s-ci-robot

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join/kubeadm_join_phase_control-plane-join_etcd.md

@@ -1,8 +1,3 @@
-<!--
-Add a new local etcd member
--->
-添加一个新的本地 etcd 成员。
-
 <!--
 ### Synopsis
 -->
@@ -13,7 +8,7 @@ Add a new local etcd member
 -->
 添加新的本地 etcd 成员。
 
-```
+```shell
 kubeadm join phase control-plane-join etcd [flags]
 ```
 
@@ -22,7 +17,7 @@ kubeadm join phase control-plane-join etcd [flags]
 -->
 ### 选项
 
-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@@ -34,11 +29,12 @@ kubeadm join phase control-plane-join etcd [flags]
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 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>
 </tr>
@@ -48,10 +44,10 @@ If the node should host a new control plane instance, the IP address the API Ser
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Path to a kubeadm configuration file.
 -->
-<p>
 kubeadm 配置文件的路径。
 </p>
 </td>
@@ -61,11 +57,12 @@ kubeadm 配置文件的路径。
 <td colspan="2">--control-plane</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">
+<td></td>
+<td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Create a new control plane instance on this node
 -->
-<p>
 在此节点上创建一个新的控制平面实例。
 </p>
 </td>
@@ -75,11 +72,12 @@ Create a new control plane instance on this node
 <td colspan="2">--dry-run</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">
+<td></td>
+<td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Don't apply any changes; just output what would be done.
 -->
-<p>
 不做任何更改；只输出将要执行的操作。
 </p>
 </td>
@@ -90,10 +88,10 @@ Don't apply any changes; just output what would be done.
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 help for etcd
 -->
-<p>
 etcd 操作的帮助命令。
 </p>
 </td>
@@ -103,11 +101,12 @@ etcd 操作的帮助命令。
 <td colspan="2">--node-name string</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">
+<td></td>
+<td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Specify the node name.
 -->
-<p>
 指定节点的名称。
 </p>
 </td>
@@ -116,15 +115,20 @@ Specify the node name.
 <td colspan="2">--patches string</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
-<!-- 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;kubeletconfiguration&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. -->
+<td></td>
+<td style="line-height: 130%; word-wrap: break-word;">
+<p>
+<!--
+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;kubeletconfiguration&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.
+-->
 包含名为 “target[suffix][+patchtype].extension” 的文件的目录的路径。
 例如，“kube-apiserver0+merge.yaml” 或只是 “etcd.json”。
 “target” 可以是 “kube-apiserver”、“kube-controller-manager”、“kube-scheduler”、“etcd” 、”kubeletconfiguration”之一。
 “patchtype” 可以是 “strategic”、“merge” 或 “json”，它们匹配 kubectl 支持的补丁格式。
 默认的 “patchtype” 是 “strategic”。“extension” 必须是 “json” 或 “yaml”。
 “suffix” 是一个可选字符串，可用于基于字母数字顺序确定首先应用哪些补丁。
-</p></td>
+</p>
+</td>
 </tr>
 
 </tbody>
@@ -135,7 +139,7 @@ Specify the node name.
 -->
 ### 从父命令中继承的选项
 
-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@@ -147,10 +151,10 @@ Specify the node name.
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
-<p>
 [实验] 到 '真实' 主机根文件系统的路径。
 </p>
 </td>

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join/kubeadm_join_phase_kubelet-start.md

@@ -1,8 +1,3 @@
-<!--
-Write kubelet settings, certificates and (re)start the kubelet
--->
-配置 kubelet、证书并（重新）启动 kubelet。
-
 <!--
 ### Synopsis
 -->
@@ -11,9 +6,10 @@ Write kubelet settings, certificates and (re)start the kubelet
 <!--
 Write a file with KubeletConfiguration and an environment file with node specific kubelet settings, and then (re)start kubelet.
 -->
-生成一个包含 KubeletConfiguration 的文件和一个包含特定于节点的 kubelet 配置的环境文件，然后（重新）启动 kubelet。
+生成一个包含 KubeletConfiguration 的文件和一个包含特定于节点的 kubelet
+配置的环境文件，然后（重新）启动 kubelet。
 
-```
+```shell
 kubeadm join phase kubelet-start [api-server-endpoint] [flags]
 ```
 
@@ -22,7 +18,7 @@ kubeadm join phase kubelet-start [api-server-endpoint] [flags]
 -->
 ### 选项
 
-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@@ -34,10 +30,12 @@ kubeadm join phase kubelet-start [api-server-endpoint] [flags]
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Path to a kubeadm configuration file.
 -->
 kubeadm 配置文件的路径。
+</p>
 </td>
 </tr>
 
@@ -46,10 +44,10 @@ kubeadm 配置文件的路径。
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 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>
@@ -61,10 +59,10 @@ Path to the CRI socket to connect. If empty kubeadm will try to auto-detect this
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 For file-based discovery, a file or URL from which to load cluster information.
 -->
-<p>
 对于基于文件的发现，给出用于加载集群信息的文件或者 URL。
 </p>
 </td>
@@ -75,10 +73,10 @@ For file-based discovery, a file or URL from which to load cluster information.
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 For token-based discovery, the token used to validate cluster information fetched from the API server.
 -->
-<p>
 对于基于令牌的发现，该令牌用于验证从 API 服务器获取的集群信息。
 </p>
 </td>
@@ -89,10 +87,10 @@ For token-based discovery, the token used to validate cluster information fetche
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 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>
@@ -103,10 +101,10 @@ For token-based discovery, validate that the root CA public key matches this has
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 For token-based discovery, allow joining without --discovery-token-ca-cert-hash pinning.
 -->
-<p>
 对于基于令牌的发现，允许在未关联 --discovery-token-ca-cert-hash 参数的情况下添加节点。
 </p>
 </td>
@@ -117,10 +115,10 @@ For token-based discovery, allow joining without --discovery-token-ca-cert-hash
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Don't apply any changes; just output what would be done.
 -->
-<p>
 不做任何更改；只输出将要执行的操作。
 </p>
 </td>
@@ -131,10 +129,10 @@ Don't apply any changes; just output what would be done.
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 help for kubelet-start
 -->
-<p>
 kubelet-start 操作的帮助命令。
 </p>
 </td>
@@ -145,10 +143,10 @@ kubelet-start 操作的帮助命令。
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Specify the node name.
 -->
-<p>
 指定节点名称。
 </p>
 </td>
@@ -158,27 +156,33 @@ Specify the node name.
 <td colspan="2">--patches string</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
+<td></td>
+<td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 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;kubeletconfiguration&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.
 -->
 目录路径，指向的目录中包含名为 “target[suffix][+patchtype].extension” 的文件。
 例如，"kube-apiserver0+merge.yaml" 或 "etcd.json" 这种简单形式。
-"target" 可以是 “kube-apiserver”、“kube-controller-manager”、“kube-scheduler”、“etcd”、“kubeletconfiguration” 之一，
+"target" 可以是 “kube-apiserver”、“kube-controller-manager”、“kube-scheduler”、
+“etcd”、“kubeletconfiguration” 之一，
 "patchtype" 可以是 "strategic"、"merge" 或 "json" 之一，并且它们与 kubectl 支持的补丁格式匹配。
 默认的 "patchtype" 为 "strategic"。 "extension" 必须为 "json" 或 "yaml"。
-"suffix" 是一个可选字符串，可用于确定按字母顺序首先应用哪些补丁。</p></td>
+"suffix" 是一个可选字符串，可用于确定按字母顺序首先应用哪些补丁。
+</p>
+</td>
 </tr>
 
 <tr>
 <td colspan="2">--tls-bootstrap-token string</td>
 </tr>
 <tr>
-<td></td><td style="line-height: 130%; word-wrap: break-word;">
+<td></td>
+<td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 Specify the token used to temporarily authenticate with the Kubernetes Control Plane while joining the node.
 -->
-<p>
 指定在加入节点时用于临时通过 Kubernetes 控制平面进行身份验证的令牌。
 </p>
 </td>
@@ -189,10 +193,10 @@ Specify the token used to temporarily authenticate with the Kubernetes Control P
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<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>
@@ -206,7 +210,7 @@ Use this token for both discovery-token and tls-bootstrap-token when those value
 -->
 ### 从父命令继承的选项
 
-   <table style="width: 100%; table-layout: fixed;">
+<table style="width: 100%; table-layout: fixed;">
 <colgroup>
 <col span="1" style="width: 10px;" />
 <col span="1" />
@@ -218,10 +222,10 @@ Use this token for both discovery-token and tls-bootstrap-token when those value
 </tr>
 <tr>
 <td></td><td style="line-height: 130%; word-wrap: break-word;">
+<p>
 <!--
 [EXPERIMENTAL] The path to the 'real' host root filesystem.
 -->
-<p>
 [实验] 指向 '真实' 宿主机根文件系统的路径。
 </p>
 </td>