Skip to content

Commit e511e74

Browse files
committed
[zh-cn]sync kubectl_rollout/* kubectl_apply
Signed-off-by: xin.li <[email protected]>
1 parent a562b55 commit e511e74

File tree

5 files changed

+66
-35
lines changed

5 files changed

+66
-35
lines changed

content/zh-cn/docs/reference/kubectl/generated/kubectl_apply/kubectl_apply_view-last-applied.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,16 @@ Process the directory used in -f, --filename recursively. Useful when you want t
129129
<td colspan="2">-l, --selector string</td>
130130
</tr>
131131
<tr>
132-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
132+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
133+
<p>
133134
<!--
134-
Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2). Matching objects must satisfy all of the specified label constraints.
135+
Selector (label query) to filter on, supports '=', '==', '!=', 'in', 'notin'.(e.g. -l key1=value1,key2=value2,key3 in (value3)). Matching objects must satisfy all of the specified label constraints.
135136
-->
136-
过滤所用的选择算符(标签查询),支持 '='、'==' 和 '!='。
137-
(例如 -l key1=value1,key2=value2)。匹配的对象必须满足所有指定的标签约束。
138-
</p></td>
137+
过滤所用的选择算符(标签查询),支持 '='、'=='、'!='、'in' 和 'notin'。
138+
(例如 -l key1=value1,key2=value2,key3 in (value3))。
139+
匹配的对象必须满足所有指定的标签约束。
140+
</p>
141+
</td>
139142
</tr>
140143

141144
</tbody>
@@ -266,7 +269,8 @@ The name of the kubeconfig context to use
266269
<!--
267270
Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration.
268271
-->
269-
设置针对 notReady:NoExecute 的容忍度的 tolerationSeconds,默认添加到所有尚未设置此容忍度的 Pod。
272+
设置针对 notReady:NoExecute 的容忍度的 tolerationSeconds,
273+
默认添加到所有尚未设置此容忍度的 Pod。
270274
</p></td>
271275
</tr>
272276

@@ -278,7 +282,8 @@ Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is
278282
<!--
279283
Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration.
280284
-->
281-
设置针对 unreachable:NoExecute 的容忍度的 tolerationSeconds,默认添加到所有尚未设置此容忍度的 Pod。
285+
设置针对 unreachable:NoExecute 的容忍度的 tolerationSeconds,
286+
默认添加到所有尚未设置此容忍度的 Pod。
282287
</p></td>
283288
</tr>
284289

content/zh-cn/docs/reference/kubectl/generated/kubectl_rollout/kubectl_rollout_pause.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Mark the provided resource as paused.
1919
-->
2020
将所提供的资源标记为已暂停。
2121

22-
控制器不会调和已暂停的资源。使用 `kubectl rollout resume` 可恢复已暂停的资源,目前只有 Deployment 支持暂停。
22+
控制器不会调和已暂停的资源。使用 `kubectl rollout resume` 可恢复已暂停的资源,
23+
目前只有 Deployment 支持暂停。
2324

2425
```shell
2526
kubectl rollout pause RESOURCE
@@ -147,13 +148,16 @@ Process the directory used in -f, --filename recursively. Useful when you want t
147148
<td colspan="2">-l, --selector string</td>
148149
</tr>
149150
<tr>
150-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
151+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
152+
<p>
151153
<!--
152-
Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2). Matching objects must satisfy all of the specified label constraints.
154+
Selector (label query) to filter on, supports '=', '==', '!=', 'in', 'notin'.(e.g. -l key1=value1,key2=value2,key3 in (value3)). Matching objects must satisfy all of the specified label constraints.
153155
-->
154-
过滤所用的选择算符(标签查询),支持 '='、'==' 和 '!='。
155-
(例如 -l key1=value1,key2=value2)。匹配的对象必须满足所有指定的标签约束。
156-
</p></td>
156+
过滤所用的选择算符(标签查询),支持 '='、'=='、'!='、'in' 和 'notin'。
157+
(例如 -l key1=value1,key2=value2,key3 in (value3))。
158+
匹配的对象必须满足所有指定的标签约束。
159+
</p>
160+
</td>
157161
</tr>
158162

159163
<tr>
@@ -310,7 +314,8 @@ The name of the kubeconfig context to use
310314
<!--
311315
Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration.
312316
-->
313-
设置针对 notReady:NoExecute 的容忍度的 tolerationSeconds,默认添加到所有尚未设置此容忍度的 Pod。
317+
设置针对 notReady:NoExecute 的容忍度的 tolerationSeconds,
318+
默认添加到所有尚未设置此容忍度的 Pod。
314319
</p></td>
315320
</tr>
316321

@@ -322,7 +327,8 @@ Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is
322327
<!--
323328
Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration.
324329
-->
325-
设置针对 unreachable:NoExecute 的容忍度的 tolerationSeconds,默认添加到所有尚未设置此容忍度的 Pod。
330+
设置针对 unreachable:NoExecute 的容忍度的 tolerationSeconds,
331+
默认添加到所有尚未设置此容忍度的 Pod。
326332
</p></td>
327333
</tr>
328334

content/zh-cn/docs/reference/kubectl/generated/kubectl_rollout/kubectl_rollout_restart.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,16 @@ Process the directory used in -f, --filename recursively. Useful when you want t
159159
<td colspan="2">-l, --selector string</td>
160160
</tr>
161161
<tr>
162-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
162+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
163+
<p>
163164
<!--
164-
Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2). Matching objects must satisfy all of the specified label constraints.
165+
Selector (label query) to filter on, supports '=', '==', '!=', 'in', 'notin'.(e.g. -l key1=value1,key2=value2,key3 in (value3)). Matching objects must satisfy all of the specified label constraints.
165166
-->
166-
过滤所用的选择算符(标签查询),支持 '='、'==' 和 '!='。
167-
(例如 -l key1=value1,key2=value2)。匹配的对象必须满足所有指定的标签约束。
168-
</p></td>
167+
过滤所用的选择算符(标签查询),支持 '='、'=='、'!='、'in' 和 'notin'。
168+
(例如 -l key1=value1,key2=value2,key3 in (value3))。
169+
匹配的对象必须满足所有指定的标签约束。
170+
</p>
171+
</td>
169172
</tr>
170173

171174
<tr>
@@ -334,7 +337,8 @@ Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is
334337
<!--
335338
Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration.
336339
-->
337-
设置针对 unreachable:NoExecute 的容忍度的 tolerationSeconds,默认添加到所有尚未设置此容忍度的 Pod。
340+
设置针对 unreachable:NoExecute 的容忍度的 tolerationSeconds,
341+
默认添加到所有尚未设置此容忍度的 Pod。
338342
</p></td>
339343
</tr>
340344

content/zh-cn/docs/reference/kubectl/generated/kubectl_rollout/kubectl_rollout_resume.md

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Resume a paused resource.
1919
-->
2020
恢复暂停的资源。
2121

22-
- 控制器不会调和已暂停的资源。通过恢复资源,我们可以让控制器再次调和它,目前只有部署支持恢复。
22+
- 控制器不会调和已暂停的资源。通过恢复资源,我们可以让控制器再次调和它,
23+
目前只有部署支持恢复。
2324

2425
```shell
2526
kubectl rollout resume RESOURCE
@@ -28,7 +29,10 @@ kubectl rollout resume RESOURCE
2829
## {{% heading "examples" %}}
2930

3031
<!--
32+
```
3133
# Resume an already paused deployment
34+
kubectl rollout resume deployment/nginx
35+
```
3236
-->
3337
```
3438
# 恢复已暂停的 Deployment
@@ -138,13 +142,16 @@ Process the directory used in -f, --filename recursively. Useful when you want t
138142
<td colspan="2">-l, --selector string</td>
139143
</tr>
140144
<tr>
141-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
145+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
146+
<p>
142147
<!--
143-
Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2). Matching objects must satisfy all of the specified label constraints.
148+
Selector (label query) to filter on, supports '=', '==', '!=', 'in', 'notin'.(e.g. -l key1=value1,key2=value2,key3 in (value3)). Matching objects must satisfy all of the specified label constraints.
144149
-->
145-
过滤所用的选择算符(标签查询),支持 '='、'==' 和 '!='。
146-
(例如 -l key1=value1,key2=value2)。匹配的对象必须满足所有指定的标签约束。
147-
</p></td>
150+
过滤所用的选择算符(标签查询),支持 '='、'=='、'!='、'in' 和 'notin'。
151+
(例如 -l key1=value1,key2=value2,key3 in (value3))。
152+
匹配的对象必须满足所有指定的标签约束。
153+
</p>
154+
</td>
148155
</tr>
149156

150157
<tr>
@@ -320,7 +327,8 @@ Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is
320327
<!--
321328
Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration.
322329
-->
323-
设置针对 unreachable:NoExecute 的容忍度的 tolerationSeconds,默认添加到所有尚未设置此容忍度的 Pod。
330+
设置针对 unreachable:NoExecute 的容忍度的 tolerationSeconds,
331+
默认添加到所有尚未设置此容忍度的 Pod。
324332
</p></td>
325333
</tr>
326334

content/zh-cn/docs/reference/kubectl/generated/kubectl_rollout/kubectl_rollout_status.md

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ kubectl rollout status (TYPE NAME | TYPE/NAME) [flags]
3232
## {{% heading "examples" %}}
3333

3434
<!--
35+
```
3536
# Watch the rollout status of a deployment
37+
kubectl rollout status deployment/nginx
38+
```
3639
-->
3740
```shell
3841
# 监视部署的上线状态
@@ -116,13 +119,16 @@ Pin to a specific revision for showing its status. Defaults to 0 (last revision)
116119
<td colspan="2">-l, --selector string</td>
117120
</tr>
118121
<tr>
119-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
122+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
123+
<p>
120124
<!--
121-
Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2). Matching objects must satisfy all of the specified label constraints.
125+
Selector (label query) to filter on, supports '=', '==', '!=', 'in', 'notin'.(e.g. -l key1=value1,key2=value2,key3 in (value3)). Matching objects must satisfy all of the specified label constraints.
122126
-->
123-
过滤所用的选择算符(标签查询),支持 '='、'==' 和 '!='。
124-
(例如 -l key1=value1,key2=value2)。匹配的对象必须满足所有指定的标签约束。
125-
</p></td>
127+
过滤所用的选择算符(标签查询),支持 '='、'=='、'!='、'in' 和 'notin'。
128+
(例如 -l key1=value1,key2=value2,key3 in (value3))。
129+
匹配的对象必须满足所有指定的标签约束。
130+
</p>
131+
</td>
126132
</tr>
127133

128134
<tr>
@@ -279,7 +285,8 @@ The name of the kubeconfig context to use
279285
<!--
280286
Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is added by default to every pod that does not already have such a toleration.
281287
-->
282-
设置针对 notReady:NoExecute 的容忍度的 tolerationSeconds,默认添加到所有尚未设置此容忍度的 Pod。
288+
设置针对 notReady:NoExecute 的容忍度的 tolerationSeconds,
289+
默认添加到所有尚未设置此容忍度的 Pod。
283290
</p></td>
284291
</tr>
285292

@@ -291,7 +298,8 @@ Indicates the tolerationSeconds of the toleration for notReady:NoExecute that is
291298
<!--
292299
Indicates the tolerationSeconds of the toleration for unreachable:NoExecute that is added by default to every pod that does not already have such a toleration.
293300
-->
294-
设置针对 unreachable:NoExecute 的容忍度的 tolerationSeconds,默认添加到所有尚未设置此容忍度的 Pod。
301+
设置针对 unreachable:NoExecute 的容忍度的 tolerationSeconds,
302+
默认添加到所有尚未设置此容忍度的 Pod。
295303
</p></td>
296304
</tr>
297305

0 commit comments

Comments
 (0)