Skip to content

Commit 00a8110

Browse files
authored
Merge pull request #47717 from windsonsea/othery
[zh] Sync kubeadm-token.md and its dependent files
2 parents 1c5221a + 363b7ca commit 00a8110

File tree

6 files changed

+62
-60
lines changed

6 files changed

+62
-60
lines changed

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_token.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_token/_index.md

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,21 @@ This command manages bootstrap tokens. It is optional and needed only for advanc
1717
In short, bootstrap tokens are used for establishing bidirectional trust between a client and a server.
1818
A bootstrap token can be used when a client (for example a node that is about to join the cluster) needs
1919
to trust the server it is talking to. Then a bootstrap token with the "signing" usage can be used.
20-
-->
21-
简而言之,引导令牌(bootstrap token)用于在客户端和服务器之间建立双向信任。
22-
当客户端(例如,即将加入集群的节点)需要时,可以使用引导令牌相信正在与之通信的服务器。
23-
然后可以使用具有 “签名” 的引导令牌。
24-
25-
<!--
2620
bootstrap tokens can also function as a way to allow short-lived authentication to the API Server
2721
(the token serves as a way for the API Server to trust the client), for example for doing the TLS Bootstrap.
2822
-->
29-
引导令牌还可以作为一种允许对 API 服务器进行短期身份验证的方法(令牌用作 API 服务器信任客户端的方式),例如用于执行 TLS 引导程序。
23+
简而言之,引导令牌(Bootstrap Token)用于在客户端和服务器之间建立双向信任。
24+
当客户端(例如,即将加入集群的节点)需要信任所通信的服务器时,可以使用引导令牌。
25+
这时可以使用具有 “signing” 用途的引导令牌。引导令牌还可以作为一种允许对 API
26+
服务器进行短期身份验证的方法(令牌用作 API 服务器信任客户端的方式),例如用于执行 TLS 引导程序。
3027

3128
<!--
3229
What is a bootstrap token more exactly?
3330
- It is a Secret in the kube-system namespace of type "bootstrap.kubernetes.io/token".
3431
- A bootstrap token must be of the form "[a-z0-9]{6}.[a-z0-9]{16}". The former part is the public token ID,
3532
while the latter is the Token Secret and it must be kept private at all circumstances!
3633
- The name of the Secret must be named "bootstrap-token-(token-id)".
37-
-->
34+
-->
3835
引导令牌准确来说是什么?
3936

4037
- 它是位于 kube-system 命名空间中类型为 “bootstrap.kubernetes.io/token” 的一个 Secret。
@@ -43,10 +40,10 @@ What is a bootstrap token more exactly?
4340

4441
<!--
4542
You can read more about bootstrap tokens here:
46-
/docs/admin/bootstrap-tokens/
43+
https://kubernetes.io/docs/admin/bootstrap-tokens/
4744
-->
4845
你可以在此处阅读有关引导令牌(bootstrap token)的更多信息:
49-
/docs/admin/bootstrap-tokens/
46+
https://kubernetes.io/zh-cn/docs/admin/bootstrap-tokens/
5047

5148
```
5249
kubeadm token [flags]
@@ -69,10 +66,10 @@ kubeadm token [flags]
6966
</tr>
7067
<tr>
7168
<td></td><td style="line-height: 130%; word-wrap: break-word;">
69+
<p>
7270
<!--
7371
Whether to enable dry-run mode or not
7472
-->
75-
<p>
7673
是否启用 `dry-run` 模式。
7774
</p>
7875
</td>
@@ -83,10 +80,10 @@ Whether to enable dry-run mode or not
8380
</tr>
8481
<tr>
8582
<td></td><td style="line-height: 130%; word-wrap: break-word;">
83+
<p>
8684
<!--
8785
help for token
8886
-->
89-
<p>
9087
token 操作的帮助命令。
9188
</p>
9289
</td>
@@ -102,10 +99,10 @@ token 操作的帮助命令。
10299
</tr>
103100
<tr>
104101
<td></td><td style="line-height: 130%; word-wrap: break-word;">
102+
<p>
105103
<!--
106104
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.
107105
-->
108-
<p>
109106
与集群通信时使用的 kubeconfig 文件。如果未设置,则搜索一组标准位置以查找现有 kubeconfig 文件。
110107
</p>
111108
</td>
@@ -131,11 +128,11 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
131128
</tr>
132129
<tr>
133130
<td></td><td style="line-height: 130%; word-wrap: break-word;">
131+
<p>
134132
<!--
135-
[EXPERIMENTAL] The path to the 'real' host root filesystem.
133+
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
136134
-->
137-
<p>
138-
[实验] 指向 '真实' 宿主机根文件系统的路径。
135+
到“真实”主机根文件系统的路径。这将导致 kubeadm 切换到所提供的路径。
139136
</p>
140137
</td>
141138
</tr>

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_token_create.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_token/kubeadm_token_create.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ When used together with '--print-join-command', print the full 'kubeadm join' fl
5757
</tr>
5858
<tr>
5959
<td></td><td style="line-height: 130%; word-wrap: break-word;">
60+
<p>
6061
<!--
6162
Path to a kubeadm configuration file.
6263
-->
63-
<p>
6464
kubeadm 配置文件的路径。
6565
</p>
6666
</td>
@@ -71,10 +71,10 @@ kubeadm 配置文件的路径。
7171
</tr>
7272
<tr>
7373
<td></td><td style="line-height: 130%; word-wrap: break-word;">
74+
<p>
7475
<!--
7576
A human friendly description of how this token is used.
7677
-->
77-
<p>
7878
针对令牌用途的人性化的描述。
7979
</p>
8080
</td>
@@ -92,10 +92,10 @@ A human friendly description of how this token is used.
9292
</tr>
9393
<tr>
9494
<td></td><td style="line-height: 130%; word-wrap: break-word;">
95+
<p>
9596
<!--
9697
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"
9798
-->
98-
<p>
9999
此令牌用于身份验证时将对其他组进行身份验证。必须匹配 "\\Asystem:bootstrappers:[a-z0-9:-]{0,255}[a-z0-9]\\z"
100100
</p>
101101
</td>
@@ -106,10 +106,10 @@ Extra groups that this token will authenticate as when used for authentication.
106106
</tr>
107107
<tr>
108108
<td></td><td style="line-height: 130%; word-wrap: break-word;">
109+
<p>
109110
<!--
110111
help for create
111112
-->
112-
<p>
113113
create 操作的帮助命令。
114114
</p>
115115
</td>
@@ -120,10 +120,10 @@ create 操作的帮助命令。
120120
</tr>
121121
<tr>
122122
<td></td><td style="line-height: 130%; word-wrap: break-word;">
123+
<p>
123124
<!--
124125
Instead of printing only the token, print the full 'kubeadm join' flag needed to join the cluster using the token.
125126
-->
126-
<p>
127127
不仅仅打印令牌,而是打印使用令牌加入集群所需的完整 'kubeadm join' 参数。
128128
</p>
129129
</td>
@@ -139,10 +139,10 @@ Instead of printing only the token, print the full 'kubeadm join' flag needed to
139139
</tr>
140140
<tr>
141141
<td></td><td style="line-height: 130%; word-wrap: break-word;">
142+
<p>
142143
<!--
143144
The duration before the token is automatically deleted (e.g. 1s, 2m, 3h). If set to '0', the token will never expire
144145
-->
145-
<p>
146146
令牌有效时间,超过该时间令牌被自动删除。(例如:1s, 2m, 3h)。如果设置为 '0',令牌将永远不过期。
147147
</p>
148148
</td>
@@ -158,11 +158,12 @@ The duration before the token is automatically deleted (e.g. 1s, 2m, 3h). If set
158158
</tr>
159159
<tr>
160160
<td></td><td style="line-height: 130%; word-wrap: break-word;">
161+
<p>
161162
<!--
162163
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]
163164
-->
164-
<p>
165-
描述可以使用此令牌的方式。你可以多次使用 `--usages` 或者提供一个以逗号分隔的选项列表。合法选项有: [signing,authentication]
165+
描述可以使用此令牌的方式。你可以多次使用 `--usages` 或者提供一个以逗号分隔的选项列表。
166+
合法选项有[signing,authentication]
166167
</p>
167168
</td>
168169
</tr>
@@ -187,10 +188,10 @@ Describes the ways in which this token can be used. You can pass --usages multip
187188
</tr>
188189
<tr>
189190
<td></td><td style="line-height: 130%; word-wrap: break-word;">
191+
<p>
190192
<!--
191193
Whether to enable dry-run mode or not
192194
-->
193-
<p>
194195
是否启用 `dry-run` 运行模式。
195196
</p>
196197
</td>
@@ -206,10 +207,10 @@ Whether to enable dry-run mode or not
206207
</tr>
207208
<tr>
208209
<td></td><td style="line-height: 130%; word-wrap: break-word;">
210+
<p>
209211
<!--
210212
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.
211213
-->
212-
<p>
213214
用于和集群通信的 kubeconfig 文件。如果它没有被设置,那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件。
214215
</p>
215216
</td>
@@ -220,11 +221,11 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
220221
</tr>
221222
<tr>
222223
<td></td><td style="line-height: 130%; word-wrap: break-word;">
224+
<p>
223225
<!--
224-
[EXPERIMENTAL] The path to the 'real' host root filesystem.
226+
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
225227
-->
226-
<p>
227-
[实验] 指向 '真实' 宿主机根文件系统的路径。
228+
到“真实”主机根文件系统的路径。这将导致 kubeadm 切换到所提供的路径。
228229
</p>
229230
</td>
230231
</tr>

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_token_delete.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_token/kubeadm_token_delete.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ kubeadm token delete [token-value] ...
3939
</tr>
4040
<tr>
4141
<td></td><td style="line-height: 130%; word-wrap: break-word;">
42+
<p>
4243
<!--
4344
help for delete
4445
-->
45-
<p>
4646
delete 操作的帮助命令。
4747
</p>
4848
</td>
@@ -68,10 +68,10 @@ delete 操作的帮助命令。
6868
</tr>
6969
<tr>
7070
<td></td><td style="line-height: 130%; word-wrap: break-word;">
71+
<p>
7172
<!--
7273
Whether to enable dry-run mode or not
7374
-->
74-
<p>
7575
是否启用 `dry-run` 运行模式。
7676
</p>
7777
</td>
@@ -87,10 +87,10 @@ Whether to enable dry-run mode or not
8787
</tr>
8888
<tr>
8989
<td></td><td style="line-height: 130%; word-wrap: break-word;">
90+
<p>
9091
<!--
9192
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.
9293
-->
93-
<p>
9494
用于和集群通信的 kubeconfig 文件。如果它没有被设置,那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件。
9595
</p>
9696
</td>
@@ -101,11 +101,11 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
101101
</tr>
102102
<tr>
103103
<td></td><td style="line-height: 130%; word-wrap: break-word;">
104+
<p>
104105
<!--
105-
[EXPERIMENTAL] The path to the 'real' host root filesystem.
106+
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
106107
-->
107-
<p>
108-
[实验] 指向 '真实' 宿主机根文件系统的路径。
108+
到“真实”主机根文件系统的路径。这将导致 kubeadm 切换到所提供的路径。
109109
</p>
110110
</td>
111111
</tr>

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_token_generate.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_token/kubeadm_token_generate.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Generate and print a bootstrap token, but do not create it on the server
2+
Generate and print a bootstrap token, but do not create it on the server
33
-->
44
生成并打印一个引导令牌,但不要在服务器上创建它。
55

@@ -103,10 +103,12 @@ kubeadm token generate [flags]
103103
</tr>
104104
<tr>
105105
<td></td><td style="line-height: 130%; word-wrap: break-word;">
106-
<!--
107-
<p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p>
106+
<p>
107+
<!--
108+
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
108109
-->
109-
<p>[实验] 指向 '真实' 宿主机根文件系统的路径。</p>
110+
到“真实”主机根文件系统的路径。这将导致 kubeadm 切换到所提供的路径。
111+
</p>
110112
</td>
111113
</tr>
112114

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_token_list.md renamed to content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_token/kubeadm_token_list.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ kubeadm token list [flags]
3737
</tr>
3838
<tr>
3939
<td></td><td style="line-height: 130%; word-wrap: break-word;">
40+
<p>
4041
<!--
4142
If true, ignore any errors in templates when a field or map key is missing in the template. Only applies to golang and jsonpath output formats.
4243
-->
43-
<p>
4444
如果设置为 true,则在模板中缺少字段或哈希表的键时忽略模板中的任何错误。
4545
仅适用于 golang 和 jsonpath 输出格式。
4646
</p>
@@ -55,10 +55,10 @@ If true, ignore any errors in templates when a field or map key is missing in th
5555
</tr>
5656
<tr>
5757
<td></td><td style="line-height: 130%; word-wrap: break-word;">
58+
<p>
5859
<!--
5960
Output format. One of: text|json|yaml|go-template|go-template-file|template|templatefile|jsonpath|jsonpath-as-json|jsonpath-file.
6061
-->
61-
<p>
6262
输出格式:text|json|yaml|go-template|go-template-file|template|templatefile|jsonpath|jsonpath-as-json|jsonpath-file 其中之一
6363
</p>
6464
</td>
@@ -69,8 +69,10 @@ Output format. One of: text|json|yaml|go-template|go-template-file|template|temp
6969
</tr>
7070
<tr>
7171
<td></td><td style="line-height: 130%; word-wrap: break-word;">
72-
<!-- help for list -->
7372
<p>
73+
<!--
74+
help for list
75+
-->
7476
list 操作的帮助命令。
7577
</p>
7678
</td>
@@ -129,10 +131,10 @@ Whether to enable dry-run mode or not
129131
</tr>
130132
<tr>
131133
<td></td><td style="line-height: 130%; word-wrap: break-word;">
134+
<p>
132135
<!--
133136
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.
134137
-->
135-
<p>
136138
用于和集群通信的 kubeconfig 文件。如果它没有被设置,那么 kubeadm 将会搜索一个已经存在于标准路径的 kubeconfig 文件。
137139
</p>
138140
</td>
@@ -143,9 +145,11 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
143145
</tr>
144146
<tr>
145147
<td></td><td style="line-height: 130%; word-wrap: break-word;">
146-
<!-- [EXPERIMENTAL] The path to the 'real' host root filesystem. -->
147148
<p>
148-
[实验] 指向 '真实' 宿主机根文件系统的路径。
149+
<!--
150+
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
151+
-->
152+
到“真实”主机根文件系统的路径。这将导致 kubeadm 切换到所提供的路径。
149153
</p>
150154
</td>
151155
</tr>

0 commit comments

Comments
 (0)