Skip to content

Commit 86e5906

Browse files
my-git9my-git9
committed
[zh-cn]sync cron-job-v1 replica-set-v1
Signed-off-by: xin.li <[email protected]>
1 parent 3df5992 commit 86e5906

2 files changed

Lines changed: 67 additions & 34 deletions

File tree

‎content/zh-cn/docs/reference/kubernetes-api/workload-resources/cron-job-v1.md‎

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ api_metadata:
66
content_type: "api_reference"
77
description: "CronJob 代表单个定时作业（Cron Job）的配置。"
88
title: "CronJob"
9-
weight: 11
9+
weight: 12
1010
---
1111
<!--
1212
api_metadata:
@@ -16,7 +16,7 @@ kind: "CronJob"
1616
content_type: "api_reference"
1717
description: "CronJob represents the configuration of a single cron job."
1818
title: "CronJob"
19-
weight: 11
19+
weight: 12
2020
auto_generated: true
2121
-->
2222

@@ -46,11 +46,12 @@ CronJob 代表单个定时作业（Cron Job）的配置。
4646
标准的对象元数据。更多信息：
4747
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
4848

49-
- **spec** (<a href="{{< ref "../workload-resources/cron-job-v1#CronJobSpec" >}}">CronJobSpec</a>)
49+
<!--
50+
- **spec** (<a href="{{< ref "../workload-resources/cron-job-v1#CronJobSpec" >}}">CronJobSpec</a>), required
5051
51-
<!--
5252
Specification of the desired behavior of a cron job, including the schedule. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
53-
-->
53+
-->
54+
- **spec** (<a href="{{< ref "../workload-resources/cron-job-v1#CronJobSpec" >}}">CronJobSpec</a>)，必需
5455

5556
定时作业的预期行为的规约，包括排期表（Schedule）。更多信息：
5657
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
@@ -152,19 +153,6 @@ CronJobSpec 描述了作业的执行方式和实际将运行的时间。
152153
- `"Forbid"`：禁止并发运行，如果上一次运行尚未完成则跳过下一次运行；
153154
- `"Replace"`：取消当前正在运行的作业并将其替换为新作业。
154155

155-
<!--
156-
Possible enum values:
157-
- `"Allow"` allows CronJobs to run concurrently.
158-
- `"Forbid"` forbids concurrent runs, skipping next run if previous hasn't finished yet.
159-
- `"Replace"` cancels currently running job and replaces it with a new one.
160-
-->
161-
162-
可能的枚举值：
163-
164-
- `"Allow"`：允许 CronJob 并发运行。
165-
- `"Forbid"`：禁止并发运行，如果上一次运行尚未完成则跳过下一次运行。
166-
- `"Replace"`：取消当前正在运行的作业并将其替换为新作业。
167-
168156
<!--
169157
- **startingDeadlineSeconds** (int64)
170158
@@ -505,6 +493,15 @@ GET /apis/batch/v1/namespaces/{namespace}/cronjobs
505493

506494
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
507495

496+
<!--
497+
- **shardSelector** (*in query*): string
498+
499+
<a href="{{< ref "../common-parameters/common-parameters#shardSelector" >}}">shardSelector</a>
500+
-->
501+
- **shardSelector** (**查询参数**): string
502+
503+
<a href="{{< ref "../common-parameters/common-parameters#shardSelector" >}}">shardSelector</a>
504+
508505
<!--
509506
- **timeoutSeconds** (*in query*): integer
510507
@@ -630,6 +627,15 @@ GET /apis/batch/v1/cronjobs
630627

631628
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
632629

630+
<!--
631+
- **shardSelector** (*in query*): string
632+
633+
<a href="{{< ref "../common-parameters/common-parameters#shardSelector" >}}">shardSelector</a>
634+
-->
635+
- **shardSelector** (**查询参数**): string
636+
637+
<a href="{{< ref "../common-parameters/common-parameters#shardSelector" >}}">shardSelector</a>
638+
633639
<!--
634640
- **timeoutSeconds** (*in query*): integer
635641
@@ -1345,6 +1351,15 @@ DELETE /apis/batch/v1/namespaces/{namespace}/cronjobs
13451351

13461352
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
13471353

1354+
<!--
1355+
- **shardSelector** (*in query*): string
1356+
1357+
<a href="{{< ref "../common-parameters/common-parameters#shardSelector" >}}">shardSelector</a>
1358+
-->
1359+
- **shardSelector** (**查询参数**): string
1360+
1361+
<a href="{{< ref "../common-parameters/common-parameters#shardSelector" >}}">shardSelector</a>
1362+
13481363
<!--
13491364
- **timeoutSeconds** (*in query*): integer
13501365

‎content/zh-cn/docs/reference/kubernetes-api/workload-resources/replica-set-v1.md‎

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ api_metadata:
66
content_type: "api_reference"
77
description: "ReplicaSet 确保在任何给定的时刻都在运行指定数量的 Pod 副本。"
88
title: "ReplicaSet"
9-
weight: 4
9+
weight: 6
1010
---
1111
<!--
1212
api_metadata:
@@ -16,7 +16,7 @@ api_metadata:
1616
content_type: "api_reference"
1717
description: "ReplicaSet ensures that a specified number of pod replicas are running at any given time."
1818
title: "ReplicaSet"
19-
weight: 4
19+
weight: 6
2020
auto_generated: true
2121
-->
2222

@@ -156,7 +156,7 @@ ReplicaSetStatus 表示 ReplicaSet 的当前状态。
156156
- **terminatingReplicas** (int32)
157157
158158
The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.
159-
159+
160160
This is a beta field and requires enabling DeploymentReplicaSetTerminatingReplicas feature (enabled by default)
161161
-->
162162
- **terminatingReplicas** (int32)
@@ -183,7 +183,7 @@ ReplicaSetStatus 表示 ReplicaSet 的当前状态。
183183
*Patch strategy: merge on key `type`*
184184
185185
*Map: unique values on key type will be kept during a merge*
186-
186+
187187
Represents the latest available observations of a replica set's current state.
188188
189189
<a name="ReplicaSetCondition"></a>
@@ -194,12 +194,12 @@ ReplicaSetStatus 表示 ReplicaSet 的当前状态。
194194
**补丁策略：按照键 `type` 合并**
195195

196196
**Map：键类型的唯一值将在合并期间保留**
197-
197+
198198
表示副本集当前状态的最新可用观测值。
199-
199+
200200
<a name="ReplicaSetCondition"></a>
201201
**ReplicaSetCondition 描述某个点的副本集状态。**
202-
202+
203203
<!--
204204
- **conditions.status** (string), required
205205
@@ -211,13 +211,13 @@ ReplicaSetStatus 表示 ReplicaSet 的当前状态。
211211
-->
212212

213213
- **conditions.status** (string)，必需
214-
214+
215215
状况的状态，取值为 `True`、`False` 或 `Unknown` 之一。
216-
216+
217217
- **conditions.type** (string)，必需
218-
218+
219219
副本集状况的类型。
220-
220+
221221
<!--
222222
- **conditions.lastTransitionTime** (Time)
223223
@@ -228,13 +228,13 @@ ReplicaSetStatus 表示 ReplicaSet 的当前状态。
228228
-->
229229

230230
- **conditions.lastTransitionTime** (Time)
231-
231+
232232
状况上次从一个状态转换为另一个状态的时间。
233-
233+
234234
<a name="Time"></a>
235235
**Time 是对 time.Time 的封装。Time 支持对 YAML 和 JSON 进行正确封包。
236236
为 time 包的许多函数方法提供了封装器。**
237-
237+
238238
<!--
239239
- **conditions.message** (string)
240240
@@ -248,9 +248,9 @@ ReplicaSetStatus 表示 ReplicaSet 的当前状态。
248248
- **conditions.message** (string)
249249

250250
这是一条人类可读的消息，指示有关上次转换的详细信息。
251-
251+
252252
- **conditions.reason** (string)
253-
253+
254254
状况上次转换的原因。
255255

256256
<!--
@@ -406,6 +406,8 @@ GET /apis/apps/v1/namespaces/{namespace}/replicasets
406406
- **pretty** (*in query*): string
407407
- **resourceVersion** (*in query*): string
408408
- **resourceVersionMatch** (*in query*): string
409+
- **sendInitialEvents** (*in query*): boolean
410+
- **shardSelector** (*in query*): string
409411
- **timeoutSeconds** (*in query*): integer
410412
- **watch** (*in query*): boolean
411413
-->
@@ -450,6 +452,10 @@ GET /apis/apps/v1/namespaces/{namespace}/replicasets
450452
- **sendInitialEvents** (**查询参数**): boolean
451453

452454
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
455+
456+
- **shardSelector** (**查询参数**): string
457+
458+
<a href="{{< ref "../common-parameters/common-parameters#shardSelector" >}}">shardSelector</a>
453459

454460
- **timeoutSeconds** (**查询参数**): integer
455461

@@ -489,6 +495,8 @@ GET /apis/apps/v1/replicasets
489495
- **pretty** (*in query*): string
490496
- **resourceVersion** (*in query*): string
491497
- **resourceVersionMatch** (*in query*): string
498+
- **sendInitialEvents** (*in query*): boolean
499+
- **shardSelector** (*in query*): string
492500
- **timeoutSeconds** (*in query*): integer
493501
- **watch** (*in query*): boolean
494502
-->
@@ -530,6 +538,10 @@ GET /apis/apps/v1/replicasets
530538

531539
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
532540

541+
- **shardSelector** (**查询参数**): string
542+
543+
<a href="{{< ref "../common-parameters/common-parameters#shardSelector" >}}">shardSelector</a>
544+
533545
- **timeoutSeconds** (**查询参数**): integer
534546

535547
<a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>
@@ -950,6 +962,8 @@ DELETE /apis/apps/v1/namespaces/{namespace}/replicasets
950962
- **propagationPolicy** (*in query*): string
951963
- **resourceVersion** (*in query*): string
952964
- **resourceVersionMatch** (*in query*): string
965+
- **sendInitialEvents** (*in query*): boolean
966+
- **shardSelector** (*in query*): string
953967
- **timeoutSeconds** (*in query*): integer
954968
-->
955969
#### 参数
@@ -1007,6 +1021,10 @@ DELETE /apis/apps/v1/namespaces/{namespace}/replicasets
10071021
- **sendInitialEvents** (**查询参数**): boolean
10081022

10091023
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
1024+
1025+
- **shardSelector** (**查询参数**): string
1026+
1027+
<a href="{{< ref "../common-parameters/common-parameters#shardSelector" >}}">shardSelector</a>
10101028

10111029
- **timeoutSeconds** (**查询参数**): integer
10121030

0 commit comments

Comments
 (0)