Merge pull request #49168 from my-git9/pp-24834

[zh-cn]sync scheduling-framework kubeadm_upgrade_node_phase_addon names
kubernetes · Dec 23, 2024 · 30c4bac · 30c4bac
2 parents 0c019f6 + c6d5ff5
commit 30c4bac
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 13 deletions.
diff --git a/content/zh-cn/docs/concepts/overview/working-with-objects/names.md b/content/zh-cn/docs/concepts/overview/working-with-objects/names.md
@@ -63,6 +63,19 @@ In cases when objects represent a physical entity, like a Node representing a ph
 则 Kubernetes 会将新的主机看作是老的主机，这可能会带来某种不一致性。
 {{< /note >}}
 
+<!--
+The server may generate a name when `generateName` is provided instead of `name` in a resource create request.
+When `generateName` is used, the provided value is used as a name prefix, which server appends a generated suffix
+to. Even though the name is generated, it may conflict with existing names resulting in a HTTP 409 resopnse. This
+became far less likely to happen in Kubernetes v1.31 and later, since the server will make up to 8 attempt to generate a
+unique name before returning a HTTP 409 response.
+-->
+当在资源创建请求中提供 `generateName` 而不是 `name` 时，服务器可能会生成一个名称。
+使用 `generateName` 时，所提供的值将作为名称前缀，服务器会在其后附加一个生成的后缀。
+即使名称是自动生成的，它仍可能与现有名称冲突，从而导致 HTTP 409 响应。
+从 Kubernetes v1.31 及更高版本开始，这种情况发生的概率大大降低，
+因为服务器会尝试最多 8 次生成唯一名称，然后才返回 HTTP 409 响应。
+
 <!--
 Below are four types of commonly used name constraints for resources.
 -->

diff --git a/content/zh-cn/docs/concepts/scheduling-eviction/scheduling-framework.md b/content/zh-cn/docs/concepts/scheduling-eviction/scheduling-framework.md
@@ -141,7 +141,7 @@ Pod。实现 PreEnqueue、PreFilter、Filter、Reserve 或 Permit 的插件应
 
 ### QueueingHint
 
-{{< feature-state for_k8s_version="v1.28" state="beta" >}}
+{{< feature-state for_k8s_version="v1.32" state="beta" >}}
 
 <!--
 QueueingHint is a callback function for deciding whether a Pod can be requeued to the active queue or backoff queue.
@@ -157,23 +157,15 @@ QueueingHint 作为一个回调函数，用于决定是否将 Pod 重新排队
 
 {{< note >}}
 <!--
-QueueingHint evaluation during scheduling is a beta-level feature.
-The v1.28 release series initially enabled the associated feature gate; however, after the
-discovery of an excessive memory footprint, the Kubernetes project set that feature gate
-to be disabled by default. In Kubernetes {{< skew currentVersion >}}, this feature gate is
-disabled and you need to enable it manually.
-You can enable it via the
+In Kubernetes {{< skew currentVersion >}}, this feature gate is enabled by default,
+and you can disable it via the
 `SchedulerQueueingHints` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/).
 -->
-在调度过程中对 QueueingHint 求值是一个 Beta 级别的特性。
-v1.28 的系列小版本最初都开启了这个特性的门控；但是发现了内存占用过多的问题，
-于是 Kubernetes 项目将该特性门控设置为默认禁用。
-在 Kubernetes 的 {{< skew currentVersion >}} 版本中，这个特性门控被禁用，你需要手动开启它。
+在 Kubernetes 的 {{< skew currentVersion >}} 版本中，此特性门控默认启用，
 你可以通过 `SchedulerQueueingHints`
-[特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)来启用它。
+[特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)来禁用它。
 {{< /note >}}
 
-
 <!--
 ### QueueSort {#queue-sort}
 -->

diff --git a/...tup-tools/kubeadm/generated/kubeadm_upgrade/kubeadm_upgrade_node_phase_addon.md b/...tup-tools/kubeadm/generated/kubeadm_upgrade/kubeadm_upgrade_node_phase_addon.md
@@ -0,0 +1,75 @@
+<!--
+Upgrade the default kubeadm addons
+-->
+升级默认的 kubeadm 插件
+
+<!--
+### Synopsis
+-->
+### 概要
+
+<!--
+Upgrade the default kubeadm addons
+-->
+升级默认的 kubeadm 插件
+
+```shell
+kubeadm upgrade node phase addon [flags]
+```
+
+<!--
+### Options
+-->
+### 选项
+
+   <table style="width: 100%; table-layout: fixed;">
+<colgroup>
+<col span="1" style="width: 10px;" />
+<col span="1" />
+</colgroup>
+<tbody>
+
+<tr>
+<td colspan="2">-h, --help</td>
+</tr>
+<tr>
+<td></td><td style="line-height: 130%; word-wrap: break-word;">
+<!--
+help for addon
+-->
+<p>
+addon 操作的帮助命令。
+</p>
+</td>
+</tr>
+
+</tbody>
+</table>
+
+<!--
+### Options inherited from parent commands
+-->
+### 从父命令继承的选项
+
+   <table style="width: 100%; table-layout: fixed;">
+<colgroup>
+<col span="1" style="width: 10px;" />
+<col span="1" />
+</colgroup>
+<tbody>
+
+<tr>
+<td colspan="2">--rootfs string</td>
+</tr>
+<tr>
+<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
+<!--
+The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
+-->
+到“真实”主机根文件系统的路径。设置此参数将导致 kubeadm 切换到所提供的路径。
+</p>
+</td>
+</tr>
+
+</tbody>
+</table>