Skip to content

Commit 98e598b

Browse files
authored
Merge pull request #53005 from my-git9/npe-20026
[zh-cn]sync kubeadm_upgrade_apply_phase_addon_{coredns,kube-proxy}
2 parents 4abbadb + 23bd274 commit 98e598b

File tree

2 files changed

+63
-37
lines changed

2 files changed

+63
-37
lines changed

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

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
<!--
2-
Upgrade the CoreDNS addon
3-
-->
4-
升级 CoreDNS 插件
5-
61
<!--
72
### Synopsis
83
94
Upgrade the CoreDNS addon
105
-->
116
### 概要
127

13-
升级 CoreDNS 插件
8+
升级 CoreDNS 插件
149

1510
```shell
1611
kubeadm upgrade apply phase addon coredns [flags]
@@ -21,7 +16,7 @@ kubeadm upgrade apply phase addon coredns [flags]
2116
-->
2217
### 选项
2318

24-
<table style="width: 100%; table-layout: fixed;">
19+
<table style="width: 100%; table-layout: fixed;">
2520
<colgroup>
2621
<col span="1" style="width: 10px;" />
2722
<col span="1" />
@@ -32,68 +27,89 @@ kubeadm upgrade apply phase addon coredns [flags]
3227
<td colspan="2">--config string</td>
3328
</tr>
3429
<tr>
35-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
30+
<td>
31+
</td>
32+
<td style="line-height: 130%; word-wrap: break-word;">
33+
<p>
3634
<!--
3735
Path to a kubeadm configuration file.
3836
-->
3937
kubeadm 配置文件的路径。
40-
</p></td>
38+
</p>
39+
</td>
4140
</tr>
4241

4342
<tr>
4443
<td colspan="2">--dry-run</td>
4544
</tr>
4645
<tr>
47-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
46+
<td>
47+
</td>
48+
<td style="line-height: 130%; word-wrap: break-word;">
49+
<p>
4850
<!--
4951
Do not change any state, just output what actions would be performed.
5052
-->
5153
不更改任何状态,只输出要执行的操作。
52-
</p></td>
54+
</p>
55+
</td>
5356
</tr>
5457

5558
<tr>
5659
<td colspan="2">-h, --help</td>
5760
</tr>
5861
<tr>
59-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
62+
<td>
63+
</td>
64+
<td style="line-height: 130%; word-wrap: break-word;">
65+
<p>
6066
<!--
6167
help for coredns
6268
-->
6369
coredns 操作的帮助命令。
64-
</p></td>
70+
</p>
71+
</td>
6572
</tr>
6673

6774
<tr>
68-
<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: "/etc/kubernetes/admin.conf"</td>
75+
<td colspan="2">--kubeconfig string&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<!--Default: "/etc/kubernetes/admin.conf"-->默认值:"/etc/kubernetes/admin.conf"</td>
6976
</tr>
7077
<tr>
71-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
78+
<td>
79+
</td>
80+
<td style="line-height: 130%; word-wrap: break-word;">
81+
<p>
7282
<!--
7383
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.
7484
-->
7585
用于和集群通信的 KubeConfig 文件。如果它没有被设置,
7686
那么 kubeadm 将会搜索一个已经存在于标准路径的 KubeConfig 文件。
77-
</p></td>
87+
</p>
88+
</td>
7889
</tr>
7990

8091
<tr>
8192
<td colspan="2">--patches string</td>
8293
</tr>
8394
<tr>
84-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
95+
<td>
96+
</td>
97+
<td style="line-height: 130%; word-wrap: break-word;">
98+
<p>
8599
<!--
86100
Path to a directory that contains files named &quot;target[suffix][+patchtype].extension&quot;. For example, &quot;kube-apiserver0+merge.yaml&quot; or just &quot;etcd.json&quot;. &quot;target&quot; can be one of &quot;kube-apiserver&quot;, &quot;kube-controller-manager&quot;, &quot;kube-scheduler&quot;, &quot;etcd&quot;, &quot;kubeletconfiguration&quot;. &quot;patchtype&quot; can be one of &quot;strategic&quot;, &quot;merge&quot; or &quot;json&quot; and they match the patch formats supported by kubectl. The default &quot;patchtype&quot; is &quot;strategic&quot;. &quot;extension&quot; must be either &quot;json&quot; or &quot;yaml&quot;. &quot;suffix&quot; is an optional string that can be used to determine which patches are applied first alpha-numerically.
87101
-->
88102
包含名为 &quot;target[suffix][+patchtype].extension&quot; 的文件的目录的路径。
89103
例如,&quot;kube-apiserver0+merge.yaml&quot;或是简单的 &quot;etcd.json&quot;
90-
&quot;target&quot; 可以是 &quot;kube-apiserver&quot;&quot;kube-controller-manager&quot;&quot;kube-scheduler&quot;&quot;etcd&quot;&quot;kubeletconfiguration&quot; 之一。
104+
&quot;target&quot; 可以是 &quot;kube-apiserver&quot;&quot;kube-controller-manager&quot;&quot;kube-scheduler&quot;
105+
&quot;etcd&quot;&quot;kubeletconfiguration&quot; 之一。
91106
&quot;patchtype&quot; 可以是 &quot;strategic&quot;&quot;merge&quot; 或者 &quot;json&quot; 之一,
92107
并且它们与 kubectl 支持的补丁格式相同。
93108
默认的 &quot;patchtype&quot;&quot;strategic&quot;
94109
&quot;extension&quot; 必须是 &quot;json&quot;&quot;yaml&quot;
95110
&quot;suffix&quot; 是一个可选字符串,可用于确定首先按字母顺序应用哪些补丁。
96-
</p></td>
111+
</p>
112+
</td>
97113
</tr>
98114

99115
</tbody>
@@ -104,7 +120,7 @@ Path to a directory that contains files named &quot;target[suffix][+patchtype].e
104120
-->
105121
### 从父命令继承的选项
106122

107-
<table style="width: 100%; table-layout: fixed;">
123+
<table style="width: 100%; table-layout: fixed;">
108124
<colgroup>
109125
<col span="1" style="width: 10px;" />
110126
<col span="1" />
@@ -115,12 +131,16 @@ Path to a directory that contains files named &quot;target[suffix][+patchtype].e
115131
<td colspan="2">--rootfs string</td>
116132
</tr>
117133
<tr>
118-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
134+
<td>
135+
</td>
136+
<td style="line-height: 130%; word-wrap: break-word;">
137+
<p>
119138
<!--
120139
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
121140
-->
122141
“真实”主机根文件系统的路径。设置此参数将导致 kubeadm 切换到所提供的路径。
123-
</p></td>
142+
</p>
143+
</td>
124144
</tr>
125145

126146
</tbody>

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

Lines changed: 21 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 apply phase addon kube-proxy [flags]
@@ -33,22 +28,25 @@ kubeadm upgrade apply 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>
32+
</td>
33+
<td style="line-height: 130%; word-wrap: break-word;">
34+
<p>
3735
<!--
3836
Path to a kubeadm configuration file.
3937
-->
40-
<p>
4138
kubeadm 配置文件的路径。
4239
</p>
4340
</td>
4441
</tr>
4542

46-
4743
<tr>
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>
@@ -81,12 +81,15 @@ all 操作的帮助命令。
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,10 @@ 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>
117+
</td>
118+
<td style="line-height: 130%; word-wrap: break-word;">
119+
<p>
114120
<!--
115121
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
116122
-->

0 commit comments

Comments
 (0)