Skip to content

Commit 4abbadb

Browse files
authored
Merge pull request #53011 from my-git9/npe-26146
[zh-cn]sync kubeadm_upgrade_apply_phase_upload-config_{all,kubeadm,kubelet}
2 parents 3b4d3a0 + d1f1c6b commit 4abbadb

File tree

3 files changed

+54
-46
lines changed

3 files changed

+54
-46
lines changed

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade/kubeadm_upgrade_apply_phase_upload-config_all.md

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Upload all the configurations to ConfigMaps
3-
-->
4-
将所有配置上传到 ConfigMap
5-
61
<!--
72
### Synopsis
83
-->
@@ -11,7 +6,7 @@ Upload all the configurations to ConfigMaps
116
<!--
127
Upload all the configurations to ConfigMaps
138
-->
14-
将所有配置上传到 ConfigMap
9+
将所有配置上传到 ConfigMap
1510

1611
```shell
1712
kubeadm upgrade apply phase upload-config all [flags]
@@ -29,16 +24,17 @@ kubeadm upgrade apply phase upload-config all [flags]
2924
</colgroup>
3025
<tbody>
3126

32-
3327
<tr>
3428
<td colspan="2">--config string</td>
3529
</tr>
3630
<tr>
37-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
31+
<td>
32+
</td>
33+
<td style="line-height: 130%; word-wrap: break-word;">
34+
<p>
3835
<!--
3936
Path to a kubeadm configuration file.
4037
-->
41-
<p>
4238
kubeadm 配置文件的路径。
4339
</p>
4440
</td>
@@ -48,7 +44,9 @@ kubeadm 配置文件的路径。
4844
<td colspan="2">--dry-run</td>
4945
</tr>
5046
<tr>
51-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
47+
<td>
48+
</td>
49+
<td style="line-height: 130%; word-wrap: break-word;">
5250
<p>
5351
<!--
5452
Do not change any state, just output the actions that would be performed.
@@ -62,11 +60,13 @@ Do not change any state, just output the actions that would be performed.
6260
<td colspan="2">-h, --help</td>
6361
</tr>
6462
<tr>
65-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
63+
<td>
64+
</td>
65+
<td style="line-height: 130%; word-wrap: break-word;">
66+
<p>
6667
<!--
6768
help for all
6869
-->
69-
<p>
7070
all 操作的帮助命令。
7171
</p>
7272
</td>
@@ -77,16 +77,19 @@ all 操作的帮助命令。
7777
<!--
7878
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"
7979
-->
80-
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: "/etc/kubernetes/admin.conf"
80+
--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值"/etc/kubernetes/admin.conf"
8181
</td>
8282
</tr>
8383
<tr>
84-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
84+
<td>
85+
</td>
86+
<td style="line-height: 130%; word-wrap: break-word;">
8587
<p>
8688
<!--
8789
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.
8890
-->
89-
用于和集群通信的 KubeConfig 文件。如果它没有被设置,那么 kubeadm 将会搜索一个已经存在于标准路径的 KubeConfig 文件。
91+
用于和集群通信的 KubeConfig 文件。如果它没有被设置,那么 kubeadm
92+
将会搜索一个已经存在于标准路径的 KubeConfig 文件。
9093
</p>
9194
</td>
9295
</tr>
@@ -110,7 +113,9 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
110113
<td colspan="2">--rootfs string</td>
111114
</tr>
112115
<tr>
113-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
116+
<td></td>
117+
<td style="line-height: 130%; word-wrap: break-word;">
118+
<p>
114119
<!--
115120
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
116121
-->

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade/kubeadm_upgrade_apply_phase_upload-config_kubeadm.md

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Upload the kubeadm ClusterConfiguration to a ConfigMap
3-
-->
4-
将 kubeadm ClusterConfiguration 上传到 ConfigMap
5-
61
<!--
72
### Synopsis
83
-->
@@ -11,7 +6,7 @@ Upload the kubeadm ClusterConfiguration to a ConfigMap
116
<!--
127
Upload the kubeadm ClusterConfiguration to a ConfigMap
138
-->
14-
将 kubeadm ClusterConfiguration 上传到 ConfigMap
9+
将 kubeadm ClusterConfiguration 上传到 ConfigMap
1510

1611
```shell
1712
kubeadm upgrade apply phase upload-config kubeadm [flags]
@@ -33,11 +28,12 @@ kubeadm upgrade apply phase upload-config kubeadm [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 kubeadm
6766
-->
68-
<p>
6967
kubeadm 操作的帮助命令。
7068
</p>
7169
</td>
@@ -76,16 +74,18 @@ kubeadm 操作的帮助命令。
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
-->

content/zh-cn/docs/reference/setup-tools/kubeadm/generated/kubeadm_upgrade/kubeadm_upgrade_apply_phase_upload-config_kubelet.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Upload the kubelet configuration to a ConfigMap
3-
-->
4-
将 kubelet 配置上传到 ConfigMap
5-
61
<!--
72
### Synopsis
83
-->
@@ -11,7 +6,7 @@ Upload the kubelet configuration to a ConfigMap
116
<!--
127
Upload the kubelet configuration to a ConfigMap
138
-->
14-
将 kubelet 配置上传到 ConfigMap
9+
将 kubelet 配置上传到 ConfigMap
1510

1611
```shell
1712
kubeadm upgrade apply phase upload-config kubelet [flags]
@@ -33,11 +28,12 @@ kubeadm upgrade apply phase upload-config kubelet [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 kubelet
6766
-->
68-
<p>
6967
kubelet 操作的帮助命令。
7068
</p>
7169
</td>
@@ -76,16 +74,18 @@ kubelet 操作的帮助命令。
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,8 @@ 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;"><p>
113114
<!--
114115
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
115116
-->

0 commit comments

Comments
 (0)