Skip to content

Commit 06afdec

Browse files
authored
Merge pull request #33561 from kinzhi/kinzhi97
[zh]Sync kubeadm-3
2 parents 4c7c7b8 + 58c174b commit 06afdec

File tree

8 files changed

+125
-14
lines changed

8 files changed

+125
-14
lines changed

content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_upload-certs.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,3 @@ kubeadm init phase upload-certs [flags]
9595

9696
</tbody>
9797
</table>
98-
99-
100-

content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_token.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,3 @@ kubeadm token [flags]
9191

9292
</tbody>
9393
</table>
94-
95-
96-

content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_token_create.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ guide. You can file document formatting bugs against the
99
[reference-docs](https://github.com/kubernetes-sigs/reference-docs/) project.
1010
-->
1111

12-
1312
Create bootstrap tokens on the server
1413

1514
### Synopsis

content/en/docs/reference/setup-tools/kubeadm/generated/kubeadm_version.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,3 @@ kubeadm version [flags]
6767

6868
</tbody>
6969
</table>
70-
71-
72-

content/zh/docs/reference/setup-tools/kubeadm/generated/kubeadm_init_phase_upload-certs.md

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
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 conent, 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+
<!--
13+
Upload certificates to kubeadm-certs
14+
-->
15+
将证书上传到 kubeadm-certs
116

217
<!--
318
### Synopsis
@@ -33,7 +48,9 @@ kubeadm init phase upload-certs [flags]
3348
<!--
3449
Key used to encrypt the control-plane certificates in the kubeadm-certs Secret.
3550
-->
51+
<p>
3652
用于加密 kubeadm-certs Secret 中的控制平面证书的密钥。
53+
</p>
3754
</td>
3855
</tr>
3956

@@ -45,7 +62,9 @@ Key used to encrypt the control-plane certificates in the kubeadm-certs Secret.
4562
<!--
4663
Path to a kubeadm configuration file.
4764
-->
65+
<p>
4866
kubeadm 配置文件的路径。
67+
</p>
4968
</td>
5069
</tr>
5170

@@ -57,7 +76,9 @@ kubeadm 配置文件的路径。
5776
<!--
5877
help for upload-certs
5978
-->
79+
<p>
6080
upload-certs 操作的帮助命令
81+
</p>
6182
</td>
6283
</tr>
6384

@@ -68,8 +89,10 @@ upload-certs 操作的帮助命令
6889
<tr>
6990
<!-- td></td><td style="line-height: 130%; word-wrap: break-word;">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.</td -->
7091
<td></td><td style="line-height: 130%; word-wrap: break-word;">
92+
<p>
7193
用来与集群通信的 kubeconfig 文件。
7294
如果此标志未设置,则可以在一组标准的位置搜索现有的 kubeconfig 文件。
95+
</p>
7396
</td>
7497
</tr>
7598

@@ -81,7 +104,9 @@ upload-certs 操作的帮助命令
81104
<!--
82105
Don't print the key used to encrypt the control-plane certificates.
83106
-->
107+
<p>
84108
不要打印输出用于加密控制平面证书的密钥。
109+
</p>
85110
</td>
86111
</tr>
87112

@@ -93,7 +118,9 @@ Don't print the key used to encrypt the control-plane certificates.
93118
<!--
94119
Upload control-plane certificates to the kubeadm-certs Secret.
95120
-->
121+
<p>
96122
将控制平面证书上传到 kubeadm-certs Secret。
123+
</p>
97124
</td>
98125
</tr>
99126

@@ -120,10 +147,11 @@ Upload control-plane certificates to the kubeadm-certs Secret.
120147
<!--
121148
[EXPERIMENTAL] The path to the 'real' host root filesystem.
122149
-->
150+
<p>
123151
[实验] 到 '真实' 主机根文件系统的路径。
152+
</p>
124153
</td>
125154
</tr>
126155

127156
</tbody>
128157
</table>
129-

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

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
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 conent, 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+
<!--
13+
Manage bootstrap tokens
14+
-->
15+
管理引导令牌
116

217
<!--
318
### Synopsis
@@ -78,7 +93,9 @@ kubeadm token [flags]
7893
<!--
7994
Whether to enable dry-run mode or not
8095
-->
96+
<p>
8197
是否启用 `dry-run` 模式
98+
</p>
8299
</td>
83100
</tr>
84101

@@ -93,7 +110,9 @@ Whether to enable dry-run mode or not
93110
<!--
94111
help for token
95112
-->
113+
<p>
96114
token 操作的帮助命令
115+
</p>
97116
</td>
98117
</tr>
99118

@@ -113,7 +132,9 @@ token 操作的帮助命令
113132
<!--
114133
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.
115134
-->
135+
<p>
116136
与集群通信时使用的 kubeconfig 文件。如果未设置,则搜索一组标准位置以查找现有 kubeconfig 文件。
137+
</p>
117138
</td>
118139
</tr>
119140

@@ -140,10 +161,11 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
140161
<!--
141162
[EXPERIMENTAL] The path to the 'real' host root filesystem.
142163
-->
164+
<p>
143165
[实验] 指向 '真实' 宿主机根文件系统的路径。
166+
</p>
144167
</td>
145168
</tr>
146169

147170
</tbody>
148171
</table>
149-

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

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
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 conent, 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+
<!--
13+
Create bootstrap tokens on the server
14+
-->
15+
在服务器上创建引导令牌
116

217
<!--
318
### Synopsis
@@ -38,6 +53,19 @@ kubeadm token create [token]
3853
</colgroup>
3954
<tbody>
4055

56+
<tr>
57+
<td colspan="2">--certificate-key string</td>
58+
</tr>
59+
<tr>
60+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
61+
<!--
62+
When used together with '--print-join-command', print the full 'kubeadm join' flag needed to join the cluster as a control-plane. To create a new certificate key you must use 'kubeadm init phase upload-certs --upload-certs'.
63+
-->
64+
当与 “--print-join-command” 一起使用时,打印作为控制平面加入集群时所需的所有 “kubeadm join” 标志。
65+
要创建新的证书密钥,你必须使用 “kubeadm init phase upload-certs --upload-certs”。
66+
</p></td>
67+
</tr>
68+
4169
<tr>
4270
<td colspan="2">--config string</td>
4371
</tr>
@@ -46,7 +74,9 @@ kubeadm token create [token]
4674
<!--
4775
Path to a kubeadm configuration file.
4876
-->
77+
<p>
4978
kubeadm 配置文件的路径。
79+
</p>
5080
</td>
5181
</tr>
5282

@@ -58,7 +88,9 @@ kubeadm 配置文件的路径。
5888
<!--
5989
A human friendly description of how this token is used.
6090
-->
91+
<p>
6192
针对令牌用途的人性化的描述。
93+
</p>
6294
</td>
6395
</tr>
6496

@@ -67,15 +99,19 @@ A human friendly description of how this token is used.
6799
<!--
68100
--groups stringSlice&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: [system:bootstrappers:kubeadm:default-node-token]
69101
-->
102+
<p>
70103
--groups stringSlice&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值:[system:bootstrappers:kubeadm:default-node-token]
104+
</p>
71105
</td>
72106
</tr>
73107
<tr>
74108
<td></td><td style="line-height: 130%; word-wrap: break-word;">
75109
<!--
76110
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"
77111
-->
112+
<p>
78113
此令牌用于身份验证时将进行身份验证的其他组。必须匹配 "\\Asystem:bootstrappers:[a-z0-9:-]{0,255}[a-z0-9]\\z"
114+
</p>
79115
</td>
80116
</tr>
81117

@@ -87,7 +123,9 @@ Extra groups that this token will authenticate as when used for authentication.
87123
<!--
88124
help for create
89125
-->
126+
<p>
90127
create 操作的帮助命令
128+
</p>
91129
</td>
92130
</tr>
93131

@@ -99,7 +137,9 @@ create 操作的帮助命令
99137
<!--
100138
Instead of printing only the token, print the full 'kubeadm join' flag needed to join the cluster using the token.
101139
-->
140+
<p>
102141
不仅仅打印令牌,而是打印使用令牌加入集群所需的完整 'kubeadm join' 参数。
142+
</p>
103143
</td>
104144
</tr>
105145

@@ -116,7 +156,9 @@ Instead of printing only the token, print the full 'kubeadm join' flag needed to
116156
<!--
117157
The duration before the token is automatically deleted (e.g. 1s, 2m, 3h). If set to '0', the token will never expire
118158
-->
159+
<p>
119160
令牌有效时间,超过该时间令牌被自动删除。(例如: 1s, 2m, 3h)。如果设置为 '0',令牌将永远不过期。
161+
</p>
120162
</td>
121163
</tr>
122164

@@ -133,7 +175,9 @@ The duration before the token is automatically deleted (e.g. 1s, 2m, 3h). If set
133175
<!--
134176
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]
135177
-->
178+
<p>
136179
描述可以使用此令牌的方式。你可以多次使用 `--usages` 或者提供一个以逗号分隔的选项列表。合法选项有: [signing,authentication]
180+
</p>
137181
</td>
138182
</tr>
139183

@@ -143,7 +187,6 @@ Describes the ways in which this token can be used. You can pass --usages multip
143187
<!--
144188
### Options inherited from parent commands
145189
-->
146-
147190
### 从父命令继承的选项
148191

149192
<table style="width: 100%; table-layout: fixed;">
@@ -161,7 +204,9 @@ Describes the ways in which this token can be used. You can pass --usages multip
161204
<!--
162205
Whether to enable dry-run mode or not
163206
-->
207+
<p>
164208
是否启用 `dry-run` 运行模式
209+
</p>
165210
</td>
166211
</tr>
167212

@@ -178,7 +223,9 @@ Whether to enable dry-run mode or not
178223
<!--
179224
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.
180225
-->
226+
<p>
181227
用于和集群通信的 KubeConfig 文件。如果它没有被设置,那么 kubeadm 将会搜索一个已经存在于标准路径的 KubeConfig 文件。
228+
</p>
182229
</td>
183230
</tr>
184231

@@ -190,7 +237,9 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
190237
<!--
191238
[EXPERIMENTAL] The path to the 'real' host root filesystem.
192239
-->
240+
<p>
193241
[实验] 指向 '真实' 宿主机根文件系统的路径。
242+
</p>
194243
</td>
195244
</tr>
196245

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

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
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 conent, 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+
13+
<!--
14+
Print the version of kubeadm
15+
-->
16+
打印 kubeadm 的版本
17+
118
<!--
219
### Synopsis
320
-->
@@ -7,7 +24,6 @@
724
<!--
825
Print the version of kubeadm
926
-->
10-
1127
打印 kubeadm 的版本
1228

1329
```
@@ -35,7 +51,9 @@ kubeadm version [flags]
3551
<!--
3652
help for version
3753
-->
54+
<p>
3855
version 操作的帮助命令
56+
</p>
3957
</td>
4058
</tr>
4159

@@ -47,7 +65,9 @@ version 操作的帮助命令
4765
<!--
4866
Output format; available options are 'yaml', 'json' and 'short'
4967
-->
68+
<p>
5069
输出格式;可用的选项有 'yaml', 'json' 和 'short'
70+
</p>
5171
</td>
5272
</tr>
5373

@@ -75,7 +95,9 @@ Output format; available options are 'yaml', 'json' and 'short'
7595
<!--
7696
[EXPERIMENTAL] The path to the 'real' host root filesystem.
7797
-->
98+
<p>
7899
[实验] 指向 '真实' 宿主机根文件系统的路径。
100+
</p>
79101
</td>
80102
</tr>
81103

0 commit comments

Comments
 (0)