Skip to content

Commit 30c4bac

Browse files
authored
Merge pull request #49168 from my-git9/pp-24834
[zh-cn]sync scheduling-framework kubeadm_upgrade_node_phase_addon names
2 parents 0c019f6 + c6d5ff5 commit 30c4bac

File tree

3 files changed

+93
-13
lines changed

3 files changed

+93
-13
lines changed

content/zh-cn/docs/concepts/overview/working-with-objects/names.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,19 @@ In cases when objects represent a physical entity, like a Node representing a ph
6363
则 Kubernetes 会将新的主机看作是老的主机,这可能会带来某种不一致性。
6464
{{< /note >}}
6565

66+
<!--
67+
The server may generate a name when `generateName` is provided instead of `name` in a resource create request.
68+
When `generateName` is used, the provided value is used as a name prefix, which server appends a generated suffix
69+
to. Even though the name is generated, it may conflict with existing names resulting in a HTTP 409 resopnse. This
70+
became far less likely to happen in Kubernetes v1.31 and later, since the server will make up to 8 attempt to generate a
71+
unique name before returning a HTTP 409 response.
72+
-->
73+
当在资源创建请求中提供 `generateName` 而不是 `name` 时,服务器可能会生成一个名称。
74+
使用 `generateName` 时,所提供的值将作为名称前缀,服务器会在其后附加一个生成的后缀。
75+
即使名称是自动生成的,它仍可能与现有名称冲突,从而导致 HTTP 409 响应。
76+
从 Kubernetes v1.31 及更高版本开始,这种情况发生的概率大大降低,
77+
因为服务器会尝试最多 8 次生成唯一名称,然后才返回 HTTP 409 响应。
78+
6679
<!--
6780
Below are four types of commonly used name constraints for resources.
6881
-->

content/zh-cn/docs/concepts/scheduling-eviction/scheduling-framework.md

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Pod。实现 PreEnqueue、PreFilter、Filter、Reserve 或 Permit 的插件应
141141

142142
### QueueingHint
143143

144-
{{< feature-state for_k8s_version="v1.28" state="beta" >}}
144+
{{< feature-state for_k8s_version="v1.32" state="beta" >}}
145145

146146
<!--
147147
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 重新排队
157157

158158
{{< note >}}
159159
<!--
160-
QueueingHint evaluation during scheduling is a beta-level feature.
161-
The v1.28 release series initially enabled the associated feature gate; however, after the
162-
discovery of an excessive memory footprint, the Kubernetes project set that feature gate
163-
to be disabled by default. In Kubernetes {{< skew currentVersion >}}, this feature gate is
164-
disabled and you need to enable it manually.
165-
You can enable it via the
160+
In Kubernetes {{< skew currentVersion >}}, this feature gate is enabled by default,
161+
and you can disable it via the
166162
`SchedulerQueueingHints` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/).
167163
-->
168-
在调度过程中对 QueueingHint 求值是一个 Beta 级别的特性。
169-
v1.28 的系列小版本最初都开启了这个特性的门控;但是发现了内存占用过多的问题,
170-
于是 Kubernetes 项目将该特性门控设置为默认禁用。
171-
在 Kubernetes 的 {{< skew currentVersion >}} 版本中,这个特性门控被禁用,你需要手动开启它。
164+
在 Kubernetes 的 {{< skew currentVersion >}} 版本中,此特性门控默认启用,
172165
你可以通过 `SchedulerQueueingHints`
173-
[特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)来启用它
166+
[特性门控](/zh-cn/docs/reference/command-line-tools-reference/feature-gates/)来禁用它
174167
{{< /note >}}
175168

176-
177169
<!--
178170
### QueueSort {#queue-sort}
179171
-->
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<!--
2+
Upgrade the default kubeadm addons
3+
-->
4+
升级默认的 kubeadm 插件
5+
6+
<!--
7+
### Synopsis
8+
-->
9+
### 概要
10+
11+
<!--
12+
Upgrade the default kubeadm addons
13+
-->
14+
升级默认的 kubeadm 插件
15+
16+
```shell
17+
kubeadm upgrade node phase addon [flags]
18+
```
19+
20+
<!--
21+
### Options
22+
-->
23+
### 选项
24+
25+
<table style="width: 100%; table-layout: fixed;">
26+
<colgroup>
27+
<col span="1" style="width: 10px;" />
28+
<col span="1" />
29+
</colgroup>
30+
<tbody>
31+
32+
<tr>
33+
<td colspan="2">-h, --help</td>
34+
</tr>
35+
<tr>
36+
<td></td><td style="line-height: 130%; word-wrap: break-word;">
37+
<!--
38+
help for addon
39+
-->
40+
<p>
41+
addon 操作的帮助命令。
42+
</p>
43+
</td>
44+
</tr>
45+
46+
</tbody>
47+
</table>
48+
49+
<!--
50+
### Options inherited from parent commands
51+
-->
52+
### 从父命令继承的选项
53+
54+
<table style="width: 100%; table-layout: fixed;">
55+
<colgroup>
56+
<col span="1" style="width: 10px;" />
57+
<col span="1" />
58+
</colgroup>
59+
<tbody>
60+
61+
<tr>
62+
<td colspan="2">--rootfs string</td>
63+
</tr>
64+
<tr>
65+
<td></td><td style="line-height: 130%; word-wrap: break-word;"><p>
66+
<!--
67+
The path to the 'real' host root filesystem. This will cause kubeadm to chroot into the provided path.
68+
-->
69+
到“真实”主机根文件系统的路径。设置此参数将导致 kubeadm 切换到所提供的路径。
70+
</p>
71+
</td>
72+
</tr>
73+
74+
</tbody>
75+
</table>

0 commit comments

Comments
 (0)