[zh-cn]sync job-v1 /resource-claim-template-v1

Signed-off-by: xin.li <[email protected]>

Author: my-git9

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

@@ -148,15 +148,16 @@ JobSpec 描述了任务执行的情况。
 <!--
 - **backoffLimit** (int32)
 
-  Specifies the number of retries before marking this job failed. Defaults to 6
+  Specifies the number of retries before marking this job failed. Defaults to 6, unless backoffLimitPerIndex (only Indexed Job) is specified. When backoffLimitPerIndex is specified, backoffLimit defaults to 2147483647.
 
 - **activeDeadlineSeconds** (int64)
 
   Specifies the duration in seconds relative to the startTime that the job may be continuously active before the system tries to terminate it; value must be positive integer. If a Job is suspended (at creation or through an update), this timer will effectively be stopped and reset when the Job is resumed again.
 -->
 - **backoffLimit** (int32)
 
-  指定标记此任务失败之前的重试次数。默认值为 6。
+  指定标记此任务失败之前的重试次数。默认值为 6，除非指定了 backoffLimitPerIndex（仅限 Indexed Job）。
+  指定 backoffLimitPerIndex 时，backoffLimit 默认为 2147483647。
 
 - **activeDeadlineSeconds** (int64)
 
@@ -429,7 +430,7 @@ JobSpec 描述了任务执行的情况。
 
   *Atomic: will be replaced during a merge*
    
-  rules represents the list of alternative rules for the declaring the Jobs as successful before `.status.succeeded >= .spec.completions`. Once any of the rules are met, the "SucceededCriteriaMet" condition is added, and the lingering pods are removed. The terminal state for such a Job has the "Complete" condition. Additionally, these rules are evaluated in order; Once the Job meets one of the rules, other rules are ignored. At most 20 elements are allowed.
+  rules represents the list of alternative rules for the declaring the Jobs as successful before `.status.succeeded >= .spec.completions`. Once any of the rules are met, the "SuccessCriteriaMet" condition is added, and the lingering pods are removed. The terminal state for such a Job has the "Complete" condition. Additionally, these rules are evaluated in order; Once the Job meets one of the rules, other rules are ignored. At most 20 elements are allowed.
   -->
 
   **successPolicy 描述何时可以根据某些索引的成功将任务声明为成功。**
@@ -439,7 +440,7 @@ JobSpec 描述了任务执行的情况。
   **原子性：合并期间会被替换**
 
   rules 表示在 `.status.succeeded >= .spec.completions` 之前将任务声明为成功的备选规则列表。
-  一旦满足任何规则，就会添加 `SucceededCriteriaMet` 状况，并删除滞留的 Pod。
+  一旦满足任何规则，就会添加 `SuccessCriteriaMet` 状况，并删除滞留的 Pod。
   此类 Pod 的最终状态具有 `Complete` 状况。此外，这些规则按顺序进行评估；
   一旦任务满足其中一条规则，其他规则将被忽略。最多允许 20 个元素。
 
@@ -448,7 +449,8 @@ JobSpec 描述了任务执行的情况。
   *SuccessPolicyRule describes rule for declaring a Job as succeeded. Each rule must have at least one of the "succeededIndexes" or "succeededCount" specified.*
   -->
 
-  **SuccessPolicyRule 描述了将任务声明为成功的规则。每条规则必须至少指定 `succeededIndexes` 或 `succeededCount` 之一。**
+  **SuccessPolicyRule 描述了将任务声明为成功的规则。每条规则必须至少指定 `succeededIndexes`
+  或 `succeededCount` 之一。**
 
 - **successPolicy.rules.succeededCount** (int32)
 
@@ -514,10 +516,10 @@ JobSpec 描述了任务执行的情况。
 -->
 - **maxFailedIndexes**（int32）
 
-  指定在 backoffLimitPerIndex 被设置时、标记 Job 为失败之前所允许的最大失败索引数。
+  指定在 `backoffLimitPerIndex` 被设置时、标记 Job 为失败之前所允许的最大失败索引数。
   一旦失败的索引数超过此数值，整个 Job 将被标记为 Failed 并终止执行。
   如果不设置此字段（对应为 null），则作业继续执行其所有索引，且 Job 会被标记 `Complete` 状况。
-  此字段只能在设置 backoffLimitPerIndex 时指定。此字段值可以是 null 或完成次数之内的值。
+  此字段只能在设置 `backoffLimitPerIndex` 时指定。此字段值可以是 null 或完成次数之内的值。
   当完成次数大于 10^5 时，此字段是必需的且必须小于等于 10^4。
 
 <!--
@@ -536,12 +538,11 @@ JobSpec 描述了任务执行的情况。
   - Failed：表示在创建替代的 Pod 之前，等待先前创建的 Pod 完全终止（处于 Failed 或 Succeeded 阶段）。
 
   <!--
-  When using podFailurePolicy, Failed is the the only allowed value. TerminatingOrFailed and Failed are allowed values when podFailurePolicy is not in use. This is an beta field. To use this, enable the JobPodReplacementPolicy feature toggle. This is on by default.
+  When using podFailurePolicy, Failed is the the only allowed value. TerminatingOrFailed and Failed are allowed values when podFailurePolicy is not in use. This is an beta field.
   -->
   当使用 podFailurePolicy 时，Failed 是唯一允许值。
   当不使用 podFailurePolicy 时，允许使用 TerminatingOrFailed 和 Failed。
-  这是一个 Beta 级别的字段。要使用此特性，请启用 JobPodReplacementPolicy 特性门控。
-  此特性默认处于被启用状态。
+  这是一个 Beta 级别的字段。
 
 ## JobStatus {#JobStatus}
 

content/zh-cn/docs/reference/kubernetes-api/workload-resources/resource-claim-template-v1beta2.md renamed to content/zh-cn/docs/reference/kubernetes-api/workload-resources/resource-claim-template-v1.md

@@ -1,28 +1,28 @@
 ---
 api_metadata:
-  apiVersion: "resource.k8s.io/v1beta2"
-  import: "k8s.io/api/resource/v1beta2"
+  apiVersion: "resource.k8s.io/v1"
+  import: "k8s.io/api/resource/v1"
   kind: "ResourceClaimTemplate"
 content_type: "api_reference"
 description: "ResourceClaimTemplate 用于生成 ResourceClaim 对象。"
-title: "ResourceClaimTemplate v1beta2"
+title: "ResourceClaimTemplate v1"
 weight: 17
 ---
 <!--
 api_metadata:
-  apiVersion: "resource.k8s.io/v1beta2"
-  import: "k8s.io/api/resource/v1beta2"
+  apiVersion: "resource.k8s.io/v1"
+  import: "k8s.io/api/resource/v1"
   kind: "ResourceClaimTemplate"
 content_type: "api_reference"
 description: "ResourceClaimTemplate is used to produce ResourceClaim objects."
-title: "ResourceClaimTemplate v1beta2"
+title: "ResourceClaimTemplate v1"
 weight: 17
 auto_generated: true
 -->
 
-`apiVersion: resource.k8s.io/v1beta2`
+`apiVersion: resource.k8s.io/v1`
 
-`import "k8s.io/api/resource/v1beta2"`
+`import "k8s.io/api/resource/v1"`
 
 ## ResourceClaimTemplate {#ResourceClaimTemplate}
 
@@ -37,7 +37,7 @@ ResourceClaimTemplate 用于生成 ResourceClaim 对象。
 
 <hr>
 
-- **apiVersion**: resource.k8s.io/v1beta2
+- **apiVersion**: resource.k8s.io/v1
 
 - **kind**: ResourceClaimTemplate
 
@@ -49,13 +49,13 @@ ResourceClaimTemplate 用于生成 ResourceClaim 对象。
   标准的对象元数据。
 
 <!--
-- **spec** (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplateSpec" >}}">ResourceClaimTemplateSpec</a>), required
+- **spec** (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplateSpec" >}}">ResourceClaimTemplateSpec</a>), required
 
   Describes the ResourceClaim that is to be generated.
   
   This field is immutable. A ResourceClaim will get created by the control plane for a Pod when needed and then not get updated anymore.
 -->
-- **spec** (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplateSpec" >}}">ResourceClaimTemplateSpec</a>)，必需
+- **spec** (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplateSpec" >}}">ResourceClaimTemplateSpec</a>)，必需
 
   描述要生成的 ResourceClaim。
 
@@ -71,11 +71,11 @@ ResourceClaimTemplateSpec 包含针对 ResourceClaim 的元数据和字段。
 <hr>
 
 <!--
-- **spec** (<a href="{{< ref "../workload-resources/resource-claim-v1beta2#ResourceClaimSpec" >}}">ResourceClaimSpec</a>), required
+- **spec** (<a href="{{< ref "../workload-resources/resource-claim-v1#ResourceClaimSpec" >}}">ResourceClaimSpec</a>), required
 
   Spec for the ResourceClaim. The entire content is copied unchanged into the ResourceClaim that gets created from this template. The same fields as in a ResourceClaim are also valid here.
 -->
-- **spec** (<a href="{{< ref "../workload-resources/resource-claim-v1beta2#ResourceClaimSpec" >}}">ResourceClaimSpec</a>)，必需
+- **spec** (<a href="{{< ref "../workload-resources/resource-claim-v1#ResourceClaimSpec" >}}">ResourceClaimSpec</a>)，必需
 
   ResourceClaim 的规约。整个内容将不加修改地复制到从模板创建的 ResourceClaim 中。
   与 ResourceClaim 中相同的字段在此处也是有效的。
@@ -99,7 +99,7 @@ ResourceClaimTemplateList 是申领模板的集合。
 
 <hr>
 
-- **apiVersion**: resource.k8s.io/v1beta2
+- **apiVersion**: resource.k8s.io/v1
 
 - **kind**: ResourceClaimTemplateList
 
@@ -111,11 +111,11 @@ ResourceClaimTemplateList 是申领模板的集合。
   标准的列表元数据。
 
 <!--
-- **items** ([]<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>), required
+- **items** ([]<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>), required
 
   Items is the list of resource claim templates.
 -->
-- **items** ([]<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>)，必需
+- **items** ([]<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>)，必需
 
   items 是资源申领模板的列表。
 
@@ -136,7 +136,7 @@ ResourceClaimTemplateList 是申领模板的集合。
 
 #### HTTP 请求
 
-GET /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates/{name}
+GET /apis/resource.k8s.io/v1/namespaces/{namespace}/resourceclaimtemplates/{name}
 
 <!--
 #### Parameters
@@ -172,7 +172,7 @@ GET /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates/
 -->
 #### 响应
 
-200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): OK
+200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): OK
 
 401: Unauthorized
 
@@ -185,7 +185,7 @@ GET /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates/
 
 #### HTTP 请求
 
-GET /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates
+GET /apis/resource.k8s.io/v1/namespaces/{namespace}/resourceclaimtemplates
 
 <!--
 #### Parameters
@@ -293,7 +293,7 @@ GET /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates
 -->
 #### 响应
 
-200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplateList" >}}">ResourceClaimTemplateList</a>): OK
+200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplateList" >}}">ResourceClaimTemplateList</a>): OK
 
 401: Unauthorized
 
@@ -306,7 +306,7 @@ GET /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates
 
 #### HTTP 请求
 
-GET /apis/resource.k8s.io/v1beta2/resourceclaimtemplates
+GET /apis/resource.k8s.io/v1/resourceclaimtemplates
 
 <!--
 #### Parameters
@@ -406,7 +406,7 @@ GET /apis/resource.k8s.io/v1beta2/resourceclaimtemplates
 -->
 #### 响应
 
-200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplateList" >}}">ResourceClaimTemplateList</a>): OK
+200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplateList" >}}">ResourceClaimTemplateList</a>): OK
 
 401: Unauthorized
 
@@ -419,7 +419,7 @@ GET /apis/resource.k8s.io/v1beta2/resourceclaimtemplates
 
 #### HTTP 请求
 
-POST /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates
+POST /apis/resource.k8s.io/v1/namespaces/{namespace}/resourceclaimtemplates
 
 <!--
 #### Parameters
@@ -428,7 +428,7 @@ POST /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates
 
   <a href="{{< ref "../common-parameters/common-parameters#namespace" >}}">namespace</a>
 
-- **body**: <a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>, required
+- **body**: <a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>, required
 
 - **dryRun** (*in query*): string
 
@@ -452,7 +452,7 @@ POST /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates
 
   <a href="{{< ref "../common-parameters/common-parameters#namespace" >}}">namespace</a>
 
-- **body**: <a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>，必需
+- **body**: <a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>，必需
 
 - **dryRun** (**查询参数**): string
 
@@ -475,11 +475,11 @@ POST /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates
 -->
 #### 响应
 
-200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): OK
+200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): OK
 
-201 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): Created
+201 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): Created
 
-202 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): Accepted
+202 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): Accepted
 
 401: Unauthorized
 
@@ -492,7 +492,7 @@ POST /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates
 
 #### HTTP 请求
 
-PUT /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates/{name}
+PUT /apis/resource.k8s.io/v1/namespaces/{namespace}/resourceclaimtemplates/{name}
 
 <!--
 #### Parameters
@@ -505,7 +505,7 @@ PUT /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates/
 
   <a href="{{< ref "../common-parameters/common-parameters#namespace" >}}">namespace</a>
 
-- **body**: <a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>, required
+- **body**: <a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>, required
 
 - **dryRun** (*in query*): string
 
@@ -533,7 +533,7 @@ PUT /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates/
 
   <a href="{{< ref "../common-parameters/common-parameters#namespace" >}}">namespace</a>
 
-- **body**: <a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>，必需
+- **body**: <a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>，必需
 
 - **dryRun** (**查询参数**): string
 
@@ -556,9 +556,9 @@ PUT /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates/
 -->
 #### 响应
 
-200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): OK
+200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): OK
 
-201 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): Created
+201 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): Created
 
 401: Unauthorized
 
@@ -571,7 +571,7 @@ PUT /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates/
 
 #### HTTP 请求
 
-PATCH /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates/{name}
+PATCH /apis/resource.k8s.io/v1/namespaces/{namespace}/resourceclaimtemplates/{name}
 
 <!--
 #### Parameters
@@ -643,9 +643,9 @@ PATCH /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplate
 -->
 #### 响应
 
-200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): OK
+200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): OK
 
-201 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): Created
+201 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): Created
 
 401: Unauthorized
 
@@ -658,7 +658,7 @@ PATCH /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplate
 
 #### HTTP 请求
 
-DELETE /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates/{name}
+DELETE /apis/resource.k8s.io/v1/namespaces/{namespace}/resourceclaimtemplates/{name}
 
 <!--
 #### Parameters
@@ -730,9 +730,9 @@ DELETE /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplat
 -->
 #### 响应
 
-200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): OK
+200 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): OK
 
-202 (<a href="{{< ref "../workload-resources/resource-claim-template-v1beta2#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): Accepted
+202 (<a href="{{< ref "../workload-resources/resource-claim-template-v1#ResourceClaimTemplate" >}}">ResourceClaimTemplate</a>): Accepted
 
 401: Unauthorized
 
@@ -745,7 +745,7 @@ DELETE /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplat
 
 #### HTTP 请求
 
-DELETE /apis/resource.k8s.io/v1beta2/namespaces/{namespace}/resourceclaimtemplates
+DELETE /apis/resource.k8s.io/v1/namespaces/{namespace}/resourceclaimtemplates
 
 <!--
 #### Parameters