Skip to content

Commit 6833e0e

Browse files
authored
Merge pull request #52945 from my-git9/npe-13238
[zh-cn]sync kubeadm_reset/*
2 parents dac8366 + 4776359 commit 6833e0e

File tree

5 files changed

+50
-52
lines changed

5 files changed

+50
-52
lines changed

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

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Performs a best effort revert of changes made to this host by 'kubeadm init' or 'kubeadm join'
3-
-->
4-
尽最大努力还原通过 'kubeadm init' 或者 'kubeadm join' 操作对主机所作的更改。
5-
61
<!--
72
### Synopsis
83
-->
@@ -25,13 +20,13 @@ remove-etcd-member Remove a local etcd member.
2520
cleanup-node Run cleanup node.
2621
```
2722
-->
28-
```
23+
```shell
2924
preflight 重置预检
3025
remove-etcd-member 移除本地 etcd 成员
3126
cleanup-node 清理节点
3227
```
3328

34-
```
29+
```shell
3530
kubeadm reset [flags]
3631
```
3732

@@ -56,7 +51,8 @@ kubeadm reset [flags]
5651
</td>
5752
</tr>
5853
<tr>
59-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
54+
<td></td>
55+
<td style="line-height: 130%; word-wrap: break-word;">
6056
<p>
6157
<!--
6258
The path to the directory where the certificates are stored. If specified, clean this directory.
@@ -86,7 +82,8 @@ Cleanup the &quot;/etc/kubernetes/tmp&quot; directory
8682
<td colspan="2">--config string</td>
8783
</tr>
8884
<tr>
89-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
85+
<td></td>
86+
<td style="line-height: 130%; word-wrap: break-word;">
9087
<p>
9188
<!--
9289
Path to a kubeadm configuration file.
@@ -100,7 +97,8 @@ kubeadm 配置文件的路径。
10097
<td colspan="2">--cri-socket string</td>
10198
</tr>
10299
<tr>
103-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
100+
<td></td>
101+
<td style="line-height: 130%; word-wrap: break-word;"><p>
104102
<!--
105103
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.
106104
-->
@@ -114,7 +112,8 @@ Path to the CRI socket to connect. If empty kubeadm will try to auto-detect this
114112
<td colspan="2">--dry-run</td>
115113
</tr>
116114
<tr>
117-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
115+
<td></td>
116+
<td style="line-height: 130%; word-wrap: break-word;">
118117
<p>
119118
<!--
120119
Don't apply any changes; just output what would be done.
@@ -128,7 +127,8 @@ Don't apply any changes; just output what would be done.
128127
<td colspan="2">-f, --force</td>
129128
</tr>
130129
<tr>
131-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
130+
<td></td>
131+
<td style="line-height: 130%; word-wrap: break-word;">
132132
<p>
133133
<!--
134134
Reset the node without prompting for confirmation.
@@ -142,7 +142,8 @@ Reset the node without prompting for confirmation.
142142
<td colspan="2">-h, --help</td>
143143
</tr>
144144
<tr>
145-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
145+
<td></td>
146+
<td style="line-height: 130%; word-wrap: break-word;">
146147
<p>
147148
<!--
148149
help for reset
@@ -156,12 +157,14 @@ reset 操作的帮助命令。
156157
<td colspan="2">--ignore-preflight-errors strings</td>
157158
</tr>
158159
<tr>
159-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
160+
<td></td>
161+
<td style="line-height: 130%; word-wrap: break-word;">
160162
<p>
161163
<!--
162164
A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.
163165
-->
164-
错误将显示为警告的检查列表;例如:'IsPrivilegedUser,Swap'。取值为 'all' 时将忽略检查中的所有错误。
166+
错误将显示为警告的检查列表;例如:'IsPrivilegedUser,Swap'。
167+
取值为 'all' 时将忽略检查中的所有错误。
165168
</p>
166169
</td>
167170
</tr>
@@ -177,12 +180,14 @@ A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedU
177180
</td>
178181
</tr>
179182
<tr>
180-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
183+
<td></td>
184+
<td style="line-height: 130%; word-wrap: break-word;">
181185
<p>
182186
<!--
183187
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.
184188
-->
185-
与集群通信时使用的 kubeconfig 文件。如果未设置该标志,则可以在一组标准位置中搜索现有的 kubeconfig 文件。
189+
与集群通信时使用的 kubeconfig 文件。如果未设置该标志,
190+
则可以在一组标准位置中搜索现有的 kubeconfig 文件。
186191
</p>
187192
</td>
188193
</tr>
@@ -191,7 +196,8 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
191196
<td colspan="2">--skip-phases strings</td>
192197
</tr>
193198
<tr>
194-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
199+
<td></td>
200+
<td style="line-height: 130%; word-wrap: break-word;">
195201
<p>
196202
<!--
197203
List of phases to be skipped
@@ -220,7 +226,8 @@ List of phases to be skipped
220226
<td colspan="2">--rootfs string</td>
221227
</tr>
222228
<tr>
223-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
229+
<td></td>
230+
<td style="line-height: 130%; word-wrap: break-word;">
224231
<p>
225232
<!--
226233
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Use this command to invoke single phase of the "reset" workflow
3-
-->
4-
使用此命令来调用 `reset` 工作流程的某个阶段。
5-
61
<!--
72
### Synopsis
83
-->

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Run cleanup node.
3-
-->
4-
执行 cleanup node(清理节点)操作。
5-
61
<!--
72
### Synopsis
83
-->
@@ -13,7 +8,7 @@ Run cleanup node.
138
-->
149
执行 cleanup node(清理节点)操作。
1510

16-
```
11+
```shell
1712
kubeadm reset phase cleanup-node [flags]
1813
```
1914

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Run reset pre-flight checks
3-
-->
4-
kubeadm reset(重置)前运行启动前检查。
5-
61
<!--
72
### Synopsis
83
-->
@@ -14,7 +9,7 @@ Run pre-flight checks for kubeadm reset.
149
-->
1510
kubeadm reset(重置)前运行启动前检查。
1611

17-
```
12+
```shell
1813
kubeadm reset phase preflight [flags]
1914
```
2015

@@ -49,10 +44,12 @@ Don't apply any changes; just output what would be done.
4944
</tr>
5045
<tr>
5146
<td></td><td style="line-height: 130%; word-wrap: break-word;">
47+
<p>
5248
<!--
53-
<p>Reset the node without prompting for confirmation.</p>
49+
Reset the node without prompting for confirmation.
5450
-->
55-
<p>在不提示确认的情况下重置节点。</p>
51+
在不提示确认的情况下重置节点。
52+
</p>
5653
</td>
5754
</tr>
5855

@@ -61,10 +58,12 @@ Don't apply any changes; just output what would be done.
6158
</tr>
6259
<tr>
6360
<td></td><td style="line-height: 130%; word-wrap: break-word;">
61+
<p>
6462
<!--
65-
<p>help for preflight</p>
63+
help for preflight
6664
-->
67-
<p>preflight 操作的帮助命令。</p>
65+
preflight 操作的帮助命令。
66+
</p>
6867
</td>
6968
</tr>
7069

@@ -73,10 +72,13 @@ Don't apply any changes; just output what would be done.
7372
</tr>
7473
<tr>
7574
<td></td><td style="line-height: 130%; word-wrap: break-word;">
75+
<p>
7676
<!--
77-
<p>A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.</p>
77+
A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.
7878
-->
79-
<p>错误将显示为警告的检查列表;例如:'IsPrivilegedUser,Swap'。取值为 'all' 时将忽略检查中的所有错误。</p>
79+
错误将显示为警告的检查列表;例如:'IsPrivilegedUser,Swap'。
80+
取值为 'all' 时将忽略检查中的所有错误。
81+
</p>
8082
</td>
8183
</tr>
8284

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_reset/kubeadm_reset_phase_remove-etcd-member.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Remove a local etcd member.
3-
-->
4-
移除本地 etcd 成员。
5-
61
<!--
72
### Synopsis
83
-->
@@ -13,7 +8,7 @@ Remove a local etcd member for a control plane node.
138
-->
149
移除控制平面节点的本地 etcd 成员。
1510

16-
```
11+
```shell
1712
kubeadm reset phase remove-etcd-member [flags]
1813
```
1914

@@ -33,12 +28,14 @@ kubeadm reset phase remove-etcd-member [flags]
3328
<td colspan="2">--dry-run</td>
3429
</tr>
3530
<tr>
36-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
31+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
32+
<p>
3733
<!--
3834
Don't apply any changes; just output what would be done.
3935
-->
4036
不做任何更改;只输出将要执行的操作。
41-
</p></td>
37+
</p>
38+
</td>
4239
</tr>
4340

4441
<tr>
@@ -51,7 +48,8 @@ Don't apply any changes; just output what would be done.
5148
help for remove-etcd-member
5249
-->
5350
remove-etcd-member 操作的帮助命令。
54-
</p></td>
51+
</p>
52+
</td>
5553
</tr>
5654

5755
<tr>
@@ -63,7 +61,8 @@ remove-etcd-member 操作的帮助命令。
6361
<!--
6462
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.
6563
-->
66-
与集群通信时使用的 kubeconfig 文件。如果未设置该标志,则可以在默认位置中查找现有的 kubeconfig 文件。
64+
与集群通信时使用的 kubeconfig 文件。如果未设置该标志,
65+
则可以在默认位置中查找现有的 kubeconfig 文件。
6766
</p>
6867
</td>
6968
</tr>

0 commit comments

Comments
 (0)