Skip to content

Commit 9e605fb

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #53312 from my-git9/npe-32000
[zh-cn]sync kubeadm_join_phase_control-plane-join_mark-control-plane kubeadm_upgrade_node_phase_addon_kube-proxy kubeadm_init_phase_control-plane
2 parents afa0436 + a83cbf6 commit 9e605fb

File tree

3 files changed

+57
-47
lines changed

3 files changed

+57
-47
lines changed

‎content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_init/kubeadm_init_phase_control-plane.md‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Generate all static Pod manifest files necessary to establish the control plane
3-
-->
4-
生成建立控制平面所需的静态 Pod 清单文件。
5-
61
<!--
72
### Synopsis
83
-->
@@ -33,7 +28,8 @@ kubeadm init phase control-plane [flags]
3328
<td colspan="2">-h, --help</td>
3429
</tr>
3530
<tr>
36-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
31+
<td></td>
32+
<td style="line-height: 130%; word-wrap: break-word;">
3733
<p>
3834
<!--
3935
help for control-plane
@@ -62,7 +58,8 @@ control-plane 操作的帮助命令。
6258
<td colspan="2">--rootfs string</td>
6359
</tr>
6460
<tr>
65-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
61+
<td></td>
62+
<td style="line-height: 130%; word-wrap: break-word;">
6663
<p>
6764
<!--
6865
[EXPERIMENTAL] The path to the 'real' host root filesystem.

‎content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_join/kubeadm_join_phase_control-plane-join_mark-control-plane.md‎

Lines changed: 36 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Mark a node as a control-plane
3-
-->
4-
将节点标记为控制平面节点。
5-
61
<!--
72
### Synopsis
83
-->
@@ -13,7 +8,7 @@ Mark a node as a control-plane
138
-->
149
将节点标记为控制平面节点。
1510

16-
```
11+
```shell
1712
kubeadm join phase control-plane-join mark-control-plane [flags]
1813
```
1914

@@ -22,7 +17,7 @@ kubeadm join phase control-plane-join mark-control-plane [flags]
2217
-->
2318
### 选项
2419

25-
<table style="width: 100%; table-layout: fixed;">
20+
<table style="width: 100%; table-layout: fixed;">
2621
<colgroup>
2722
<col span="1" style="width: 10px;" />
2823
<col span="1" />
@@ -33,35 +28,42 @@ kubeadm join phase control-plane-join mark-control-plane [flags]
3328
<td colspan="2">--config string</td>
3429
</tr>
3530
<tr>
36-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
31+
<td></td>
32+
<td style="line-height: 130%; word-wrap: break-word;">
33+
<p>
3734
<!--
38-
<p>Path to a kubeadm configuration file.</p>
35+
Path to a kubeadm configuration file.
3936
-->
40-
<p>kubeadm 配置文件的路径。</p>
37+
kubeadm 配置文件的路径。
38+
</p>
4139
</td>
4240
</tr>
4341

4442
<tr>
4543
<td colspan="2">--control-plane</td>
4644
</tr>
4745
<tr>
48-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
46+
<td></td>
47+
<td style="line-height: 130%; word-wrap: break-word;">
48+
<p>
4949
<!--
50-
<p>Create a new control plane instance on this node</p>
50+
Create a new control plane instance on this node
5151
-->
52-
<p>在此节点上创建一个新的控制平面实例。</p>
52+
在此节点上创建一个新的控制平面实例。
53+
</p>
5354
</td>
5455
</tr>
5556

5657
<tr>
5758
<td colspan="2">--dry-run</td>
5859
</tr>
5960
<tr>
60-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
61+
<td></td>
62+
<td style="line-height: 130%; word-wrap: break-word;">
63+
<p>
6164
<!--
6265
Don't apply any changes; just output what would be done.
6366
-->
64-
<p>
6567
不做任何更改；只输出将要执行的操作。
6668
</p>
6769
</td>
@@ -71,23 +73,29 @@ Don't apply any changes; just output what would be done.
7173
<td colspan="2">-h, --help</td>
7274
</tr>
7375
<tr>
74-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
76+
<td></td>
77+
<td style="line-height: 130%; word-wrap: break-word;">
78+
<p>
7579
<!--
76-
<p>help for mark-control-plane</p>
80+
help for mark-control-plane
7781
-->
78-
<p>mark-control-plane 操作的帮助命令。</p>
82+
mark-control-plane 操作的帮助命令。
83+
</p>
7984
</td>
8085
</tr>
8186

8287
<tr>
8388
<td colspan="2">--node-name string</td>
8489
</tr>
8590
<tr>
86-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
91+
<td></td>
92+
<td style="line-height: 130%; word-wrap: break-word;">
93+
<p>
8794
<!--
88-
<p>Specify the node name.</p>
95+
Specify the node name.
8996
-->
90-
<p>指定节点的名称。</p>
97+
指定节点的名称。
98+
</p>
9199
</td>
92100
</tr>
93101

@@ -99,7 +107,7 @@ Don't apply any changes; just output what would be done.
99107
-->
100108
### 从父命令中继承的选项
101109

102-
<table style="width: 100%; table-layout: fixed;">
110+
<table style="width: 100%; table-layout: fixed;">
103111
<colgroup>
104112
<col span="1" style="width: 10px;" />
105113
<col span="1" />
@@ -110,11 +118,14 @@ Don't apply any changes; just output what would be done.
110118
<td colspan="2">--rootfs string</td>
111119
</tr>
112120
<tr>
113-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
121+
<td></td>
122+
<td style="line-height: 130%; word-wrap: break-word;">
123+
<p>
114124
<!--
115-
<p>[EXPERIMENTAL] The path to the 'real' host root filesystem.</p>
125+
[EXPERIMENTAL] The path to the 'real' host root filesystem.
116126
-->
117-
<p>[实验] 到 '真实' 主机根文件系统的路径。</p>
127+
[实验] 到 '真实' 主机根文件系统的路径。
128+
</p>
118129
</td>
119130
</tr>
120131

‎content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade/kubeadm_upgrade_node_phase_addon_kube-proxy.md‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Upgrade the kube-proxy addon
3-
-->
4-
升级 kube-proxy 插件
5-
61
<!--
72
### Synopsis
83
-->
@@ -11,7 +6,7 @@ Upgrade the kube-proxy addon
116
<!--
127
Upgrade the kube-proxy addon
138
-->
14-
升级 kube-proxy 插件
9+
升级 kube-proxy 插件。
1510

1611
```shell
1712
kubeadm upgrade node phase addon kube-proxy [flags]
@@ -33,11 +28,12 @@ kubeadm upgrade node phase addon kube-proxy [flags]
3328
<td colspan="2">--config string</td>
3429
</tr>
3530
<tr>
36-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
31+
<td></td>
32+
<td style="line-height: 130%; word-wrap: break-word;">
33+
<p>
3734
<!--
3835
Path to a kubeadm configuration file.
3936
-->
40-
<p>
4137
kubeadm 配置文件的路径。
4238
</p>
4339
</td>
@@ -47,7 +43,8 @@ kubeadm 配置文件的路径。
4743
<td colspan="2">--dry-run</td>
4844
</tr>
4945
<tr>
50-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
46+
<td></td>
47+
<td style="line-height: 130%; word-wrap: break-word;">
5148
<p>
5249
<!--
5350
Do not change any state, just output the actions that would be performed.
@@ -61,11 +58,12 @@ Do not change any state, just output the actions that would be performed.
6158
<td colspan="2">-h, --help</td>
6259
</tr>
6360
<tr>
64-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
61+
<td></td>
62+
<td style="line-height: 130%; word-wrap: break-word;">
63+
<p>
6564
<!--
6665
help for kube-proxy
6766
-->
68-
<p>
6967
kube-proxy 操作的帮助命令。
7068
</p>
7169
</td>
@@ -76,16 +74,18 @@ kube-proxy 操作的帮助命令。
7674
<!--
7775
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"
7876
-->
79-
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: "/etc/kubernetes/admin.conf"
77+
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值："/etc/kubernetes/admin.conf"
8078
</td>
8179
</tr>
8280
<tr>
83-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
81+
<td></td>
82+
<td style="line-height: 130%; word-wrap: break-word;">
8483
<p>
8584
<!--
8685
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.
8786
-->
88-
用于和集群通信的 KubeConfig 文件。如果它没有被设置，那么 kubeadm 将会搜索一个已经存在于标准路径的 KubeConfig 文件。
87+
用于和集群通信的 KubeConfig 文件。如果它没有被设置，那么 kubeadm
88+
将会搜索一个已经存在于标准路径的 KubeConfig 文件。
8989
</p>
9090
</td>
9191
</tr>
@@ -109,7 +109,9 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
109109
<td colspan="2">--rootfs string</td>
110110
</tr>
111111
<tr>
112-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
112+
<td></td>
113+
<td style="line-height: 130%; word-wrap: break-word;">
114+
<p>
113115
<!--
114116
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
115117
-->

0 commit comments

Comments
 (0)