Skip to content

Commit e8d71e4

Browse files
authored
Merge pull request #33656 from kinzhi/kinzhi108
[zh]Sync kubeadm-9
2 parents 16e11b2 + ef88442 commit e8d71e4

File tree

8 files changed

+96
-36
lines changed

8 files changed

+96
-36
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,3 @@ kubeadm config print join-defaults [flags]
7979

8080
</tbody>
8181
</table>
82-
83-
84-

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,3 @@ kubeadm init phase addon [flags]
6060

6161
</tbody>
6262
</table>
63-
64-
65-

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,3 @@ kubeadm init phase kubelet-finalize all [flags]
8181

8282
</tbody>
8383
</table>
84-
85-
86-

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,3 @@ kubeadm reset [flags]
117117

118118
</tbody>
119119
</table>
120-
121-
122-

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

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
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 default join configuration, that can be used for 'kubeadm join'
15+
-->
16+
打印默认的节点添加配置,该配置可用于 'kubeadm join' 命令
117

218
<!--
319
### Synopsis
@@ -12,12 +28,12 @@ This command prints objects such as the default join configuration that is used
1228
此命令打印对象,例如用于 'kubeadm join' 的默认 join 配置对象。
1329

1430
<!--
15-
Note that sensitive values like the Bootstrap Token fields are replaced with placeholder values like {"abcdef.0123456789abcdef" "" "nil" &lt;nil&gt; [] []} in order to pass validation but
31+
Note that sensitive values like the Bootstrap Token fields are replaced with placeholder values like "abcdef.0123456789abcdef" in order to pass validation but
1632
not perform the real computation for creating a token.
1733
-->
1834

19-
请注意,诸如启动引导令牌字段之类的敏感值已替换为 {"abcdef.0123456789abcdef" "" "nil" &lt;nil&gt; [] []}
20-
之类的占位符值以通过验证,但不执行创建令牌的实际计算。
35+
请注意,诸如启动引导令牌字段之类的敏感值已替换为 "abcdef.0123456789abcdef" 之类的占位符值以通过验证,
36+
但不执行创建令牌的实际计算。
2137

2238
```
2339
kubeadm config print join-defaults [flags]
@@ -37,14 +53,16 @@ kubeadm config print join-defaults [flags]
3753
<tbody>
3854

3955
<tr>
40-
<td colspan="2">--component-configs stringSlice</td>
56+
<td colspan="2">--component-configs strings/td>
4157
</tr>
4258
<tr>
4359
<td></td><td style="line-height: 130%; word-wrap: break-word;">
4460
<!--
4561
A comma-separated list for component config API objects to print the default values for. Available values: [KubeProxyConfiguration KubeletConfiguration]. If this flag is not set, no component configs will be printed.
4662
-->
63+
<p>
4764
组件配置 API 对象的逗号分隔列表,打印其默认值。可用值:[KubeProxyConfiguration KubeletConfiguration]。如果未设置此参数,则不会打印任何组件配置。
65+
</p>
4866
</td>
4967
</tr>
5068

@@ -56,7 +74,9 @@ A comma-separated list for component config API objects to print the default val
5674
<!--
5775
help for join-defaults
5876
-->
77+
<p>
5978
join-defaults 操作的帮助命令
79+
</p>
6080
</td>
6181
</tr>
6282

@@ -89,7 +109,9 @@ join-defaults 操作的帮助命令
89109
<!--
90110
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.
91111
-->
112+
<p>
92113
与集群通信时使用的 kubeconfig 文件。如果未设置该参数,则可以在一组标准位置中搜索现有的 kubeconfig 文件。
114+
</p>
93115
</td>
94116
</tr>
95117

@@ -101,7 +123,9 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
101123
<!--
102124
[EXPERIMENTAL] The path to the 'real' host root filesystem.
103125
-->
126+
<p>
104127
[实验] 到 '真实' 主机根文件系统的路径。
128+
</p>
105129
</td>
106130
</tr>
107131

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

Lines changed: 19 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+
Install required addons for passing conformance tests
14+
-->
15+
安装必要的插件以通过一致性测试
116

217
<!--
318
### Synopsis
@@ -36,7 +51,9 @@ kubeadm init phase addon [flags]
3651
<!--
3752
help for addon
3853
-->
54+
<p>
3955
addon 操作的帮助命令
56+
</p>
4057
</td>
4158
</tr>
4259

@@ -64,10 +81,11 @@ addon 操作的帮助命令
6481
<!--
6582
[EXPERIMENTAL] The path to the 'real' host root filesystem.
6683
-->
84+
<p>
6785
[实验] 到 '真实' 主机根文件系统的路径。
86+
</p>
6887
</td>
6988
</tr>
7089

7190
</tbody>
7291
</table>
73-

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

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
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+
Run all kubelet-finalize phases
14+
-->
15+
运行 kubelet-finalize 的所有阶段
116

217
<!-- ### Synopsis -->
318
### 概要
419

520

6-
<!-- Run all kubelet-finalize phases -->
7-
运行所有 kubelet-finalize 阶段
21+
<!--
22+
Run all kubelet-finalize phases
23+
-->
24+
运行 kubelet-finalize 的所有阶段
825

926
```
1027
kubeadm init phase kubelet-finalize all [flags]
@@ -40,23 +57,23 @@ kubeadm init phase kubelet-finalize all [flags]
4057
</tr>
4158
<tr>
4259
<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;">The path where to save and store the certificates.</td> -->
43-
<td></td><td style="line-height: 130%; word-wrap: break-word;">保存和存储证书的路径。</td>
60+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>保存和存储证书的路径。</p></td>
4461
</tr>
4562

4663
<tr>
4764
<td colspan="2">--config string</td>
4865
</tr>
4966
<tr>
5067
<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;">Path to a kubeadm configuration file.</td> -->
51-
<td></td><td style="line-height: 130%; word-wrap: break-word;">kubeadm 配置文件的路径。</td>
68+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>kubeadm 配置文件的路径。</p></td>
5269
</tr>
5370

5471
<tr>
5572
<td colspan="2">-h, --help</td>
5673
</tr>
5774
<tr>
5875
<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;">help for all</td> -->
59-
<td></td><td style="line-height: 130%; word-wrap: break-word;">all 操作的帮助命令</td>
76+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>all 操作的帮助命令</p></td>
6077
</tr>
6178

6279
</tbody>
@@ -79,11 +96,8 @@ kubeadm init phase kubelet-finalize all [flags]
7996
</tr>
8097
<tr>
8198
<!-- <td></td><td style="line-height: 130%; word-wrap: break-word;">[EXPERIMENTAL] The path to the 'real' host root filesystem.</td> -->
82-
<td></td><td style="line-height: 130%; word-wrap: break-word;">[实验] 到'真实'主机根文件系统的路径。</td>
99+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>[实验] 到'真实'主机根文件系统的路径。</p></td>
83100
</tr>
84101

85102
</tbody>
86103
</table>
87-
88-
89-

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

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
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+
Performs a best effort revert of changes made to this host by 'kubeadm init' or 'kubeadm join'
14+
-->
15+
尽最大努力还原通过 'kubeadm init' 或者 'kubeadm join' 操作对主机所作的更改
16+
117
<!--
218
### Synopsis
319
-->
@@ -7,8 +23,7 @@
723
<!--
824
Performs a best effort revert of changes made to this host by 'kubeadm init' or 'kubeadm join'
925
-->
10-
11-
尽最大努力还原通过 'kubeadm init' 或者 'kubeadm join' 操作对主机所做的更改
26+
尽最大努力还原通过 'kubeadm init' 或者 'kubeadm join' 操作对主机所作的更改
1227

1328
<!--
1429
The "reset" command executes the following phases:
@@ -53,7 +68,9 @@ kubeadm reset [flags]
5368
<!--
5469
The path to the directory where the certificates are stored. If specified, clean this directory.
5570
-->
71+
<p>
5672
存储证书的目录路径。如果已指定,则需要清空此目录。
73+
</p>
5774
</td>
5875
</tr>
5976

@@ -99,7 +116,7 @@ Don't apply any changes; just output what would be done.
99116
Reset the node without prompting for confirmation.
100117
-->
101118
在不提示确认的情况下重置节点。
102-
<p>
119+
</p>
103120
</td>
104121
</tr>
105122

@@ -113,7 +130,7 @@ Reset the node without prompting for confirmation.
113130
help for reset
114131
-->
115132
reset 操作的帮助命令
116-
<p>
133+
</p>
117134
</td>
118135
</tr>
119136

@@ -127,7 +144,7 @@ reset 操作的帮助命令
127144
A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.
128145
-->
129146
错误将显示为警告的检查列表;例如:'IsPrivilegedUser,Swap'。取值为 'all' 时将忽略检查中的所有错误。
130-
<p>
147+
</p>
131148
</td>
132149
</tr>
133150

@@ -138,7 +155,7 @@ A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedU
138155
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"
139156
-->
140157
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值:"/etc/kubernetes/admin.conf"
141-
<p>
158+
</p>
142159
</td>
143160
</tr>
144161
<tr>
@@ -148,7 +165,7 @@ A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedU
148165
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.
149166
-->
150167
与集群通信时使用的 kubeconfig 文件。如果未设置该标志,则可以在一组标准位置中搜索现有的 kubeconfig 文件。
151-
<p>
168+
</p>
152169
</td>
153170
</tr>
154171

@@ -160,7 +177,7 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
160177
<p>
161178
<!-- List of phases to be skipped -->
162179
要跳过的阶段列表
163-
<p>
180+
</p>
164181
</td>
165182
</tr>
166183

@@ -192,10 +209,9 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
192209
[EXPERIMENTAL] The path to the 'real' host root filesystem.
193210
-->
194211
[实验] 指向 '真实' 宿主机根文件系统的路径。
195-
<p>
212+
</p>
196213
</td>
197214
</tr>
198215

199216
</tbody>
200217
</table>
201-

0 commit comments

Comments
 (0)