From 93e3e3853a257b11811dc9ae512395ec2ac69e36 Mon Sep 17 00:00:00 2001
From: Matthias Bastian <matthias.bastian@ionos.com>
Date: Mon, 17 Jul 2023 10:27:23 +0200
Subject: [PATCH] This change is limited to the zh-cn localization.

sync garbage-collection components feature-gates-removed feature-gates guaranteed-scheduling-critical-addon-pods
---
 .../zh-cn/docs/concepts/architecture/garbage-collection.md | 2 --
 content/zh-cn/docs/concepts/overview/components.md         | 7 +++++--
 .../command-line-tools-reference/feature-gates-removed.md  | 3 +--
 .../guaranteed-scheduling-critical-addon-pods.md           | 2 +-
 .../custom-resources/custom-resource-definitions.md        | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/content/zh-cn/docs/concepts/architecture/garbage-collection.md b/content/zh-cn/docs/concepts/architecture/garbage-collection.md
index 6fe985ffa2..50d9ac94cd 100644
--- a/content/zh-cn/docs/concepts/architecture/garbage-collection.md
+++ b/content/zh-cn/docs/concepts/architecture/garbage-collection.md
@@ -344,8 +344,6 @@ configure garbage collection:
 * [配置 Kubernetes 对象的级联删除](/zh-cn/docs/tasks/administer-cluster/use-cascading-deletion/)
 * [配置已完成 Job 的清理](/zh-cn/docs/concepts/workloads/controllers/ttlafterfinished/)
 
-<!-- * [Configuring unused container and image garbage collection](/docs/tasks/administer-cluster/reconfigure-kubelet/) -->
-
 ## {{% heading "whatsnext" %}}
 
 <!--
diff --git a/content/zh-cn/docs/concepts/overview/components.md b/content/zh-cn/docs/concepts/overview/components.md
index cccabcd323..d9f3885014 100644
--- a/content/zh-cn/docs/concepts/overview/components.md
+++ b/content/zh-cn/docs/concepts/overview/components.md
@@ -83,21 +83,24 @@ for an example control plane setup that runs across multiple machines.
 {{< glossary_definition term_id="kube-controller-manager" length="all" >}}
 
 <!--
-Some types of these controllers are:
+There are many different types of controllers. Some examples of them are:
 
   * Node controller: Responsible for noticing and responding when nodes go down.
   * Job controller: Watches for Job objects that represent one-off tasks, then creates
     Pods to run those tasks to completion.
   * EndpointSlice controller: Populates EndpointSlice objects (to provide a link between Services and Pods).
   * ServiceAccount controller: Create default ServiceAccounts for new namespaces.
+
+The above is not an exhaustive list.
 -->
-这些控制器包括：
+有许多不同类型的控制器。以下是一些例子：
 
 * 节点控制器（Node Controller）：负责在节点出现故障时进行通知和响应
 * 任务控制器（Job Controller）：监测代表一次性任务的 Job 对象，然后创建 Pods 来运行这些任务直至完成
 * 端点分片控制器（EndpointSlice controller）：填充端点分片（EndpointSlice）对象（以提供 Service 和 Pod 之间的链接）。
 * 服务账号控制器（ServiceAccount controller）：为新的命名空间创建默认的服务账号（ServiceAccount）。
 
+以上并不是一个详尽的列表。
 <!--
 ### cloud-controller-manager
 
diff --git a/content/zh-cn/docs/reference/command-line-tools-reference/feature-gates-removed.md b/content/zh-cn/docs/reference/command-line-tools-reference/feature-gates-removed.md
index 93c7e6ca61..78c76ca374 100644
--- a/content/zh-cn/docs/reference/command-line-tools-reference/feature-gates-removed.md
+++ b/content/zh-cn/docs/reference/command-line-tools-reference/feature-gates-removed.md
@@ -759,7 +759,7 @@ In the following table:
 
 - `DynamicKubeletConfig`: Enable the dynamic configuration of kubelet. The
   feature is no longer supported outside of supported skew policy. The feature
-  gate was removed from kubelet in 1.24. See [Reconfigure kubelet](/docs/tasks/administer-cluster/reconfigure-kubelet/).
+  gate was removed from kubelet in 1.24.
 
 - `DynamicProvisioningScheduling`: Extend the default scheduler to be aware of
   volume topology and handle PV provisioning.
@@ -772,7 +772,6 @@ In the following table:
 
 - `DynamicKubeletConfig`：启用 kubelet 的动态配置。
   除偏差策略场景外，不再支持该功能。该特性门控在 kubelet 1.24 版本中已被移除。
-  请参阅[重新配置 kubelet](/zh-cn/docs/tasks/administer-cluster/reconfigure-kubelet/)。
 
 - `DynamicProvisioningScheduling`：扩展默认调度器以了解卷拓扑并处理 PV 制备。
   此特性已在 v1.12 中完全被 `VolumeScheduling` 特性取代。
diff --git a/content/zh-cn/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md b/content/zh-cn/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md
index d6459bfb60..cceff6f923 100644
--- a/content/zh-cn/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md
+++ b/content/zh-cn/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md
@@ -31,7 +31,7 @@ Pod 占用；由于其它原因导致节点上可用资源的总量发生变化
 
 <!--
 Note that marking a pod as critical is not meant to prevent evictions entirely; it only prevents the pod from becoming permanently unavailable.
-A static pod marked as critical, can't be evicted. However, a non-static pods marked as critical are always rescheduled.
+A static pod marked as critical can't be evicted. However, non-static pods marked as critical are always rescheduled.
 -->
 注意，把某个 Pod 标记为关键 Pod 并不意味着完全避免该 Pod 被逐出；它只能防止该 Pod 变成永久不可用。
 被标记为关键性的静态 Pod 不会被逐出。但是，被标记为关键性的非静态 Pod 总是会被重新调度。
diff --git a/content/zh-cn/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions.md b/content/zh-cn/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions.md
index 62041dac59..782495ba1b 100644
--- a/content/zh-cn/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions.md
+++ b/content/zh-cn/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions.md
@@ -2531,7 +2531,7 @@ To enable the scale subresource, the following fields are defined in the CustomR
   `Scale.Status.Selector`.
 
   - It is an optional value.
-  - It must be set to work with HPA.
+  - It must be set to work with HPA and VPA.
   - Only JSONPaths under `.status` or `.spec` and with the dot notation are allowed.
   - If there is no value under the `labelSelectorPath` in the custom resource,
     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
 - `labelSelectorPath` 指定定制资源内与 `Scale.Status.Selector` 对应的 JSON 路径。
 
   - 此字段为可选值。
-  - 此字段必须设置才能使用 HPA。
+  - 此字段必须设置才能使用 HPA 和 VPA。
   - 只可以使用 `.status` 或 `.spec` 下的 JSON 路径，只可使用带句点的路径。
   - 如果定制资源的 `labelSelectorPath` 下没有取值，则针对 `/scale`
     子资源的选择算符状态值默认为空字符串。