Skip to content

Commit a814f6e

Browse files
committed
[zh-cn]sync kubectl_apply/* kubectl_taint
Signed-off-by: xin.li <[email protected]>
1 parent 213b5a9 commit a814f6e

File tree

3 files changed

+75
-34
lines changed

3 files changed

+75
-34
lines changed

content/zh-cn/docs/reference/kubectl/generated/kubectl_apply/_index.md

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,21 @@ If true, keep the managedFields when printing objects in JSON or YAML format.
348348
</td>
349349
</tr>
350350

351+
<tr>
352+
<td colspan="2">--subresource string</td>
353+
</tr>
354+
<tr>
355+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
356+
<p>
357+
<!--
358+
If specified, apply will operate on the subresource of the requested object. Only allowed when using --server-side. This flag is beta and may change in the future.
359+
-->
360+
如果指定此参数,apply 将对请求对象的子资源进行操作。
361+
仅在使用 --server-side 时允许指定此参数。此标志为 Beta 级别,将来可能会发生变化。
362+
</p>
363+
</td>
364+
</tr>
365+
351366
<tr>
352367
<td colspan="2">--template string</td>
353368
</tr>
@@ -378,18 +393,27 @@ The length of time to wait before giving up on a delete, zero means determine a
378393
<td colspan="2">--validate string[="strict"]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<!--Default:-->默认值:"strict"</td>
379394
</tr>
380395
<tr>
381-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
396+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
397+
<p>
382398
<!--
383-
Must be one of: strict (or true), warn, ignore (or false).<br/>&quot;true&quot; or &quot;strict&quot; will use a schema to validate the input and fail the request if invalid. It will perform server side validation if ServerSideFieldValidation is enabled on the api-server, but will fall back to less reliable client-side validation if not.<br/>&quot;warn&quot; will warn about unknown or duplicate fields without blocking the request if server-side field validation is enabled on the API server, and behave as &quot;ignore&quot; otherwise.<br/>&quot;false&quot; or &quot;ignore&quot; will not perform any schema validation, silently dropping any unknown or duplicate fields.
384-
-->
385-
必须是以下选项之一:strict(或 true)、warn、ignore(或 false)。<br/>
386-
"true" 或 "strict" 将使用模式定义来验证输入,如果无效,则请求失败。
399+
Must be one of: strict (or true), warn, ignore (or false).
400+
&quot;true&quot; or &quot;strict&quot; will use a schema to validate the input and
401+
fail the request if invalid. It will perform server side validation if ServerSideFieldValidation
402+
is enabled on the api-server, but will fall back to less reliable client-side validation if not.
403+
&quot;warn&quot; will warn about unknown or duplicate fields without blocking the request if
404+
server-side field validation is enabled on the API server, and behave as &quot;ignore&quot; otherwise.
405+
&quot;false&quot; or &quot;ignore&quot; will not perform any schema validation,
406+
silently dropping any unknown or duplicate fields.
407+
-->
408+
必须是以下选项之一:strict(或 true)、warn、ignore(或 false)。
409+
&quot;true&quot;&quot;strict&quot; 将使用模式定义来验证输入,如果无效,则请求失败。
387410
如果在 API 服务器上启用了 ServerSideFieldValidation,则执行服务器端验证,
388-
但如果未启用,它将回退到可靠性较低的客户端验证。<br/>
389-
如果在 API 服务器上启用了服务器端字段验证,"warn" 将警告未知或重复的字段而不阻止请求,
390-
否则操作与 "ignore" 的表现相同。<br/>
391-
"false" 或 "ignore" 将不会执行任何模式定义检查,而是静默删除所有未知或重复的字段。
392-
</p></td>
411+
但如果未启用此参数,API 服务器将回退到可靠性较低的客户端验证。
412+
如果在 API 服务器上启用了服务器端字段验证,&quot;warn&quot; 将警告未知或重复的字段而不阻止请求,
413+
否则操作与 &quot;ignore&quot; 的表现相同。
414+
&quot;false&quot;&quot;ignore&quot; 将不会执行任何模式定义检查,而是静默删除所有未知或重复的字段。
415+
</p>
416+
</td>
393417
</tr>
394418

395419
<tr>

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

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ kubectl apply edit-last-applied (RESOURCE/NAME | -f FILENAME)
4242

4343
<!--
4444
```
45-
# Edit the last-applied-configuration annotations by type/name in YAML
46-
kubectl apply edit-last-applied deployment/nginx
47-
48-
# Edit the last-applied-configuration annotations by file in JSON
49-
kubectl apply edit-last-applied -f deploy.yaml -o json
45+
# Edit the last-applied-configuration annotations by type/name in YAML
46+
kubectl apply edit-last-applied deployment/nginx
47+
48+
# Edit the last-applied-configuration annotations by file in JSON
49+
kubectl apply edit-last-applied -f deploy.yaml -o json
5050
```
5151
-->
5252
```shell
@@ -184,18 +184,27 @@ Template string or path to template file to use when -o=go-template, -o=go-templ
184184
<td colspan="2">--validate string[="strict"]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<!--Default:-->默认值:"strict"</td>
185185
</tr>
186186
<tr>
187-
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
187+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
188+
<p>
188189
<!--
189-
Must be one of: strict (or true), warn, ignore (or false).<br/>&quot;true&quot; or &quot;strict&quot; will use a schema to validate the input and fail the request if invalid. It will perform server side validation if ServerSideFieldValidation is enabled on the api-server, but will fall back to less reliable client-side validation if not.<br/>&quot;warn&quot; will warn about unknown or duplicate fields without blocking the request if server-side field validation is enabled on the API server, and behave as &quot;ignore&quot; otherwise.<br/>&quot;false&quot; or &quot;ignore&quot; will not perform any schema validation, silently dropping any unknown or duplicate fields.
190-
-->
191-
必须是以下选项之一:strict(或 true)、warn、ignore(或 false)。<br/>
192-
"true" 或 "strict" 将使用模式定义来验证输入,如果无效,则请求失败。
190+
Must be one of: strict (or true), warn, ignore (or false).
191+
&quot;true&quot; or &quot;strict&quot; will use a schema to validate the input and
192+
fail the request if invalid. It will perform server side validation if ServerSideFieldValidation
193+
is enabled on the api-server, but will fall back to less reliable client-side validation if not.
194+
&quot;warn&quot; will warn about unknown or duplicate fields without blocking the request if
195+
server-side field validation is enabled on the API server, and behave as &quot;ignore&quot; otherwise.
196+
&quot;false&quot; or &quot;ignore&quot; will not perform any schema validation,
197+
silently dropping any unknown or duplicate fields.
198+
-->
199+
必须是以下选项之一:strict(或 true)、warn、ignore(或 false)。
200+
&quot;true&quot;&quot;strict&quot; 将使用模式定义来验证输入,如果无效,则请求失败。
193201
如果在 API 服务器上启用了 ServerSideFieldValidation,则执行服务器端验证,
194-
但如果未启用,它将回退到可靠性较低的客户端验证。<br/>
195-
如果在 API 服务器上启用了服务器端字段验证,"warn" 将警告未知或重复的字段而不阻止请求,
196-
否则操作与 "ignore" 的表现相同。<br/>
197-
"false" 或 "ignore" 将不会执行任何模式定义检查,而是静默删除所有未知或重复的字段。
198-
</p></td>
202+
但如果未启用此参数,它将回退到可靠性较低的客户端验证。
203+
如果在 API 服务器上启用了服务器端字段验证,&quot;warn&quot; 将警告未知或重复的字段而不阻止请求,
204+
否则操作与 &quot;ignore&quot; 的表现相同。
205+
&quot;false&quot;&quot;ignore&quot; 将不会执行任何模式定义检查,而是静默删除所有未知或重复的字段。
206+
</p>
207+
</td>
199208
</tr>
200209

201210
<tr>
@@ -207,7 +216,8 @@ Must be one of: strict (or true), warn, ignore (or false).<br/>&quot;true&quot;
207216
Only relevant if --edit=true. Defaults to the line ending native to your platform.
208217
-->
209218
仅在 --edit=true 时起作用。默认为你所用平台本地的行结尾格式。
210-
</p></td>
219+
</p>
220+
</td>
211221
</tr>
212222

213223
</tbody>

content/zh-cn/docs/reference/kubectl/generated/kubectl_taint/_index.md

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -228,15 +228,22 @@ Template string or path to template file to use when -o=go-template, -o=go-templ
228228
<td></td><td style="line-height: 130%; word-wrap: break-word;">
229229
<p>
230230
<!--
231-
Must be one of: strict (or true), warn, ignore (or false).<br/>&quot;true&quot; or &quot;strict&quot; will use a schema to validate the input and fail the request if invalid. It will perform server side validation if ServerSideFieldValidation is enabled on the api-server, but will fall back to less reliable client-side validation if not.<br/>&quot;warn&quot; will warn about unknown or duplicate fields without blocking the request if server-side field validation is enabled on the API server, and behave as &quot;ignore&quot; otherwise.<br/>&quot;false&quot; or &quot;ignore&quot; will not perform any schema validation, silently dropping any unknown or duplicate fields.
232-
-->
233-
必须是以下选项之一:strict(或 true)、warn、ignore(或 false)。<br/>
234-
"true" 或 "strict" 将使用模式定义来验证输入,如果无效,则请求失败。
231+
Must be one of: strict (or true), warn, ignore (or false).
232+
&quot;true&quot; or &quot;strict&quot; will use a schema to validate the input and
233+
fail the request if invalid. It will perform server side validation if ServerSideFieldValidation
234+
is enabled on the api-server, but will fall back to less reliable client-side validation if not.
235+
&quot;warn&quot; will warn about unknown or duplicate fields without blocking the request if
236+
server-side field validation is enabled on the API server, and behave as &quot;ignore&quot; otherwise.
237+
&quot;false&quot; or &quot;ignore&quot; will not perform any schema validation,
238+
silently dropping any unknown or duplicate fields.
239+
-->
240+
必须是以下选项之一:strict(或 true)、warn、ignore(或 false)。
241+
&quot;true&quot;&quot;strict&quot; 将使用模式定义来验证输入,如果无效,则请求失败。
235242
如果在 API 服务器上启用了 ServerSideFieldValidation,则执行服务器端验证,
236-
但如果未启用,它将回退到可靠性较低的客户端验证。<br/>
237-
如果在 API 服务器上启用了服务器端字段验证,"warn" 将警告未知或重复的字段而不阻止请求,
238-
否则操作与 "ignore" 的表现相同。<br/>
239-
"false""ignore" 将不会执行任何模式定义检查,而是静默删除所有未知或重复的字段。
243+
但如果未启用此参数,它将回退到可靠性较低的客户端验证。
244+
如果在 API 服务器上启用了服务器端字段验证,&quot;warn&quot; 将警告未知或重复的字段而不阻止请求,
245+
否则操作与 &quot;ignore&quot; 的表现相同。
246+
&quot;false&quot;&quot;ignore&quot; 将不会执行任何模式定义检查,而是静默删除所有未知或重复的字段。
240247
</p>
241248
</td>
242249
</tr>

0 commit comments

Comments
 (0)