Skip to content

Commit 561dda4

Browse files
authored
Merge pull request #42057 from asa3311/sync-zh-30
[zh] sync garbage-collection components feature-gates-removed guaranteed-scheduling-critical-addon-pods custom-resource-definitions
2 parents cd9fca9 + 93e3e38 commit 561dda4

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

content/zh-cn/docs/concepts/architecture/garbage-collection.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,6 @@ configure garbage collection:
344344
* [配置 Kubernetes 对象的级联删除](/zh-cn/docs/tasks/administer-cluster/use-cascading-deletion/)
345345
* [配置已完成 Job 的清理](/zh-cn/docs/concepts/workloads/controllers/ttlafterfinished/)
346346

347-
<!-- * [Configuring unused container and image garbage collection](/docs/tasks/administer-cluster/reconfigure-kubelet/) -->
348-
349347
## {{% heading "whatsnext" %}}
350348

351349
<!--

content/zh-cn/docs/concepts/overview/components.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,24 @@ for an example control plane setup that runs across multiple machines.
8383
{{< glossary_definition term_id="kube-controller-manager" length="all" >}}
8484

8585
<!--
86-
Some types of these controllers are:
86+
There are many different types of controllers. Some examples of them are:
8787
8888
* Node controller: Responsible for noticing and responding when nodes go down.
8989
* Job controller: Watches for Job objects that represent one-off tasks, then creates
9090
Pods to run those tasks to completion.
9191
* EndpointSlice controller: Populates EndpointSlice objects (to provide a link between Services and Pods).
9292
* ServiceAccount controller: Create default ServiceAccounts for new namespaces.
93+
94+
The above is not an exhaustive list.
9395
-->
94-
这些控制器包括
96+
有许多不同类型的控制器。以下是一些例子
9597

9698
* 节点控制器(Node Controller):负责在节点出现故障时进行通知和响应
9799
* 任务控制器(Job Controller):监测代表一次性任务的 Job 对象,然后创建 Pods 来运行这些任务直至完成
98100
* 端点分片控制器(EndpointSlice controller):填充端点分片(EndpointSlice)对象(以提供 Service 和 Pod 之间的链接)。
99101
* 服务账号控制器(ServiceAccount controller):为新的命名空间创建默认的服务账号(ServiceAccount)。
100102

103+
以上并不是一个详尽的列表。
101104
<!--
102105
### cloud-controller-manager
103106

content/zh-cn/docs/reference/command-line-tools-reference/feature-gates-removed.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ In the following table:
759759
760760
- `DynamicKubeletConfig`: Enable the dynamic configuration of kubelet. The
761761
feature is no longer supported outside of supported skew policy. The feature
762-
gate was removed from kubelet in 1.24. See [Reconfigure kubelet](/docs/tasks/administer-cluster/reconfigure-kubelet/).
762+
gate was removed from kubelet in 1.24.
763763
764764
- `DynamicProvisioningScheduling`: Extend the default scheduler to be aware of
765765
volume topology and handle PV provisioning.
@@ -772,7 +772,6 @@ In the following table:
772772

773773
- `DynamicKubeletConfig`:启用 kubelet 的动态配置。
774774
除偏差策略场景外,不再支持该功能。该特性门控在 kubelet 1.24 版本中已被移除。
775-
请参阅[重新配置 kubelet](/zh-cn/docs/tasks/administer-cluster/reconfigure-kubelet/)
776775

777776
- `DynamicProvisioningScheduling`:扩展默认调度器以了解卷拓扑并处理 PV 制备。
778777
此特性已在 v1.12 中完全被 `VolumeScheduling` 特性取代。

content/zh-cn/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Pod 占用;由于其它原因导致节点上可用资源的总量发生变化
3131

3232
<!--
3333
Note that marking a pod as critical is not meant to prevent evictions entirely; it only prevents the pod from becoming permanently unavailable.
34-
A static pod marked as critical, can't be evicted. However, a non-static pods marked as critical are always rescheduled.
34+
A static pod marked as critical can't be evicted. However, non-static pods marked as critical are always rescheduled.
3535
-->
3636
注意,把某个 Pod 标记为关键 Pod 并不意味着完全避免该 Pod 被逐出;它只能防止该 Pod 变成永久不可用。
3737
被标记为关键性的静态 Pod 不会被逐出。但是,被标记为关键性的非静态 Pod 总是会被重新调度。

content/zh-cn/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2531,7 +2531,7 @@ To enable the scale subresource, the following fields are defined in the CustomR
25312531
`Scale.Status.Selector`.
25322532
25332533
- It is an optional value.
2534-
- It must be set to work with HPA.
2534+
- It must be set to work with HPA and VPA.
25352535
- Only JSONPaths under `.status` or `.spec` and with the dot notation are allowed.
25362536
- If there is no value under the `labelSelectorPath` in the custom resource,
25372537
the status selector value in the `/scale` subresource will default to the empty string.
@@ -2541,7 +2541,7 @@ To enable the scale subresource, the following fields are defined in the CustomR
25412541
- `labelSelectorPath` 指定定制资源内与 `Scale.Status.Selector` 对应的 JSON 路径。
25422542
25432543
- 此字段为可选值。
2544-
- 此字段必须设置才能使用 HPA。
2544+
- 此字段必须设置才能使用 HPA 和 VPA
25452545
- 只可以使用 `.status` 或 `.spec` 下的 JSON 路径,只可使用带句点的路径。
25462546
- 如果定制资源的 `labelSelectorPath` 下没有取值,则针对 `/scale`
25472547
子资源的选择算符状态值默认为空字符串。

0 commit comments

Comments
 (0)