Skip to content

Commit 428625f

Browse files
authored
Merge pull request #42799 from windsonsea/joinyh
[zh] sync kubeadm_join files
2 parents a26d3e2 + 67f7296 commit 428625f

File tree

4 files changed

+24
-89
lines changed

4 files changed

+24
-89
lines changed

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

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
1-
<!--
2-
The file is auto-generated from the Go source code of the component using a generic
3-
[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
4-
to generate the reference documentation, please read
5-
[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
6-
To update the reference content, please follow the
7-
[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
8-
guide. You can file document formatting bugs against the
9-
[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
10-
-->
11-
121
<!--
132
Run this on any machine you wish to join an existing cluster
143
-->
15-
在你希望加入现有集群的任何机器上运行它
4+
在你希望加入现有集群的任何机器上运行它
165

176
<!--
187
### Synopsis
@@ -25,7 +14,6 @@ bidirectional trust. This is split into discovery (having the Node
2514
trust the Kubernetes Control Plane) and TLS bootstrap (having the
2615
Kubernetes Control Plane trust the Node).
2716
-->
28-
2917
当节点加入 kubeadm 初始化的集群时,我们需要建立双向信任。
3018
这个过程可以分解为发现(让待加入节点信任 Kubernetes 控制平面节点)和
3119
TLS 引导(让 Kubernetes 控制平面节点信任待加入节点)两个部分。
@@ -44,9 +32,8 @@ the discovery information is loaded from a URL, HTTPS must be used.
4432
Also, in that case the host installed CA bundle is used to verify
4533
the connection.
4634
-->
47-
4835
有两种主要的发现方案。
49-
第一种方法是使用共享令牌和 API 服务器的 IP 地址。
36+
第一种方案是使用共享令牌和 API 服务器的 IP 地址。
5037
第二种是以文件形式提供标准 kubeconfig 文件的一个子集。
5138
发现/kubeconfig 文件支持令牌、client-go 鉴权插件(“exec”)、“tokenFile" 和
5239
"authProvider"。该文件可以是本地文件,也可以通过 HTTPS URL 下载。
@@ -68,7 +55,6 @@ This value is available in the output of "kubeadm init" or can be
6855
calculated using standard tools. The --discovery-token-ca-cert-hash flag
6956
may be repeated multiple times to allow more than one public key.
7057
-->
71-
7258
如果使用共享令牌进行发现,还应该传递 --discovery-token-ca-cert-hash 参数来验证
7359
Kubernetes 控制平面节点提供的根证书颁发机构(CA)的公钥。
7460
此参数的值指定为 "&lt;hash-type&gt;:&lt;hex-encoded-value&gt;",
@@ -96,7 +82,6 @@ approve these signing requests. This token is passed in with the
9682
Often times the same token is used for both parts. In this case, the
9783
--token flag can be used instead of specifying each token individually.
9884
-->
99-
10085
TLS 引导机制也通过共享令牌驱动。
10186
这用于向 Kubernetes 控制平面节点进行临时的身份验证,以提交本地创建的密钥对的证书签名请求(CSR)。
10287
默认情况下,kubeadm 将设置 Kubernetes 控制平面节点自动批准这些签名请求。
@@ -108,7 +93,6 @@ TLS 引导机制也通过共享令牌驱动。
10893
<!--
10994
The "join [api-server-endpoint]" command executes the following phases:
11095
-->
111-
11296
"join [api-server-endpoint]" 命令执行下列阶段:
11397

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

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

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

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

@@ -288,7 +272,7 @@ Don't apply any changes; just output what would be done.
288272
<!--
289273
<p>help for join</p>
290274
-->
291-
<p>join 操作的帮助命令</p>
275+
<p>join 操作的帮助命令</p>
292276
</td>
293277
</tr>
294278

@@ -312,7 +296,7 @@ Don't apply any changes; just output what would be done.
312296
<!--
313297
<p>Specify the node name.</p>
314298
-->
315-
<p>指定节点的名称</p>
299+
<p>指定节点的名称</p>
316300
</td>
317301
</tr>
318302

@@ -341,7 +325,7 @@ Don't apply any changes; just output what would be done.
341325
<!--
342326
<p>List of phases to be skipped</p>
343327
-->
344-
<p>要跳过的阶段列表</p>
328+
<p>要跳过的阶段列表</p>
345329
</td>
346330
</tr>
347331

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

375-
376359
<!--
377360
### Options inherited from parent commands
378361
-->
379-
380362
### 从父命令继承的选项
381363

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

401383
</tbody>
402384
</table>
403-

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase.md

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,21 @@
1-
<!--
2-
The file is auto-generated from the Go source code of the component using a generic
3-
[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
4-
to generate the reference documentation, please read
5-
[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
6-
To update the reference content, please follow the
7-
[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
8-
guide. You can file document formatting bugs against the
9-
[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
10-
-->
11-
121
<!--
132
Use this command to invoke single phase of the join workflow
143
-->
15-
使用此命令来调用 `join` 工作流程的某个阶段
4+
使用此命令来调用 `join` 工作流程的某个阶段
165

176
<!--
187
### Synopsis
198
-->
20-
219
### 概要
2210

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

2916
<!--
3017
### Options
3118
-->
32-
3319
### 选项
3420

3521
<table style="width: 100%; table-layout: fixed;">
@@ -47,7 +33,7 @@ Use this command to invoke single phase of the join workflow
4733
<!--
4834
<p>help for phase</p>
4935
-->
50-
<p>phase 操作的帮助命令</p>
36+
<p>phase 操作的帮助命令</p>
5137
</td>
5238
</tr>
5339

@@ -57,7 +43,6 @@ Use this command to invoke single phase of the join workflow
5743
<!--
5844
### Options inherited from parent commands
5945
-->
60-
6146
### 从父命令中继承的选项
6247

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

8267
</tbody>
8368
</table>
84-

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

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,16 @@
1-
<!--
2-
The file is auto-generated from the Go source code of the component using a generic
3-
[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
4-
to generate the reference documentation, please read
5-
[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
6-
To update the reference content, please follow the
7-
[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
8-
guide. You can file document formatting bugs against the
9-
[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
10-
-->
11-
12-
131
<!--
142
Write kubelet settings, certificates and (re)start the kubelet
153
-->
16-
配置 Kubelet、证书并(重新)启动 Kubelet
4+
配置 kubelet、证书并(重新)启动 kubelet。
175

186
<!--
197
### Synopsis
208
-->
21-
229
### 概要
2310

2411
<!--
2512
Write a file with KubeletConfiguration and an environment file with node specific kubelet settings, and then (re)start kubelet.
2613
-->
27-
2814
生成一个包含 KubeletConfiguration 的文件和一个包含特定于节点的 kubelet 配置的环境文件,然后(重新)启动 kubelet。
2915

3016
```
@@ -34,7 +20,6 @@ kubeadm join phase kubelet-start [api-server-endpoint] [flags]
3420
<!--
3521
### Options
3622
-->
37-
3823
### 选项
3924

4025
<table style="width: 100%; table-layout: fixed;">
@@ -65,7 +50,8 @@ kubeadm 配置文件的路径。
6550
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.
6651
-->
6752
<p>
68-
提供给 CRI 套接字建立连接的路径。如果为空,则 kubeadm 将尝试自动检测该值;仅当安装了多个 CRI 或具有非标准 CRI 套接字时,才使用此选项。
53+
提供给 CRI 套接字建立连接的路径。如果为空,则 kubeadm 将尝试自动检测该值;
54+
仅当安装了多个 CRI 或存在非标准的 CRI 套接字时,才使用此选项。
6955
</p>
7056
</td>
7157
</tr>
@@ -149,7 +135,7 @@ Don't apply any changes; just output what would be done.
149135
help for kubelet-start
150136
-->
151137
<p>
152-
kubelet-start 操作的帮助命令
138+
kubelet-start 操作的帮助命令
153139
</p>
154140
</td>
155141
</tr>
@@ -173,7 +159,8 @@ Specify the node name.
173159
</tr>
174160
<tr>
175161
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
176-
<!--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.
162+
<!--
163+
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.
177164
-->
178165
目录路径,指向的目录中包含名为 “target[suffix][+patchtype].extension” 的文件。
179166
例如,"kube-apiserver0+merge.yaml" 或 "etcd.json" 这种简单形式。
@@ -217,7 +204,6 @@ Use this token for both discovery-token and tls-bootstrap-token when those value
217204
<!--
218205
### Options inherited from parent commands
219206
-->
220-
221207
### 从父命令继承的选项
222208

223209
<table style="width: 100%; table-layout: fixed;">

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join_phase_preflight.md

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,16 @@
1-
<!--
2-
The file is auto-generated from the Go source code of the component using a generic
3-
[generator](https://github.com/kubernetes-sigs/reference-docs/). To learn how
4-
to generate the reference documentation, please read
5-
[Contributing to the reference documentation](/docs/contribute/generate-ref-docs/).
6-
To update the reference content, please follow the
7-
[Contributing upstream](/docs/contribute/generate-ref-docs/contribute-upstream/)
8-
guide. You can file document formatting bugs against the
9-
[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
10-
-->
11-
121
<!--
132
Run join pre-flight checks
143
-->
15-
运行 join 命令前检查
4+
运行 join 命令前检查
165

176
<!--
187
### Synopsis
198
-->
20-
219
### 概要
2210

2311
<!--
2412
Run pre-flight checks for kubeadm join.
2513
-->
26-
2714
运行 kubeadm join 命令添加节点前检查。
2815

2916
```
@@ -34,7 +21,6 @@ kubeadm join phase preflight [api-server-endpoint] [flags]
3421
### Examples
3522
# Run join pre-flight checks using a config file.
3623
-->
37-
3824
### 示例
3925

4026
```
@@ -45,7 +31,6 @@ kubeadm join phase preflight --config kubeadm-config.yaml
4531
<!--
4632
### Options
4733
-->
48-
4934
### 选项
5035

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

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

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

@@ -200,7 +186,7 @@ kubeadm join phase preflight --config kubeadm-config.yaml
200186
<!--
201187
<p>help for preflight</p>
202188
-->
203-
<p>preflight 操作的帮助命令</p>
189+
<p>preflight 操作的帮助命令</p>
204190
</td>
205191
</tr>
206192

@@ -258,7 +244,6 @@ kubeadm join phase preflight --config kubeadm-config.yaml
258244
<!--
259245
### Options inherited from parent commands
260246
-->
261-
262247
### 从父命令继承的选项
263248

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

283268
</tbody>
284269
</table>
285-

0 commit comments

Comments
 (0)