Skip to content

Commit 6df575b

Browse files
authored
Merge pull request #40157 from asa3311/Reference-files-to-sync-task-2
[zh-cn]Reference files to sync task 3
2 parents 14f41ca + 3ee9fb8 commit 6df575b

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

content/zh-cn/docs/reference/kubernetes-api/common-parameters/common-parameters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ api_metadata:
66
content_type: "api_reference"
77
description: ""
88
title: "常用参数"
9-
weight: 10
9+
weight: 11
1010
auto_generated: true
1111
---
1212

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,36 +136,36 @@ NetworkPolicySpec 定义特定 NetworkPolicy 所需的所有信息.
136136
IPBlock defines policy on a particular IPBlock. If this field is set then neither of the other fields can be.
137137
138138
<a name="IPBlock"></a>
139-
*IPBlock describes a particular CIDR (Ex. "192.168.1.1/24","2001:db9::/64") that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should not be included within this rule.*
139+
*IPBlock describes a particular CIDR (Ex. "192.168.1.0/24","2001:db8::/64") that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should not be included within this rule.*
140140
-->
141141

142142
- **ingress.from.ipBlock** (IPBlock)
143143

144144
IPBlock 针对特定的 IP CIDR 范围设置策略。如果设置了此字段,则不可以设置其他字段。
145145

146146
<a name="IPBlock"></a>
147-
IPBlock 定义一个特定的 CIDR 范围(例如 `192.168.1.1/24``2001:db9::/64`),
147+
IPBlock 定义一个特定的 CIDR 范围(例如 `192.168.1.0/24``2001:db8::/64`),
148148
来自这个 IP 范围的流量来源将会被允许访问与 NetworkPolicySpec 的 podSelector 匹配的 Pod 集合。
149149
except 字段则设置应排除在此规则之外的 CIDR 范围。
150150

151151
<!--
152152
- **ingress.from.ipBlock.cidr** (string), required
153153
154-
CIDR is a string representing the IP Block Valid examples are "192.168.1.1/24" or "2001:db9::/64"
154+
CIDR is a string representing the IP Block Valid examples are "192.168.1.0/24" or "2001:db8::/64"
155155
156156
- **ingress.from.ipBlock.except** ([]string)
157157
158-
Except is a slice of CIDRs that should not be included within an IP Block Valid examples are "192.168.1.1/24" or "2001:db9::/64" Except values will be rejected if they are outside the CIDR range
158+
Except is a slice of CIDRs that should not be included within an IP Block Valid examples are "192.168.1.0/24" or "2001:db8::/64" Except values will be rejected if they are outside the CIDR range
159159
-->
160160
161161
- **ingress.from.ipBlock.cidr** (string),必需
162162

163-
CIDR 是指定 IP 组块的字符串,例如 `"192.168.1.1/24"``"2001:db9::/64"`
163+
CIDR 是指定 IP 组块的字符串,例如 `"192.168.1.0/24"``"2001:db8::/64"`
164164

165165
- **ingress.from.ipBlock.except** ([]string)
166166

167167
except 是一个由 CIDR 范围组成的列表,其中指定的 CIDR 都应排除在此 IP 区块范围之外。
168-
例如 `"192.168.1.1/24"``"2001:db9::/64"`
168+
例如 `"192.168.1.0/24"``"2001:db8::/64"`
169169
如果 except 字段的值超出 ipBlock.cidr 的范围则被视为无效策略。
170170

171171
<!--
@@ -302,35 +302,35 @@ NetworkPolicySpec 定义特定 NetworkPolicy 所需的所有信息.
302302
IPBlock defines policy on a particular IPBlock. If this field is set then neither of the other fields can be.
303303
304304
<a name="IPBlock"></a>
305-
*IPBlock describes a particular CIDR (Ex. "192.168.1.1/24","2001:db9::/64") that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should not be included within this rule.*
305+
*IPBlock describes a particular CIDR (Ex. "192.168.1.0/24","2001:db8::/64") that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should not be included within this rule.*
306306
-->
307307

308308
- **egress.to.ipBlock** (IPBlock)
309309

310310
ipBlock 针对特定的 IP 区块定义策略。如果设置了此字段,则其他不可以设置其他字段。
311311

312312
<a name="IPBlock"></a>
313-
**IPBlock 描述一个特定的 CIDR 范围(例如 `192.168.1.1/24``2001:db9::/64`),
313+
**IPBlock 描述一个特定的 CIDR 范围(例如 `192.168.1.0/24``2001:db8::/64`),
314314
与 NetworkPolicySpec 的 podSelector 匹配的 Pod 将被允许连接到这个 IP 范围,作为其出口流量目的地。
315315
except 字段则设置了不被此规则影响的 CIDR 范围。**
316316

317317
<!--
318318
- **egress.to.ipBlock.cidr** (string), required
319319
320-
CIDR is a string representing the IP Block Valid examples are "192.168.1.1/24" or "2001:db9::/64"
320+
CIDR is a string representing the IP Block Valid examples are "192.168.1.0/24" or "2001:db8::/64"
321321
322322
- **egress.to.ipBlock.except** ([]string)
323323
324-
Except is a slice of CIDRs that should not be included within an IP Block Valid examples are "192.168.1.1/24" or "2001:db9::/64" Except values will be rejected if they are outside the CIDR range
324+
Except is a slice of CIDRs that should not be included within an IP Block Valid examples are "192.168.1.0/24" or "2001:db8::/64" Except values will be rejected if they are outside the CIDR range
325325
-->
326326

327327
- **egress.to.ipBlock.cidr** (string),必需
328328

329-
CIDR 是用来表达 IP 组块的字符串,例如 `"192.168.1.1/24"``"2001:db9::/64"`
329+
CIDR 是用来表达 IP 组块的字符串,例如 `"192.168.1.0/24"``"2001:db8::/64"`
330330

331331
- **egress.to.ipBlock.except** ([]string)
332332

333-
except 定义不应包含在 ipBlock 内的 CIDR 范围列表。例如 `"192.168.1.1/24"``"2001:db9::/64"`
333+
except 定义不应包含在 ipBlock 内的 CIDR 范围列表。例如 `"192.168.1.0/24"``"2001:db8::/64"`
334334
如果 except 的值超出 ipBlock.cidr 的范围则被拒绝。
335335

336336
<!--

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,24 +119,22 @@ EndpointSlice 是实现某 Service 的端点的子集。一个 Service 可以有
119119
- **endpoints.conditions.serving** (boolean)
120120

121121
<!--
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. This field can be enabled with the EndpointSliceTerminatingCondition feature gate.
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.
123123
-->
124124
125125
serving 和 ready 非常相似。唯一的不同在于,
126126
即便某端点的状态为 Terminating 也可以设置 serving。
127127
对于处在终止过程中的就绪端点,此状况应被设置为 “true”。
128128
如果设置为 nil,则消费者应该以 ready 值为准。
129-
可以在 EndpointSliceTerminatingCondition 特性开关中启用此字段。
130129

131130
- **endpoints.conditions.terminating** (boolean)
132131

133132
<!--
134-
terminating indicates that this endpoint is terminating. A nil value indicates an unknown state. Consumers should interpret this unknown state to mean that the endpoint is not terminating. This field can be enabled with the EndpointSliceTerminatingCondition feature gate.
133+
terminating indicates that this endpoint is terminating. A nil value indicates an unknown state. Consumers should interpret this unknown state to mean that the endpoint is not terminating.
135134
-->
136135
137136
terminating 说明当前端点正在终止过程中。nil 值表示状态未知。
138137
消费者应将这种未知状态视为端点并不处于终止过程中。
139-
可以通过 EndpointSliceTerminatingCondition 特性门控启用此字段。
140138

141139
- **endpoints.deprecatedTopology** (map[string]string)
142140

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -363,33 +363,35 @@ ServiceSpec 描述用户在服务上创建的属性。
363363
- **externalTrafficPolicy** (string)
364364

365365
<!--
366-
externalTrafficPolicy denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints. "Local" preserves the client source IP and avoids a second hop for LoadBalancer and Nodeport type services, but risks potentially imbalanced traffic spreading. "Cluster" obscures the client source IP and may cause a second hop to another node, but should have good overall load-spreading.
366+
externalTrafficPolicy describes how nodes distribute service traffic they receive on one of the Service's "externally-facing" addresses (NodePorts, ExternalIPs, and LoadBalancer IPs). If set to "Local", the proxy will configure the service in a way that assumes that external load balancers will take care of balancing the service traffic between nodes, and so each node will deliver traffic only to the node-local endpoints of the service, without masquerading the client source IP. (Traffic mistakenly sent to a node with no endpoints will be dropped.) The default value, "Cluster", uses the standard behavior of routing to all endpoints evenly (possibly modified by topology and other features). Note that traffic sent to an External IP or LoadBalancer IP from within the cluster will always get "Cluster" semantics, but clients sending to a NodePort from within the cluster may need to take traffic policy into account when picking a node.
367367
-->
368-
externalTrafficPolicy 表示此 Service 是否希望将外部流量路由到节点本地或集群范围的 Endpoint。
369-
字段值 “Local” 保留客户端 IP 并可避免 LoadBalancer 和 Nodeport 类型 Service 的第二跳,但存在潜在流量传播不平衡的风险。
370-
字段值 “Cluster” 则会掩盖客户端源 IP,可能会导致第二次跳转到另一个节点,但整体流量负载分布较好。
368+
externalTrafficPolicy 描述了节点如何分发它们在 Service 的“外部访问”地址(NodePort、ExternalIP 和 LoadBalancer IP)接收到的服务流量。
369+
如果设置为“Local”,代理将以一种假设外部负载均衡器将负责在节点之间服务流量负载均衡,因此每个节点将仅向服务的节点本地端点传递流量,而不会伪装客户端源 IP。
370+
(将丢弃错误发送到没有端点的节点的流量。)
371+
“Cluster”默认值使用负载均衡路由到所有端点的策略(可能会根据拓扑和其他特性进行修改)。
372+
请注意,从集群内部发送到 External IP 或 LoadBalancer IP 的流量始终具有“Cluster”语义,但是从集群内部发送到 NodePort 的客户端需要在选择节点时考虑流量路由策略。
371373

372374
- **internalTrafficPolicy** (string)
373375

374376
<!--
375-
InternalTrafficPolicy specifies if the cluster internal traffic should be routed to all endpoints or node-local endpoints only. "Cluster" routes internal traffic to a Service to all endpoints. "Local" routes traffic to node-local endpoints only, traffic is dropped if no node-local endpoints are ready. The default value is "Cluster".
377+
InternalTrafficPolicy describes how nodes distribute service traffic they receive on the ClusterIP. If set to "Local", the proxy will assume that pods only want to talk to endpoints of the service on the same node as the pod, dropping the traffic if there are no local endpoints. The default value, "Cluster", uses the standard behavior of routing to all endpoints evenly (possibly modified by topology and other features).
376378
-->
377-
internalTrafficPolicy 指定是将集群内部流量路由到所有端点还是仅路由到节点本地的端点。
378-
字段值 “Cluster” 将 Service 的内部流量路由到所有端点。
379-
字段值 ”Local” 意味着仅将流量路由到节点本地的端点;如果节点本地端点未准备好,则丢弃流量。
380-
默认值为 “Cluster”。
379+
InternalTrafficPolicy描述节点如何分发它们在ClusterIP上接收到的服务流量。
380+
如果设置为"Local",代理将假定pod只想与在同一节点上的服务端点通信,如果没有本地端点,它将丢弃流量。
381+
"Cluster"默认将流量路由到所有端点(可能会根据拓扑和其他特性进行修改)。
381382

382383
- **healthCheckNodePort** (int32)
383384

384385
<!--
385-
healthCheckNodePort specifies the healthcheck nodePort for the service. This only applies when type is set to LoadBalancer and externalTrafficPolicy is set to Local. If a value is specified, is in-range, and is not in use, it will be used. If not specified, a value will be automatically allocated. External systems (e.g. load-balancers) can use this port to determine if a given node holds endpoints for this service or not. If this field is specified when creating a Service which does not need it, creation will fail. This field will be wiped when updating a Service to no longer need it (e.g. changing type).
386+
healthCheckNodePort specifies the healthcheck nodePort for the service. This only applies when type is set to LoadBalancer and externalTrafficPolicy is set to Local. If a value is specified, is in-range, and is not in use, it will be used. If not specified, a value will be automatically allocated. External systems (e.g. load-balancers) can use this port to determine if a given node holds endpoints for this service or not. If this field is specified when creating a Service which does not need it, creation will fail. This field will be wiped when updating a Service to no longer need it (e.g. changing type). This field cannot be updated once set.
386387
-->
387388
healthCheckNodePort 指定 Service 的健康检查节点端口。
388389
仅适用于 type 为 LoadBalancer 且 externalTrafficPolicy 设置为 Local 的情况。
389390
如果为此字段设定了一个值,该值在合法范围内且没有被使用,则使用所指定的值。
390391
如果未设置此字段,则自动分配字段值。外部系统(例如负载平衡器)可以使用此端口来确定给定节点是否拥有此服务的端点。
391392
在创建不需要 healthCheckNodePort 的 Service 时指定了此字段,则 Service 创建会失败。
392393
要移除 healthCheckNodePort,需要更改 Service 的 type。
394+
该字段一旦设置就无法更改。
393395

394396
- **publishNotReadyAddresses** (boolean)
395397

0 commit comments

Comments
 (0)