Skip to content

Commit e015289

Browse files
authored
Merge pull request #53174 from asa3311/sync-zh-201
[zh] sync endpoint-slice pod-lifecycle extend-service-ip-ranges
2 parents eb59bc6 + 3a249d1 commit e015289

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

content/zh-cn/docs/concepts/services-networking/endpoint-slices.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,7 @@ description: >-
2828

2929
{{< feature-state for_k8s_version="v1.21" state="stable" >}}
3030

31-
<!--
32-
Kubernetes' _EndpointSlice_ API provides a way to track network endpoints
33-
within a Kubernetes cluster.
34-
-->
35-
Kubernetes 的 _EndpointSlice_ API 提供了一种简单的方法来跟踪
36-
Kubernetes 集群中的网络端点(network endpoints)。
31+
{{< glossary_definition term_id="endpoint-slice" length="short" >}}
3732

3833
<!-- body -->
3934

content/zh-cn/docs/concepts/workloads/pods/pod-lifecycle.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,9 +1163,9 @@ containers:
11631163

11641164
`readinessProbe`
11651165
: Indicates whether the container is ready to respond to requests.
1166-
If the readiness probe fails, the EndpointSlice controller removes the Pod's IP
1167-
address from the EndpointSlices of all Services that match the Pod. The default
1168-
state of readiness before the initial delay is `Failure`. If a container does
1166+
If the readiness probe fails, the {{< glossary_tooltip term_id="endpoint-slice" text="EndpointSlice" >}}
1167+
controller removes the Pod's IP address from the EndpointSlices of all Services that match the Pod.
1168+
The default state of readiness before the initial delay is `Failure`. If a container does
11691169
not provide a readiness probe, the default state is `Success`.
11701170

11711171
`startupProbe`
@@ -1183,7 +1183,8 @@ containers:
11831183

11841184
`readinessProbe`
11851185
: 指示容器是否准备好为请求提供服务。如果就绪态探测失败,
1186-
EndpointSlice 控制器将从与该 Pod 匹配的所有 Service 的 EndpointSlice 中删除该 Pod 的 IP 地址。
1186+
{{< glossary_tooltip term_id="endpoint-slice" text="EndpointSlice" >}}
1187+
控制器将从与该 Pod 匹配的所有 Service 的 EndpointSlice 中删除该 Pod 的 IP 地址。
11871188
初始延迟之前的就绪态的状态值默认为 `Failure`。
11881189
如果容器不提供就绪态探针,则默认状态为 `Success`。
11891190

content/zh-cn/docs/tasks/network/extend-service-ip-ranges.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ While you can use this feature with an earlier version, the feature is only GA a
4747
<!--
4848
Kubernetes clusters with kube-apiservers that have enabled the `MultiCIDRServiceAllocator`
4949
[feature gate](/docs/reference/command-line-tools-reference/feature-gates/) and have the
50-
`networking.k8s.io/v1beta1` API group active, will create a ServiceCIDR object that takes
50+
`networking.k8s.io/v1` API group active, will create a ServiceCIDR object that takes
5151
the well-known name `kubernetes`, and that specifies an IP address range
5252
based on the value of the `--service-cluster-ip-range` command line argument to kube-apiserver.
5353
-->
5454
如果 Kubernetes 集群的 kube-apiserver 启用了 `MultiCIDRServiceAllocator`
5555
[特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)且激活了
56-
`networking.k8s.io/v1beta1` API 组,集群将创建一个新的 ServiceCIDR 对象,
56+
`networking.k8s.io/v1` API 组,集群将创建一个新的 ServiceCIDR 对象,
5757
该对象采用 `kubernetes` 这个众所周知的名称并基于 kube-apiserver 的 `--service-cluster-ip-range`
5858
命令行参数的值来使用 IP 地址范围。
5959

@@ -159,7 +159,7 @@ that extends or adds new IP address ranges.
159159

160160
```sh
161161
cat <EOF | kubectl apply -f -
162-
apiVersion: networking.k8s.io/v1beta1
162+
apiVersion: networking.k8s.io/v1
163163
kind: ServiceCIDR
164164
metadata:
165165
name: newcidr1
@@ -216,7 +216,7 @@ kubectl get servicecidr newcidr1 -o yaml
216216
```
217217

218218
```yaml
219-
apiVersion: networking.k8s.io/v1beta1
219+
apiVersion: networking.k8s.io/v1
220220
kind: ServiceCIDR
221221
metadata:
222222
creationTimestamp: "2023-10-12T15:11:07Z"
@@ -353,7 +353,7 @@ spec:
353353
matchConstraints:
354354
resourceRules:
355355
- apiGroups: ["networking.k8s.io"]
356-
apiVersions: ["v1","v1beta1"]
356+
apiVersions: ["v1"]
357357
operations: ["CREATE", "UPDATE"]
358358
resources: ["servicecidrs"]
359359
matchConditions:
@@ -403,7 +403,7 @@ spec:
403403
matchConstraints:
404404
resourceRules:
405405
- apiGroups: ["networking.k8s.io"]
406-
apiVersions: ["v1","v1beta1"]
406+
apiVersions: ["v1"]
407407
operations: ["CREATE", "UPDATE"]
408408
resources: ["servicecidrs"]
409409
validations:

0 commit comments

Comments
 (0)