Skip to content

Commit 21a84f7

Browse files
authored
Merge pull request #41194 from Zhuzhenghao/1.27/policy-resources
[zh] resync 1.27 policy resources/ & endpoint-slice-v1.md
2 parents 91a6691 + 88998d4 commit 21a84f7

File tree

4 files changed

+92
-24
lines changed

4 files changed

+92
-24
lines changed

content/zh-cn/docs/reference/kubernetes-api/policy-resources/limit-range-v1.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,10 @@ GET /api/v1/namespaces/{namespace}/limitranges
256256

257257
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
258258

259+
- **sendInitialEvents** (**查询参数**): boolean
260+
261+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
262+
259263
- **timeoutSeconds** (**查询参数**): integer
260264

261265
<a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>
@@ -327,6 +331,10 @@ GET /api/v1/limitranges
327331

328332
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
329333

334+
- **sendInitialEvents** (**查询参数**): boolean
335+
336+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
337+
330338
- **timeoutSeconds** (**查询参数**): integer
331339

332340
<a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>
@@ -645,6 +653,10 @@ DELETE /api/v1/namespaces/{namespace}/limitranges
645653

646654
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
647655

656+
- **sendInitialEvents** (**查询参数**): boolean
657+
658+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
659+
648660
- **timeoutSeconds** (**查询参数**): integer
649661

650662
<a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>

content/zh-cn/docs/reference/kubernetes-api/policy-resources/pod-disruption-budget-v1.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,16 @@ PodDisruptionBudgetStatus 表示有关此 PodDisruptionBudget 状态的信息。
196196

197197
当前允许的 Pod 干扰计数。
198198

199+
<!--
200+
- **expectedPods** (int32), required
201+
202+
total number of pods counted by this disruption budget
203+
-->
204+
205+
- **expectedPods** (int32), 必需
206+
207+
此干扰预算计入的 Pod 总数
208+
199209
- **conditions** ([]Condition)
200210

201211
<!--
@@ -532,7 +542,8 @@ GET /apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets
532542

533543
<a href="{{< ref "../common-parameters/common-parameters#continue" >}}">continue</a>
534544

535-
<!-- - **fieldSelector** (*in query*): string
545+
<!--
546+
- **fieldSelector** (*in query*): string
536547
537548
<a href="{{< ref "../common-parameters/common-parameters#fieldSelector" >}}">fieldSelector</a>
538549
-->
@@ -585,6 +596,10 @@ GET /apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets
585596

586597
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
587598

599+
- **sendInitialEvents** (**查询参数**): boolean
600+
601+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
602+
588603
<!--
589604
- **timeoutSeconds** (*in query*): integer
590605
@@ -700,6 +715,10 @@ GET /apis/policy/v1/poddisruptionbudgets
700715

701716
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
702717

718+
- **sendInitialEvents** (**查询参数**): boolean
719+
720+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
721+
703722
<!--
704723
- **timeoutSeconds** (*in query*): integer
705724
@@ -1364,6 +1383,10 @@ DELETE /apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets
13641383

13651384
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
13661385

1386+
- **sendInitialEvents** (**查询参数**): boolean
1387+
1388+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
1389+
13671390
<!--
13681391
- **timeoutSeconds** (*in query*): integer
13691392

content/zh-cn/docs/reference/kubernetes-api/policy-resources/resource-quota-v1.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,10 @@ GET /api/v1/namespaces/{namespace}/resourcequotas
341341

342342
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
343343

344+
- **sendInitialEvents** (**查询参数**): boolean
345+
346+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
347+
344348
- **timeoutSeconds****查询参数**): integer
345349

346350
<a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>
@@ -407,6 +411,10 @@ GET /api/v1/resourcequotas
407411

408412
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
409413

414+
- **sendInitialEvents** (**查询参数**): boolean
415+
416+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
417+
410418
- **timeoutSeconds****查询参数**): integer
411419

412420
<a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>
@@ -817,6 +825,10 @@ DELETE /api/v1/namespaces/{namespace}/resourcequotas
817825

818826
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
819827

828+
- **sendInitialEvents** (*查询参数*): boolean
829+
830+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
831+
820832
- **timeoutSeconds****查询参数**): integer
821833

822834
<a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>

content/zh-cn/docs/reference/kubernetes-api/service-resources/endpoint-slice-v1.md

Lines changed: 44 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,10 @@ EndpointSlice 是实现某 Service 的端点的子集。一个 Service 可以有
4141
- **addressType** (string), <!--required-->必需
4242

4343
<!--
44-
addressType specifies the type of address carried by this EndpointSlice. All addresses in this slice must be the same type. This field is immutable after creation.
44+
addressType specifies the type of address carried by this EndpointSlice. All addresses in this slice must be the same type. This field is immutable after creation. The following address types are currently supported: * IPv4: Represents an IPv4 Address. * IPv6: Represents an IPv6 Address. * FQDN: Represents a Fully Qualified Domain Name.
4545
-->
4646
addressType 指定当前 EndpointSlice 携带的地址类型。一个 EndpointSlice 只能携带同一类型的地址。
4747
EndpointSlice 对象创建完成后不可以再更改 addressType 字段。
48-
49-
<!--
50-
The following address types are currently supported: * IPv4: Represents an IPv4 Address. * IPv6: Represents an IPv6 Address. * FQDN: Represents a Fully Qualified Domain Name.
51-
-->
5248
目前支持的地址类型为:
5349

5450
* IPv4:表示 IPv4 地址。
@@ -109,17 +105,18 @@ EndpointSlice 是实现某 Service 的端点的子集。一个 Service 可以有
109105
- **endpoints.conditions.ready** (boolean)
110106

111107
<!--
112-
ready indicates that this endpoint is prepared to receive traffic, according to whatever system is managing the endpoint. A nil value indicates an unknown state. In most cases consumers should interpret this unknown state as ready. For compatibility reasons, ready should never be "true" for terminating endpoints.
108+
ready indicates that this endpoint is prepared to receive traffic, according to whatever system is managing the endpoint. A nil value indicates an unknown state. In most cases consumers should interpret this unknown state as ready. For compatibility reasons, ready should never be "true" for terminating endpoints, except when the normal readiness behavior is being explicitly overridden, for example when the associated Service has set the publishNotReadyAddresses flag.
113109
-->
114110
115111
ready 说明此端点已经准备好根据相关的系统映射接收流量。nil 值表示状态未知。
116112
在大多数情况下,消费者应将这种未知状态视为就绪(ready)。
117-
考虑到兼容性,对于正在结束状态下的端点,永远不能将 ready 设置为“true”。
113+
考虑到兼容性,对于正在结束状态下的端点,永远不能将 ready 设置为“true”,
114+
除非正常的就绪行为被显式覆盖,例如当关联的服务设置了 publishNotReadyAddresses 标志时。
118115

119116
- **endpoints.conditions.serving** (boolean)
120117

121118
<!--
122-
Serving is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition.
119+
serving is identical to ready except that it is set regardless of the terminating state of endpoints. This condition should be set to true for a ready endpoint that is terminating. If nil, consumers should defer to the ready condition.
123120
-->
124121
125122
serving 和 ready 非常相似。唯一的不同在于,
@@ -139,7 +136,7 @@ EndpointSlice 是实现某 Service 的端点的子集。一个 Service 可以有
139136
- **endpoints.deprecatedTopology** (map[string]string)
140137

141138
<!--
142-
deprecatedTopology contains topology information part of the v1beta1 API. This field is deprecated, and will be removed when the v1beta1 API is removed (no sooner than kubernetes v1.24). While this field can hold values, it is not writable through the v1 API, and any attempts to write to it will be silently ignored. Topology information can be found in the zone and nodeName fields instead.
139+
deprecatedTopology contains topology information part of the v1beta1 API. This field is deprecated, and will be removed when the v1beta1 API is removed (no sooner than kubernetes v1.24). While this field can hold values, it is not writable through the v1 API, and any attempts to write to it will be silently ignored. Topology information can be found in the zone and nodeName fields instead.
143140
-->
144141

145142
deprecatedTopology 包含 v1beta1 API 的拓扑信息部分。目前已经弃用了此字段,
@@ -255,26 +252,26 @@ EndpointSlice 是实现某 Service 的端点的子集。一个 Service 可以有
255252
- **ports.port** (int32)
256253

257254
<!--
258-
The port number of the endpoint. If this is not specified, ports are not restricted and must be interpreted in the context of the specific consumer.
255+
port represents the port number of the endpoint. If this is not specified, ports are not restricted and must be interpreted in the context of the specific consumer.
259256
-->
260257

261-
端点的端口号。如果未指定,就不限制端口,且必须根据消费者的具体环境进行解释。
258+
port 表示端点的端口号。如果未指定,就不限制端口,且必须根据消费者的具体环境进行解释。
262259

263260
- **ports.protocol** (string)
264261

265262
<!--
266-
The IP protocol for this port. Must be UDP, TCP, or SCTP. Default is TCP.
263+
protocol represents the IP protocol for this port. Must be UDP, TCP, or SCTP. Default is TCP.
267264
-->
268265

269-
此端口的 IP 协议。必须为 UDP、TCP 或 SCTP。默认为 TCP。
266+
protocol 表示此端口的 IP 协议。必须为 UDP、TCP 或 SCTP。默认为 TCP。
270267

271268
- **ports.name** (string)
272269

273270
<!--
274-
The name of this port. All ports in an EndpointSlice must have a unique name. If the EndpointSlice is dervied from a Kubernetes service, this corresponds to the Service.ports[].name. Name must either be an empty string or pass DNS_LABEL validation: * must be no more than 63 characters long. * must consist of lower case alphanumeric characters or '-'. * must start and end with an alphanumeric character. Default is empty string.
271+
name represents the name of this port. All ports in an EndpointSlice must have a unique name. If the EndpointSlice is dervied from a Kubernetes service, this corresponds to the Service.ports[].name. Name must either be an empty string or pass DNS_LABEL validation: * must be no more than 63 characters long. * must consist of lower case alphanumeric characters or '-'. * must start and end with an alphanumeric character. Default is empty string.
275272
-->
276273

277-
此端口的名称。EndpointSlice 中所有端口的名称都不得重复。
274+
name 表示此端口的名称。EndpointSlice 中所有端口的名称都不得重复。
278275
如果 EndpointSlice 是基于 Kubernetes Service 创建的,
279276
那么此端口的名称和 Service.ports[].name 字段的值一致。默认为空字符串。
280277
名称必须是空字符串,或者必须通过 DNS_LABEL 验证:
@@ -286,12 +283,25 @@ EndpointSlice 是实现某 Service 的端点的子集。一个 Service 可以有
286283
- **ports.appProtocol** (string)
287284

288285
<!--
289-
The application protocol for this port. This field follows standard Kubernetes label syntax. Un-prefixed names are reserved for IANA standard service names (as per RFC-6335 and https://www.iana.org/assignments/service-names). Non-standard protocols should use prefixed names such as mycompany.com/my-custom-protocol.
290-
-->
286+
The application protocol for this port. This is used as a hint for implementations to offer richer behavior for protocols that they understand. This field follows standard Kubernetes label syntax. Valid values are either:
287+
288+
* Un-prefixed protocol names - reserved for IANA standard service names (as per RFC-6335 and https://www.iana.org/assignments/service-names).
291289
292-
此端口的应用层协议。此字段遵循标准的 Kubernetes Label 句法。
293-
不带前缀的名称是 IANA 标准服务的保留名称(参见 RFC-6335 和 https://www.iana.org/assignments/service-names)。
294-
非标准协议应该使用带前缀的名称,例如 mycompany.com/my-custom-protocol。
290+
* Kubernetes-defined prefixed names:
291+
* 'kubernetes.io/h2c' - HTTP/2 over cleartext as described in https://www.rfc-editor.org/rfc/rfc7540
292+
293+
* Other protocols should use implementation-defined prefixed names such as mycompany.com/my-custom-protocol.
294+
-->
295+
296+
此端口的应用层协议。字段值被用作提示,允许协议实现为其所理解的协议提供更丰富的行为。
297+
此字段遵循标准的 Kubernetes 标签句法。有效的取值是:
298+
299+
* 不带前缀的协议名 - 是 IANA 标准服务的保留名称(参见 RFC-6335 和 https://www.iana.org/assignments/service-names)。
300+
301+
* Kubernetes 定义的前缀名称:
302+
* 'kubernetes.io/h2c' - 使用明文的 HTTP/2 协议,详见 https://www.rfc-editor.org/rfc/rfc7540
303+
304+
* 其他协议应该使用带前缀的名称,例如 mycompany.com/my-custom-protocol。
295305

296306
## EndpointSliceList {#EndpointSliceList}
297307

@@ -316,9 +326,9 @@ EndpointSliceList 是 EndpointSlice 的列表。
316326
- **items** ([]<a href="{{< ref "../service-resources/endpoint-slice-v1#EndpointSlice" >}}">EndpointSlice</a>), <!--required-->必需
317327

318328
<!--
319-
List of endpoint slices
329+
items is the list of endpoint slices
320330
-->
321-
EndpointSlice 列表
331+
items 是 EndpointSlice 列表
322332

323333
<!--
324334
## Operations {#Operations}
@@ -457,11 +467,14 @@ GET /apis/discovery.k8s.io/v1/namespaces/{namespace}/endpointslices
457467

458468
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
459469

470+
- **sendInitialEvents** (**查询参数**): boolean
471+
472+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
460473

461474
<!--
462475
- **timeoutSeconds** (*in query*): integer
463476
-->
464-
- **timeoutSeconds** (*查询参数*):integer
477+
- **timeoutSeconds** (**查询参数**):integer
465478

466479
<a href="{{< ref "../common-parameters/common-parameters#timeoutSeconds" >}}">timeoutSeconds</a>
467480

@@ -552,6 +565,10 @@ GET /apis/discovery.k8s.io/v1/endpointslices
552565

553566
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
554567

568+
- **sendInitialEvents** (**查询参数**): boolean
569+
570+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
571+
555572
<!--
556573
- **timeoutSeconds** (*in query*): integer
557574
-->
@@ -968,6 +985,10 @@ DELETE /apis/discovery.k8s.io/v1/namespaces/{namespace}/endpointslices
968985

969986
<a href="{{< ref "../common-parameters/common-parameters#resourceVersionMatch" >}}">resourceVersionMatch</a>
970987

988+
- **sendInitialEvents** (**查询参数**): boolean
989+
990+
<a href="{{< ref "../common-parameters/common-parameters#sendInitialEvents" >}}">sendInitialEvents</a>
991+
971992
<!--
972993
- **timeoutSeconds** (*in query*): integer
973994
-->

0 commit comments

Comments
 (0)