Skip to content

Commit

Permalink
[zh] sync kubeadm_join files
Browse files Browse the repository at this point in the history
  • Loading branch information
@windsonsea
windsonsea committed Aug 31, 2023
1 parent 579d46e commit 67f7296
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 89 deletions.
37 changes: 9 additions & 28 deletions content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join.md
View file
@@ -1,18 +1,7 @@
<!--
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 content, 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 this on any machine you wish to join an existing cluster
-->
在你希望加入现有集群的任何机器上运行它
在你希望加入现有集群的任何机器上运行它。

<!--
### Synopsis
Expand All @@ -25,7 +14,6 @@ bidirectional trust. This is split into discovery (having the Node
trust the Kubernetes Control Plane) and TLS bootstrap (having the
Kubernetes Control Plane trust the Node).
-->

当节点加入 kubeadm 初始化的集群时，我们需要建立双向信任。
这个过程可以分解为发现（让待加入节点信任 Kubernetes 控制平面节点）和
TLS 引导（让 Kubernetes 控制平面节点信任待加入节点）两个部分。
Expand All @@ -44,9 +32,8 @@ the discovery information is loaded from a URL, HTTPS must be used.
Also, in that case the host installed CA bundle is used to verify
the connection.
-->

有两种主要的发现方案。
第一种方法是使用共享令牌和 API 服务器的 IP 地址。
第一种方案是使用共享令牌和 API 服务器的 IP 地址。
第二种是以文件形式提供标准 kubeconfig 文件的一个子集。
发现/kubeconfig 文件支持令牌、client-go 鉴权插件（“exec”）、“tokenFile" 和
"authProvider"。该文件可以是本地文件，也可以通过 HTTPS URL 下载。
Expand All @@ -68,7 +55,6 @@ This value is available in the output of "kubeadm init" or can be
calculated using standard tools. The --discovery-token-ca-cert-hash flag
may be repeated multiple times to allow more than one public key.
-->

如果使用共享令牌进行发现，还应该传递 --discovery-token-ca-cert-hash 参数来验证
Kubernetes 控制平面节点提供的根证书颁发机构（CA）的公钥。
此参数的值指定为 "&lt;hash-type&gt;:&lt;hex-encoded-value&gt;"，
Expand Down Expand Up @@ -96,7 +82,6 @@ approve these signing requests. This token is passed in with the
Often times the same token is used for both parts. In this case, the
--token flag can be used instead of specifying each token individually.
-->

TLS 引导机制也通过共享令牌驱动。
这用于向 Kubernetes 控制平面节点进行临时的身份验证，以提交本地创建的密钥对的证书签名请求（CSR）。
默认情况下，kubeadm 将设置 Kubernetes 控制平面节点自动批准这些签名请求。
Expand All @@ -108,7 +93,6 @@ TLS 引导机制也通过共享令牌驱动。
<!--
The "join [api-server-endpoint]" command executes the following phases:
-->

"join [api-server-endpoint]" 命令执行下列阶段：

```
Expand Down Expand Up @@ -178,7 +162,7 @@ If not set the default network interface will be used.
<!--
<p>Use this key to decrypt the certificate secrets uploaded by init.</p>
-->
<p>使用此密钥可以解密由 init 上传的证书 secret。</p>
<p>使用此密钥可以解密由 init 上传的证书 Secret。</p>
</td>
</tr>

Expand All @@ -202,7 +186,7 @@ If not set the default network interface will be used.
<!--
<p>Create a new control plane instance on this node</p>
-->
<p>在此节点上创建一个新的控制平面实例</p>
<p>在此节点上创建一个新的控制平面实例。</p>
</td>
</tr>

Expand All @@ -216,7 +200,7 @@ If not set the default network interface will be used.
use this option only if you have more than one CRI installed or if you have non-standard CRI socket.</p>
-->
<p>要连接的 CRI 套接字的路径。如果为空，则 kubeadm 将尝试自动检测此值；
仅当安装了多个 CRI 或具有非标准 CRI 插槽时，才使用此选项。</p>
仅当安装了多个 CRI 或存在非标准的 CRI 套接字时，才使用此选项。</p>
</td>
</tr>

Expand Down Expand Up @@ -252,7 +236,7 @@ use this option only if you have more than one CRI installed or if you have non-
<!--
<p>For token-based discovery, validate that the root CA public key matches this hash (format: "&lt;type&gt;:&lt;value&gt;").</p>
-->
<p>对基于令牌的发现，验证根 CA 公钥是否与此哈希匹配 (格式: "&lt;type&gt;:&lt;value&gt;")。</p>
<p>对基于令牌的发现，验证根 CA 公钥是否与此哈希匹配 (格式："&lt;type&gt;:&lt;value&gt;")。</p>
</td>
</tr>

Expand Down Expand Up @@ -288,7 +272,7 @@ Don't apply any changes; just output what would be done.
<!--
<p>help for join</p>
-->
<p>join 操作的帮助命令</p>
<p>join 操作的帮助命令。</p>
</td>
</tr>

Expand All @@ -312,7 +296,7 @@ Don't apply any changes; just output what would be done.
<!--
<p>Specify the node name.</p>
-->
<p>指定节点的名称</p>
<p>指定节点的名称。</p>
</td>
</tr>

Expand Down Expand Up @@ -341,7 +325,7 @@ Don't apply any changes; just output what would be done.
<!--
<p>List of phases to be skipped</p>
-->
<p>要跳过的阶段列表</p>
<p>要跳过的阶段列表。</p>
</td>
</tr>

Expand Down Expand Up @@ -372,11 +356,9 @@ Don't apply any changes; just output what would be done.
</tbody>
</table>


<!--
### Options inherited from parent commands
-->

### 从父命令继承的选项

<table style="width: 100%; table-layout: fixed;">
Expand All @@ -400,4 +382,3 @@ Don't apply any changes; just output what would be done.

</tbody>
</table>

22 changes: 3 additions & 19 deletions content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase.md
View file
@@ -1,35 +1,21 @@
<!--
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 content, 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.
-->

<!--
Use this command to invoke single phase of the join workflow
-->
使用此命令来调用 `join` 工作流程的某个阶段
使用此命令来调用 `join` 工作流程的某个阶段。

<!--
### Synopsis
-->

### 概要

<!--
Use this command to invoke single phase of the join workflow
-->

使用此命令来调用 `join` 工作流程的某个阶段
使用此命令来调用 `join` 工作流程的某个阶段。

<!--
### Options
-->

### 选项

<table style="width: 100%; table-layout: fixed;">
Expand All @@ -47,7 +33,7 @@ Use this command to invoke single phase of the join workflow
<!--
<p>help for phase</p>
-->
<p>phase 操作的帮助命令</p>
<p>phase 操作的帮助命令。</p>
</td>
</tr>

Expand All @@ -57,7 +43,6 @@ Use this command to invoke single phase of the join workflow
<!--
### Options inherited from parent commands
-->

### 从父命令中继承的选项

<table style="width: 100%; table-layout: fixed;">
Expand All @@ -81,4 +66,3 @@ Use this command to invoke single phase of the join workflow

</tbody>
</table>

26 changes: 6 additions & 20 deletions ...ocs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_kubelet-start.md
View file
@@ -1,30 +1,16 @@
<!--
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 content, 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.
-->


<!--
Write kubelet settings, certificates and (re)start the kubelet
-->
配置 Kubelet、证书并（重新）启动 Kubelet
配置 kubelet、证书并（重新）启动 kubelet。

<!--
### Synopsis
-->

### 概要

<!--
Write a file with KubeletConfiguration and an environment file with node specific kubelet settings, and then (re)start kubelet.
-->

生成一个包含 KubeletConfiguration 的文件和一个包含特定于节点的 kubelet 配置的环境文件，然后（重新）启动 kubelet。

```
Expand All @@ -34,7 +20,6 @@ kubeadm join phase kubelet-start [api-server-endpoint] [flags]
<!--
### Options
-->

### 选项

<table style="width: 100%; table-layout: fixed;">
Expand Down Expand Up @@ -65,7 +50,8 @@ kubeadm 配置文件的路径。
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 套接字时，才使用此选项。
提供给 CRI 套接字建立连接的路径。如果为空，则 kubeadm 将尝试自动检测该值；
仅当安装了多个 CRI 或存在非标准的 CRI 套接字时，才使用此选项。
</p>
</td>
</tr>
Expand Down Expand Up @@ -149,7 +135,7 @@ Don't apply any changes; just output what would be done.
help for kubelet-start
-->
<p>
kubelet-start 操作的帮助命令
kubelet-start 操作的帮助命令。
</p>
</td>
</tr>
Expand All @@ -173,7 +159,8 @@ Specify the node name.
</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.
<!--
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" 这种简单形式。
Expand Down Expand Up @@ -217,7 +204,6 @@ Use this token for both discovery-token and tls-bootstrap-token when those value
<!--
### Options inherited from parent commands
-->

### 从父命令继承的选项

<table style="width: 100%; table-layout: fixed;">
Expand Down
28 changes: 6 additions & 22 deletions ...cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_preflight.md
View file
@@ -1,29 +1,16 @@
<!--
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 content, 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 join pre-flight checks
-->
运行 join 命令前检查
运行 join 命令前检查。

<!--
### Synopsis
-->

### 概要

<!--
Run pre-flight checks for kubeadm join.
-->

运行 kubeadm join 命令添加节点前检查。

```
Expand All @@ -34,7 +21,6 @@ kubeadm join phase preflight [api-server-endpoint] [flags]
### Examples
# Run join pre-flight checks using a config file.
-->

### 示例

```
Expand All @@ -45,7 +31,6 @@ kubeadm join phase preflight --config kubeadm-config.yaml
<!--
### Options
-->

### 选项

<table style="width: 100%; table-layout: fixed;">
Expand Down Expand Up @@ -92,7 +77,7 @@ kubeadm join phase preflight --config kubeadm-config.yaml
<!--
<p>Use this key to decrypt the certificate secrets uploaded by init.</p>
-->
<p>使用此密钥可以解密由 `init` 操作上传的证书 secret。</p>
<p>使用此密钥可以解密由 `init` 操作上传的证书 Secret。</p>
</td>
</tr>

Expand All @@ -116,7 +101,7 @@ kubeadm join phase preflight --config kubeadm-config.yaml
<!--
<p>Create a new control plane instance on this node</p>
-->
<p>在此节点上创建一个新的控制平面实例</p>
<p>在此节点上创建一个新的控制平面实例。</p>
</td>
</tr>

Expand All @@ -128,7 +113,8 @@ kubeadm join phase preflight --config kubeadm-config.yaml
<!--
<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>
-->
<p>提供给 CRI 套接字建立连接的路径。如果为空，则 kubeadm 将尝试自动检测该值；仅当安装了多个 CRI 或具有非标准 CRI 套接字时，才使用此选项。</p>
<p>提供给 CRI 套接字建立连接的路径。如果为空，则 kubeadm 将尝试自动检测该值；
仅当安装了多个 CRI 或存在非标准的 CRI 套接字时，才使用此选项。</p>
</td>
</tr>

Expand Down Expand Up @@ -200,7 +186,7 @@ kubeadm join phase preflight --config kubeadm-config.yaml
<!--
<p>help for preflight</p>
-->
<p>preflight 操作的帮助命令</p>
<p>preflight 操作的帮助命令。</p>
</td>
</tr>

Expand Down Expand Up @@ -258,7 +244,6 @@ kubeadm join phase preflight --config kubeadm-config.yaml
<!--
### Options inherited from parent commands
-->

### 从父命令继承的选项

<table style="width: 100%; table-layout: fixed;">
Expand All @@ -282,4 +267,3 @@ kubeadm join phase preflight --config kubeadm-config.yaml

</tbody>
</table>

0 comments on commit 67f7296

Please sign in to comment.