Skip to content

Commit 64abf2c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #40141 from asa3311/Reference-files-to-sync-for-1.26-task-2
[zh-cn]Reference files to sync task 2
2 parents 6df575b + 1808373 commit 64abf2c

File tree

5 files changed

+165
-108
lines changed

5 files changed

+165
-108
lines changed

‎content/zh-cn/docs/reference/kubernetes-api/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Kubernetes API
3-
weight: 30
3+
weight: 50
44
---
55

66
<!-- overview -->

‎content/zh-cn/docs/reference/kubernetes-api/authentication-resources/token-request-v1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ TokenRequestSpec 包含客户端提供的令牌请求参数。
7070
<!--
7171
- **audiences** ([]string), required
7272
73-
Audiences are the intendend audiences of the token. A recipient of a token must identitfy themself with an identifier in the list of audiences of the token, and otherwise should reject the token. A token issued for multiple audiences may be used to authenticate against any of the audiences listed but implies a high degree of trust between the target audiences.
73+
Audiences are the intendend audiences of the token. A recipient of a token must identify themself with an identifier in the list of audiences of the token, and otherwise should reject the token. A token issued for multiple audiences may be used to authenticate against any of the audiences listed but implies a high degree of trust between the target audiences.
7474
-->
7575
- **audiences** ([]string)，必需
7676

‎content/zh-cn/docs/reference/kubernetes-api/cluster-resources/flow-schema-v1beta2.md renamed to ‎content/zh-cn/docs/reference/kubernetes-api/cluster-resources/flow-schema-v1beta3.md

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
---
22
api_metadata:
3-
apiVersion: "flowcontrol.apiserver.k8s.io/v1beta2"
4-
import: "k8s.io/api/flowcontrol/v1beta2"
3+
apiVersion: "flowcontrol.apiserver.k8s.io/v1beta3"
4+
import: "k8s.io/api/flowcontrol/v1beta3"
55
kind: "FlowSchema"
66
content_type: "api_reference"
77
description: "FlowSchema 定义一组流的模式。"
8-
title: "FlowSchema v1beta2"
8+
title: "FlowSchema v1beta3"
99
weight: 7
10+
auto_generated: true
1011
---
1112
<!--
1213
api_metadata:
13-
apiVersion: "flowcontrol.apiserver.k8s.io/v1beta2"
14-
import: "k8s.io/api/flowcontrol/v1beta2"
14+
apiVersion: "flowcontrol.apiserver.k8s.io/v1beta3"
15+
import: "k8s.io/api/flowcontrol/v1beta3"
1516
kind: "FlowSchema"
1617
content_type: "api_reference"
1718
description: "FlowSchema defines the schema of a group of flows."
18-
title: "FlowSchema v1beta2"
19+
title: "FlowSchema v1beta3"
1920
weight: 7
2021
auto_generated: true
2122
-->
2223

23-
`apiVersion: flowcontrol.apiserver.k8s.io/v1beta2`
24+
`apiVersion: flowcontrol.apiserver.k8s.io/v1beta3`
2425

25-
`import "k8s.io/api/flowcontrol/v1beta2"`
26+
`import "k8s.io/api/flowcontrol/v1beta3"`
2627

2728
## FlowSchema {#FlowSchema}
2829

@@ -34,7 +35,7 @@ FlowSchema 定义一组流的模式。请注意，一个流由属性类似的一
3435

3536
<hr>
3637

37-
- **apiVersion**: flowcontrol.apiserver.k8s.io/v1beta2
38+
- **apiVersion**: flowcontrol.apiserver.k8s.io/v1beta3
3839

3940
- **kind**: FlowSchema
4041

@@ -43,7 +44,7 @@ FlowSchema 定义一组流的模式。请注意，一个流由属性类似的一
4344
4445
`metadata` is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
4546
46-
- **spec** (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchemaSpec" >}}">FlowSchemaSpec</a>)
47+
- **spec** (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchemaSpec" >}}">FlowSchemaSpec</a>)
4748
4849
`spec` is the specification of the desired behavior of a FlowSchema. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
4950
-->
@@ -52,17 +53,17 @@ FlowSchema 定义一组流的模式。请注意，一个流由属性类似的一
5253
`metadata` 是标准的对象元数据。更多信息：
5354
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
5455

55-
- **spec** (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchemaSpec" >}}">FlowSchemaSpec</a>)
56+
- **spec** (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchemaSpec" >}}">FlowSchemaSpec</a>)
5657

5758
`spec` 是 FlowSchema 预期行为的规约。更多信息：
5859
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
5960

6061
<!--
61-
- **status** (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchemaStatus" >}}">FlowSchemaStatus</a>)
62+
- **status** (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchemaStatus" >}}">FlowSchemaStatus</a>)
6263
6364
`status` is the current status of a FlowSchema. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
6465
-->
65-
- **status** (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchemaStatus" >}}">FlowSchemaStatus</a>)
66+
- **status** (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchemaStatus" >}}">FlowSchemaStatus</a>)
6667

6768
`status` 是 FlowSchema 的当前状态。更多信息：
6869
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
@@ -451,6 +452,8 @@ FlowSchemaStatus 表示 FlowSchema 的当前状态。
451452
<!--
452453
- **conditions** ([]FlowSchemaCondition)
453454
455+
*Patch strategy: merge on key `type`*
456+
454457
*Map: unique values on key type will be kept during a merge*
455458
456459
`conditions` is a list of the current states of FlowSchema.
@@ -460,6 +463,8 @@ FlowSchemaStatus 表示 FlowSchema 的当前状态。
460463
-->
461464
- **conditions** ([]FlowSchemaCondition)
462465

466+
**补丁策略：根据键 type 合并**
467+
463468
**Map：合并期间保留根据键 type 保留其唯一值**
464469

465470
`conditions` 是 FlowSchema 当前状况的列表。
@@ -529,7 +534,7 @@ FlowSchemaList 是 FlowSchema 对象的列表。
529534

530535
<hr>
531536

532-
- **apiVersion**: flowcontrol.apiserver.k8s.io/v1beta2
537+
- **apiVersion**: flowcontrol.apiserver.k8s.io/v1beta3
533538

534539
- **kind**: FlowSchemaList
535540

@@ -538,7 +543,7 @@ FlowSchemaList 是 FlowSchema 对象的列表。
538543
539544
`metadata` is the standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
540545
541-
- **items** ([]<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>), required
546+
- **items** ([]<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>), required
542547
543548
`items` is a list of FlowSchemas.
544549
-->
@@ -547,7 +552,7 @@ FlowSchemaList 是 FlowSchema 对象的列表。
547552
`metadata` 是标准的列表元数据。更多信息：
548553
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
549554

550-
- **items** ([]<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>)，必需
555+
- **items** ([]<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>)，必需
551556

552557
`items` 是 FlowSchemas 的列表。
553558

@@ -565,7 +570,7 @@ FlowSchemaList 是 FlowSchema 对象的列表。
565570

566571
#### HTTP 请求
567572

568-
GET /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
573+
GET /apis/flowcontrol.apiserver.k8s.io/v1beta3/flowschemas/{name}
569574

570575
<!--
571576
#### Parameters
@@ -588,7 +593,7 @@ GET /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
588593
-->
589594
#### 响应
590595

591-
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): OK
596+
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): OK
592597

593598
401: Unauthorized
594599

@@ -600,7 +605,7 @@ GET /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
600605

601606
#### HTTP 请求
602607

603-
GET /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status
608+
GET /apis/flowcontrol.apiserver.k8s.io/v1beta3/flowschemas/{name}/status
604609

605610
<!--
606611
#### Parameters
@@ -623,7 +628,7 @@ GET /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status
623628
-->
624629
#### 响应
625630

626-
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): OK
631+
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): OK
627632

628633
401: Unauthorized
629634

@@ -635,7 +640,7 @@ GET /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status
635640

636641
#### HTTP 请求
637642

638-
GET /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas
643+
GET /apis/flowcontrol.apiserver.k8s.io/v1beta3/flowschemas
639644

640645
<!--
641646
#### Parameters
@@ -697,7 +702,7 @@ GET /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas
697702
-->
698703
#### 响应
699704

700-
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchemaList" >}}">FlowSchemaList</a>): OK
705+
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchemaList" >}}">FlowSchemaList</a>): OK
701706

702707
401: Unauthorized
703708

@@ -709,19 +714,19 @@ GET /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas
709714

710715
#### HTTP 请求
711716

712-
POST /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas
717+
POST /apis/flowcontrol.apiserver.k8s.io/v1beta3/flowschemas
713718

714719
<!--
715720
#### Parameters
716-
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>, required
721+
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>, required
717722
- **dryRun** (*in query*): string
718723
- **fieldManager** (*in query*): string
719724
- **fieldValidation** (*in query*): string
720725
- **pretty** (*in query*): string
721726
-->
722727
#### 参数
723728

724-
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>，必需
729+
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>，必需
725730

726731
- **dryRun** (**查询参数**): string
727732

@@ -744,11 +749,11 @@ POST /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas
744749
-->
745750
#### 响应
746751

747-
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): OK
752+
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): OK
748753

749-
201 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): Created
754+
201 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): Created
750755

751-
202 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): Accepted
756+
202 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): Accepted
752757

753758
401: Unauthorized
754759

@@ -760,13 +765,13 @@ POST /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas
760765

761766
#### HTTP 请求
762767

763-
PUT /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
768+
PUT /apis/flowcontrol.apiserver.k8s.io/v1beta3/flowschemas/{name}
764769

765770
<!--
766771
#### Parameters
767772
- **name** (*in path*): string, required
768773
name of the FlowSchema
769-
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>, required
774+
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>, required
770775
- **dryRun** (*in query*): string
771776
- **fieldManager** (*in query*): string
772777
- **fieldValidation** (*in query*): string
@@ -778,7 +783,7 @@ PUT /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
778783

779784
FlowSchema 的名称
780785

781-
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>，必需
786+
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>，必需
782787

783788
- **dryRun** (**查询参数**): string
784789

@@ -801,9 +806,9 @@ PUT /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
801806
-->
802807
#### 响应
803808

804-
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): OK
809+
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): OK
805810

806-
201 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): Created
811+
201 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): Created
807812

808813
401: Unauthorized
809814

@@ -815,13 +820,13 @@ PUT /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
815820

816821
#### HTTP 请求
817822

818-
PUT /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status
823+
PUT /apis/flowcontrol.apiserver.k8s.io/v1beta3/flowschemas/{name}/status
819824

820825
<!--
821826
#### Parameters
822827
- **name** (*in path*): string, required
823828
name of the FlowSchema
824-
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>, required
829+
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>, required
825830
- **dryRun** (*in query*): string
826831
- **fieldManager** (*in query*): string
827832
- **fieldValidation** (*in query*): string
@@ -833,7 +838,7 @@ PUT /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status
833838

834839
FlowSchema 的名称
835840

836-
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>，必需
841+
- **body**: <a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>，必需
837842

838843
- **dryRun** (**查询参数**): string
839844

@@ -856,9 +861,9 @@ PUT /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status
856861
-->
857862
#### 响应
858863

859-
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): OK
864+
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): OK
860865

861-
201 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): Created
866+
201 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): Created
862867

863868
401: Unauthorized
864869

@@ -870,7 +875,7 @@ PUT /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status
870875

871876
#### HTTP 请求
872877

873-
PATCH /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
878+
PATCH /apis/flowcontrol.apiserver.k8s.io/v1beta3/flowschemas/{name}
874879

875880
<!--
876881
#### Parameters
@@ -916,9 +921,9 @@ PATCH /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
916921
-->
917922
#### 响应
918923

919-
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): OK
924+
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): OK
920925

921-
201 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): Created
926+
201 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): Created
922927

923928
401: Unauthorized
924929

@@ -930,7 +935,7 @@ PATCH /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
930935

931936
#### HTTP 请求
932937

933-
PATCH /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status
938+
PATCH /apis/flowcontrol.apiserver.k8s.io/v1beta3/flowschemas/{name}/status
934939

935940
<!--
936941
#### Parameters
@@ -976,9 +981,9 @@ PATCH /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status
976981
-->
977982
#### 响应
978983

979-
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): OK
984+
200 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): OK
980985

981-
201 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta2#FlowSchema" >}}">FlowSchema</a>): Created
986+
201 (<a href="{{< ref "../cluster-resources/flow-schema-v1beta3#FlowSchema" >}}">FlowSchema</a>): Created
982987

983988
401: Unauthorized
984989

@@ -990,7 +995,7 @@ PATCH /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status
990995

991996
#### HTTP 请求
992997

993-
DELETE /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
998+
DELETE /apis/flowcontrol.apiserver.k8s.io/v1beta3/flowschemas/{name}
994999

9951000
<!--
9961001
#### Parameters
@@ -1045,7 +1050,7 @@ DELETE /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}
10451050

10461051
#### HTTP 请求
10471052

1048-
DELETE /apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas
1053+
DELETE /apis/flowcontrol.apiserver.k8s.io/v1beta3/flowschemas
10491054

10501055
<!--
10511056
#### Parameters

0 commit comments

Comments
 (0)