Skip to content

Commit abc9553

Browse files
author
zhuzhenghao
committed
sync minor differences in /concepts
1 parent 68750e7 commit abc9553

File tree

3 files changed

+49
-52
lines changed

3 files changed

+49
-52
lines changed

content/zh-cn/docs/concepts/architecture/cloud-controller.md

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -308,45 +308,46 @@ rules:
308308
## {{% heading "whatsnext" %}}
309309
310310
<!--
311-
[Cloud Controller Manager Administration](/docs/tasks/administer-cluster/running-cloud-controller/#cloud-controller-manager)
312-
has instructions on running and managing the cloud controller manager.
311+
* [Cloud Controller Manager Administration](/docs/tasks/administer-cluster/running-cloud-controller/#cloud-controller-manager)
312+
has instructions on running and managing the cloud controller manager.
313313
314-
To upgrade a HA control plane to use the cloud controller manager, see
315-
[Migrate Replicated Control Plane To Use Cloud Controller Manager](/docs/tasks/administer-cluster/controller-manager-leader-migration/).
314+
* To upgrade a HA control plane to use the cloud controller manager, see
315+
[Migrate Replicated Control Plane To Use Cloud Controller Manager](/docs/tasks/administer-cluster/controller-manager-leader-migration/).
316316
317-
Want to know how to implement your own cloud controller manager, or extend an existing project?
317+
* Want to know how to implement your own cloud controller manager, or extend an existing project?
318318
-->
319-
[云控制器管理器的管理](/zh-cn/docs/tasks/administer-cluster/running-cloud-controller/#cloud-controller-manager)
319+
* [云控制器管理器的管理](/zh-cn/docs/tasks/administer-cluster/running-cloud-controller/#cloud-controller-manager)
320320
给出了运行和管理云控制器管理器的指南。
321321
322-
要升级 HA 控制平面以使用云控制器管理器,
322+
* 要升级 HA 控制平面以使用云控制器管理器,
323323
请参见[将复制的控制平面迁移以使用云控制器管理器](/zh-cn/docs/tasks/administer-cluster/controller-manager-leader-migration/)。
324324
325-
想要了解如何实现自己的云控制器管理器,或者对现有项目进行扩展么?
326-
327-
<!--
328-
The cloud controller manager uses Go interfaces to allow implementations from any cloud to be plugged in.
329-
Specifically, it uses the `CloudProvider` interface defined in
330-
[`cloud.go`](https://github.com/kubernetes/cloud-provider/blob/release-1.26/cloud.go#L43-L69) from
331-
[kubernetes/cloud-provider](https://github.com/kubernetes/cloud-provider).
332-
-->
333-
云控制器管理器使用 Go 语言的接口,从而使得针对各种云平台的具体实现都可以接入。
334-
其中使用了在 [kubernetes/cloud-provider](https://github.com/kubernetes/cloud-provider)
335-
项目中 [`cloud.go`](https://github.com/kubernetes/cloud-provider/blob/release-1.26/cloud.go#L43-L69)
336-
文件所定义的 `CloudProvider` 接口。
337-
338-
<!--
339-
The implementation of the shared controllers highlighted in this document (Node, Route, and Service),
340-
and some scaffolding along with the shared cloudprovider interface, is part of the Kubernetes core.
341-
Implementations specific to cloud providers are outside the core of Kubernetes and implement the
342-
`CloudProvider` interface.
343-
344-
For more information about developing plugins, see
345-
[Developing Cloud Controller Manager](/docs/tasks/administer-cluster/developing-cloud-controller-manager/).
346-
-->
347-
本文中列举的共享控制器(节点控制器、路由控制器和服务控制器等)的实现以及其他一些生成具有
348-
CloudProvider 接口的框架的代码,都是 Kubernetes 的核心代码。
349-
特定于云驱动的实现虽不是 Kubernetes 核心成分,仍要实现 `CloudProvider` 接口。
350-
351-
关于如何开发插件的详细信息,
352-
可参考[开发云控制器管理器](/zh-cn/docs/tasks/administer-cluster/developing-cloud-controller-manager/)文档。
325+
* 想要了解如何实现自己的云控制器管理器,或者对现有项目进行扩展么?
326+
327+
<!--
328+
- The cloud controller manager uses Go interfaces, specifically, `CloudProvider` interface defined in
329+
[`cloud.go`](https://github.com/kubernetes/cloud-provider/blob/release-1.21/cloud.go#L42-L69)
330+
from [kubernetes/cloud-provider](https://github.com/kubernetes/cloud-provider) to allow
331+
implementations from any cloud to be plugged in.
332+
-->
333+
- 云控制器管理器使用 Go 语言的接口(具体指在
334+
[kubernetes/cloud-provider](https://github.com/kubernetes/cloud-provider)
335+
项目中 [`cloud.go`](https://github.com/kubernetes/cloud-provider/blob/release-1.26/cloud.go#L43-L69)
336+
文件中所定义的 `CloudProvider` 接口),从而使得针对各种云平台的具体实现都可以接入。
337+
338+
<!--
339+
- The implementation of the shared controllers highlighted in this document (Node, Route, and Service),
340+
and some scaffolding along with the shared cloudprovider interface, is part of the Kubernetes core.
341+
Implementations specific to cloud providers are outside the core of Kubernetes and implement
342+
the `CloudProvider` interface.
343+
-->
344+
- 本文中列举的共享控制器(节点控制器、路由控制器和服务控制器等)的实现以及其他一些生成具有
345+
CloudProvider 接口的框架的代码,都是 Kubernetes 的核心代码。
346+
特定于云驱动的实现虽不是 Kubernetes 核心成分,仍要实现 `CloudProvider` 接口。
347+
348+
<!--
349+
- For more information about developing plugins,
350+
see [Developing Cloud Controller Manager](/docs/tasks/administer-cluster/developing-cloud-controller-manager/).
351+
-->
352+
- 关于如何开发插件的详细信息,
353+
可参考[开发云控制器管理器](/zh-cn/docs/tasks/administer-cluster/developing-cloud-controller-manager/)文档。

content/zh-cn/docs/concepts/configuration/manage-resources-containers.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ For example, XFS and ext4fs offer project quotas.
810810
项目配额(Project Quota)是一个操作系统层的功能特性,用来管理文件系统中的存储用量。
811811
在 Kubernetes 中,你可以启用项目配额以监视存储用量。
812812
你需要确保节点上为 `emptyDir` 提供存储的文件系统支持项目配额。
813-
例如,XFS 和 ext4fs 文件系统都支持项目配额。
813+
例如,XFS 和 ext4fs 文件系统都支持项目配额。
814814

815815
{{< note >}}
816816
<!--
@@ -1038,7 +1038,7 @@ extender.
10381038
"apiVersion": "v1",
10391039
"extenders": [
10401040
{
1041-
"urlPrefix":"<extender-endpoint>",
1041+
"urlPrefix": "<extender-endpoint>",
10421042
"bindVerb": "bind",
10431043
"managedResources": [
10441044
{
@@ -1289,10 +1289,10 @@ resource, including a configured ResourceQuota.
12891289
包括所配置的 ResourceQuota。
12901290

12911291
<!--
1292-
### My Container is terminated
1292+
### My container is terminated
12931293
12941294
Your container might get terminated because it is resource-starved. To check
1295-
whether a Container is being killed because it is hitting a resource limit, call
1295+
whether a container is being killed because it is hitting a resource limit, call
12961296
`kubectl describe pod` on the Pod of interest:
12971297
-->
12981298

@@ -1384,4 +1384,3 @@ memory limit (and possibly request) for that container.
13841384
* 阅读 XFS 中[配额](https://xfs.org/index.php/XFS_FAQ#Q:_Quota:_Do_quotas_work_on_XFS.3F)的文档
13851385
* 进一步阅读 [kube-scheduler 配置参考 (v1beta3)](/zh-cn/docs/reference/config-api/kube-scheduler-config.v1beta3/)
13861386
* 进一步阅读 [Pod 的服务质量等级](/zh-cn/docs/concepts/workloads/pods/pod-qos/)
1387-

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: EndpointSlice
33
content_type: concept
4-
weight: 45
4+
weight: 60
55
description: >-
66
EndpointSlice API 是 Kubernetes 用于扩缩 Service
77
以处理大量后端的机制,还允许集群高效更新其健康后端的列表。
@@ -12,7 +12,7 @@ reviewers:
1212
- freehan
1313
title: EndpointSlices
1414
content_type: concept
15-
weight: 45
15+
weight: 60
1616
description: >-
1717
The EndpointSlice API is the mechanism that Kubernetes uses to let your Service
1818
scale to handle large numbers of backends, and allows the cluster to update its
@@ -161,18 +161,18 @@ Services will always have the `ready` condition set to `true`.
161161
<!--
162162
#### Serving
163163

164-
{{< feature-state for_k8s_version="v1.22" state="beta" >}}
164+
{{< feature-state for_k8s_version="v1.26" state="stable" >}}
165165

166-
`serving` is identical to the `ready` condition, except it does not account for terminating states.
167-
Consumers of the EndpointSlice API should check this condition if they care about pod readiness while
166+
The `serving` condition is almost identical to the `ready` condition. The difference is that
167+
consumers of the EndpointSlice API should check the `serving` condition if they care about pod readiness while
168168
the pod is also terminating.
169169
-->
170170
#### Serving(服务中)
171171

172-
{{< feature-state for_k8s_version="v1.22" state="beta" >}}
172+
{{< feature-state for_k8s_version="v1.26" state="stable" >}}
173173

174-
`serving` 状况与 `ready` 状况相同,不同之处在于它不考虑终止状态。
175-
如果 EndpointSlice API 的使用者关心 Pod 终止时的就绪情况,就应检查此状况
174+
`serving` 状况几乎与 `ready` 状况相同,不同之处在于它不考虑终止状态。
175+
如果 EndpointSlice API 的使用者关心 Pod 终止时的就绪情况,就应检查 `serving` 状况
176176

177177
{{< note >}}
178178
<!--
@@ -191,7 +191,7 @@ for terminating pods independent of the existing semantics for `ready`.
191191
的现有语义来跟踪处于终止中的 Pod 的就绪情况。
192192
{{< /note >}}
193193

194-
<!--
194+
<!--
195195
#### Terminating
196196

197197
{{< feature-state for_k8s_version="v1.22" state="beta" >}}
@@ -470,7 +470,6 @@ less noticeable; even then, some use cases of Kubernetes weren't well served.
470470
对象可能变得非常巨大。对于保持稳定的服务(长时间使用同一组端点),影响不太明显;
471471
即便如此,Kubernetes 的一些使用场景也没有得到很好的服务。
472472

473-
474473
<!--
475474
When a Service had a lot of backend endpoints and the workload was either
476475
scaling frequently, or rolling out new changes frequently, each update to
@@ -507,5 +506,3 @@ EndpointSlices 还支持围绕双栈网络和拓扑感知路由等新功能的
507506
* 遵循[使用 Service 连接到应用](/zh-cn/docs/tutorials/services/connect-applications-service/)教程
508507
* 阅读 EndpointSlice API 的 [API 参考](/zh-cn/docs/reference/kubernetes-api/service-resources/endpoint-slice-v1/)
509508
* 阅读 Endpoints API 的 [API 参考](/zh-cn/docs/reference/kubernetes-api/service-resources/endpoints-v1/)
510-
511-

0 commit comments

Comments
 (0)