Skip to content

Commit 5b7c313

Browse files
committed
[zh-cn]sync kubeadm_upgrade_apply
Signed-off-by: xin.li <[email protected]>
1 parent 9560332 commit 5b7c313

File tree

2 files changed

+60
-42
lines changed

2 files changed

+60
-42
lines changed

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

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Upgrade your Kubernetes cluster to the specified version
3-
-->
4-
将 Kubernetes 集群升级到指定版本。
5-
61
<!--
72
### Synopsis
83
-->
@@ -65,12 +60,14 @@ post-upgrade 运行升级后的任务
6560
<td colspan="2">--allow-experimental-upgrades</td>
6661
</tr>
6762
<tr>
68-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
63+
<td></td>
64+
<td style="line-height: 130%; word-wrap: break-word;">
6965
<p>
7066
<!--
7167
Show unstable versions of Kubernetes as an upgrade alternative and allow upgrading to an alpha/beta/release candidate versions of Kubernetes.
7268
-->
73-
显示 Kubernetes 的不稳定版本作为升级替代方案,并允许升级到 Kubernetes 的 Alpha、Beta 或 RC 版本。
69+
显示 Kubernetes 的不稳定版本作为升级替代方案,并允许升级到 Kubernetes
70+
的 Alpha、Beta 或 RC 版本。
7471
</p>
7572
</td>
7673
</tr>
@@ -79,7 +76,8 @@ Show unstable versions of Kubernetes as an upgrade alternative and allow upgradi
7976
<td colspan="2">--allow-release-candidate-upgrades</td>
8077
</tr>
8178
<tr>
82-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
79+
<td></td>
80+
<td style="line-height: 130%; word-wrap: break-word;">
8381
<p>
8482
<!--
8583
Show release candidate versions of Kubernetes as an upgrade alternative and allow upgrading to a release candidate versions of Kubernetes.
@@ -93,7 +91,8 @@ Show release candidate versions of Kubernetes as an upgrade alternative and allo
9391
<td colspan="2">--certificate-renewal&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: true</td>
9492
</tr>
9593
<tr>
96-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
94+
<td></td>
95+
<td style="line-height: 130%; word-wrap: break-word;">
9796
<p>
9897
<!--
9998
Perform the renewal of certificates used by component changed during upgrades.
@@ -107,7 +106,8 @@ Perform the renewal of certificates used by component changed during upgrades.
107106
<td colspan="2">--config string</td>
108107
</tr>
109108
<tr>
110-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
109+
<td></td>
110+
<td style="line-height: 130%; word-wrap: break-word;">
111111
<p>
112112
<!--
113113
Path to a kubeadm configuration file.
@@ -121,7 +121,8 @@ kubeadm 配置文件的路径。
121121
<td colspan="2">--dry-run</td>
122122
</tr>
123123
<tr>
124-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
124+
<td></td>
125+
<td style="line-height: 130%; word-wrap: break-word;">
125126
<p>
126127
<!--
127128
Do not change any state, just output what actions would be performed.
@@ -136,11 +137,12 @@ Do not change any state, just output what actions would be performed.
136137
<!--
137138
--etcd-upgrade&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: true
138139
-->
139-
--etcd-upgrade&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值: true
140+
--etcd-upgrade&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;默认值true
140141
</td>
141142
</tr>
142143
<tr>
143-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
144+
<td></td>
145+
<td style="line-height: 130%; word-wrap: break-word;">
144146
<p>
145147
<!--
146148
Perform the upgrade of etcd.
@@ -154,7 +156,8 @@ Perform the upgrade of etcd.
154156
<td colspan="2">--feature-gates string</td>
155157
</tr>
156158
<tr>
157-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
159+
<td></td>
160+
<td style="line-height: 130%; word-wrap: break-word;">
158161
<p>
159162
<!--
160163
A set of key=value pairs that describe feature gates for various features. Options are:<br/>
@@ -178,7 +181,8 @@ WaitForAllControlPlaneComponents=true|false (ALPHA - 默认值=false)
178181
<td colspan="2">-f, --force</td>
179182
</tr>
180183
<tr>
181-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
184+
<td></td>
185+
<td style="line-height: 130%; word-wrap: break-word;">
182186
<p>
183187
<!--
184188
Force upgrading although some requirements might not be met. This also implies non-interactive mode.
@@ -192,7 +196,8 @@ Force upgrading although some requirements might not be met. This also implies n
192196
<td colspan="2">-h, --help</td>
193197
</tr>
194198
<tr>
195-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
199+
<td></td>
200+
<td style="line-height: 130%; word-wrap: break-word;">
196201
<p>
197202
<!--
198203
help for apply
@@ -206,12 +211,14 @@ apply 操作的帮助命令。
206211
<td colspan="2">-ignore-preflight-errors strings</td>
207212
</tr>
208213
<tr>
209-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
214+
<td></td>
215+
<td style="line-height: 130%; word-wrap: break-word;">
210216
<p>
211217
<!--
212218
A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks.
213219
-->
214-
错误将显示为警告的检查列表;例如:'IsPrivilegedUser,Swap'。取值为 'all' 时将忽略检查中的所有错误。
220+
错误将显示为警告的检查列表;例如:'IsPrivilegedUser,Swap'。
221+
取值为 'all' 时将忽略检查中的所有错误。
215222
</p>
216223
</td>
217224
</tr>
@@ -225,12 +232,14 @@ A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedU
225232
</td>
226233
</tr>
227234
<tr>
228-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
235+
<td></td>
236+
<td style="line-height: 130%; word-wrap: break-word;">
229237
<p>
230238
<!--
231239
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.
232240
-->
233-
与集群通信时使用的 kubeconfig 文件。如果未设置标志,则在相关目录下搜索以查找现有 kubeconfig 文件。
241+
与集群通信时使用的 kubeconfig 文件。如果未设置标志,
242+
则在相关目录下搜索以查找现有 kubeconfig 文件。
234243
</p>
235244
</td>
236245
</tr>
@@ -239,14 +248,16 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
239248
<td colspan="2">--patches string</td>
240249
</tr>
241250
<tr>
242-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
251+
<td></td>
252+
<td style="line-height: 130%; word-wrap: break-word;">
243253
<p>
244254
<!--
245255
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.
246256
-->
247257
包含名为 &quot;target[suffix][+patchtype].extension&quot; 的文件的目录的路径。
248258
例如,&quot;kube-apiserver0+merge.yaml&quot;或是简单的 &quot;etcd.json&quot;
249-
&quot;target&quot; 可以是 &quot;kube-apiserver&quot;&quot;kube-controller-manager&quot;&quot;kube-scheduler&quot;&quot;etcd&quot;&quot;kubeletconfiguration&quot; 之一。
259+
&quot;target&quot; 可以是 &quot;kube-apiserver&quot;&quot;kube-controller-manager&quot;
260+
&quot;kube-scheduler&quot;&quot;etcd&quot;&quot;kubeletconfiguration&quot; 之一。
250261
&quot;patchtype&quot; 可以是 &quot;strategic&quot;&quot;merge&quot; 或者 &quot;json&quot; 之一,
251262
并且它们与 kubectl 支持的补丁格式相同。
252263
默认的 &quot;patchtype&quot;&quot;strategic&quot;
@@ -260,7 +271,8 @@ Path to a directory that contains files named &quot;target[suffix][+patchtype].e
260271
<td colspan="2">--print-config</td>
261272
</tr>
262273
<tr>
263-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
274+
<td></td>
275+
<td style="line-height: 130%; word-wrap: break-word;">
264276
<p>
265277
<!--
266278
Specifies whether the configuration file that will be used in the upgrade should be printed or not.
@@ -274,7 +286,8 @@ Specifies whether the configuration file that will be used in the upgrade should
274286
<td colspan="2">-y, --yes</td>
275287
</tr>
276288
<tr>
277-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
289+
<td></td>
290+
<td style="line-height: 130%; word-wrap: break-word;">
278291
<p>
279292
<!--
280293
Perform the upgrade and do not prompt for confirmation (non-interactive mode).
@@ -292,7 +305,7 @@ Perform the upgrade and do not prompt for confirmation (non-interactive mode).
292305
-->
293306
### 从父命令继承的选项
294307

295-
<table style="width: 100%; table-layout: fixed;">
308+
<table style="width: 100%; table-layout: fixed;">
296309
<colgroup>
297310
<col span="1" style="width: 10px;" />
298311
<col span="1" />
@@ -303,7 +316,8 @@ Perform the upgrade and do not prompt for confirmation (non-interactive mode).
303316
<td colspan="2">--rootfs string</td>
304317
</tr>
305318
<tr>
306-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
319+
<td></td>
320+
<td style="line-height: 130%; word-wrap: break-word;">
307321
<p>
308322
<!--
309323
[EXPERIMENTAL] The path to the 'real' host root filesystem.

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

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
Upgrade the kubelet configuration for this node
3-
-->
4-
升级此节点的 kubelet 配置。
5-
61
<!--
72
### Synopsis
83
-->
@@ -22,7 +17,7 @@ kubeadm upgrade node phase kubelet-config [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,20 +28,23 @@ kubeadm upgrade node phase kubelet-config [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;">
3733
<p>
3834
<!--
3935
Path to a kubeadm configuration file.
4036
-->
4137
kubeadm 配置文件的路径。
42-
</p></td>
38+
</p>
39+
</td>
4340
</tr>
4441

4542
<tr>
4643
<td colspan="2">--dry-run</td>
4744
</tr>
4845
<tr>
49-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
46+
<td></td>
47+
<td style="line-height: 130%; word-wrap: break-word;">
5048
<p>
5149
<!--
5250
Do not change any state, just output the actions that would be performed.
@@ -60,7 +58,8 @@ Do not change any state, just output the actions that would be performed.
6058
<td colspan="2">-h, --help</td>
6159
</tr>
6260
<tr>
63-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
61+
<td></td>
62+
<td style="line-height: 130%; word-wrap: break-word;">
6463
<p>
6564
<!--
6665
help for kubelet-config
@@ -79,7 +78,8 @@ kubelet-config 操作的帮助命令。
7978
</td>
8079
</tr>
8180
<tr>
82-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
81+
<td></td>
82+
<td style="line-height: 130%; word-wrap: break-word;">
8383
<p>
8484
<!--
8585
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.
@@ -93,17 +93,20 @@ The kubeconfig file to use when talking to the cluster. If the flag is not set,
9393
<td colspan="2">--patches string</td>
9494
</tr>
9595
<tr>
96-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
96+
<td></td>
97+
<td style="line-height: 130%; word-wrap: break-word;"><p>
9798
<!--
9899
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.
99100
-->
100101
目录路径,指向的目录中包含名为 “target[suffix][+patchtype].extension” 的文件。
101102
例如,"kube-apiserver0+merge.yaml" 或 "etcd.json" 这种简单形式。
102-
"target" 可以是 “kube-apiserver”、“kube-controller-manager”、“kube-scheduler”、“etcd”、“kubeletconfiguration” 之一,
103+
"target" 可以是 “kube-apiserver”、“kube-controller-manager”、
104+
“kube-scheduler”、“etcd”、“kubeletconfiguration” 之一,
103105
"patchtype" 可以是 "strategic"、"merge" 或 "json" 之一,并且它们与 kubectl 支持的补丁格式匹配。
104106
默认的 "patchtype" 为 "strategic"。 "extension" 必须为 "json" 或 "yaml"。
105107
"suffix" 是一个可选字符串,可用于确定按字母顺序首先应用哪些补丁。
106-
</p></td>
108+
</p>
109+
</td>
107110
</tr>
108111

109112
</tbody>
@@ -114,7 +117,7 @@ Path to a directory that contains files named &quot;target[suffix][+patchtype].e
114117
-->
115118
### 从父命令继承的选项
116119

117-
<table style="width: 100%; table-layout: fixed;">
120+
<table style="width: 100%; table-layout: fixed;">
118121
<colgroup>
119122
<col span="1" style="width: 10px;" />
120123
<col span="1" />
@@ -125,7 +128,8 @@ Path to a directory that contains files named &quot;target[suffix][+patchtype].e
125128
<td colspan="2">--rootfs string</td>
126129
</tr>
127130
<tr>
128-
<td></td><td style="line-height: 130%; word-wrap: break-word;">
131+
<td></td>
132+
<td style="line-height: 130%; word-wrap: break-word;">
129133
<p>
130134
<!--
131135
[EXPERIMENTAL] The path to the 'real' host root filesystem.

0 commit comments

Comments
 (0)