Skip to content

Commit b88a437

Browse files
authored
Merge pull request #33736 from my-git9/mygit25
[zh] Update windows/user-guide-windows-containers.md
2 parents ad30951 + 4c5cf97 commit b88a437

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

content/zh/docs/setup/production-environment/windows/user-guide-windows-containers.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,27 +285,35 @@ that the containers in that Pod are designed for. For Pods that run Linux contai
285285
`.spec.os.name` to `linux`. For Pods that run Windows containers, set `.spec.os.name`
286286
to Windows.
287287

288+
{{< note >}}
289+
Starting from 1.24, the `IdentifyPodOS` feature is in Beta stage and defaults to be enabled.
290+
{{< /note >}}
291+
288292
The scheduler does not use the value of `.spec.os.name` when assigning Pods to nodes. You should
289293
use normal Kubernetes mechanisms for
290294
[assigning pods to nodes](/docs/concepts/scheduling-eviction/assign-pod-node/)
291295
to ensure that the control plane for your cluster places pods onto nodes that are running the
292296
appropriate operating system.
293-
no effect on the scheduling of the Windows pods, so taints and tolerations and node selectors are still required
297+
The `.spec.os.name` value has no effect on the scheduling of the Windows pods,
298+
so taints and tolerations and node selectors are still required
294299
to ensure that the Windows pods land onto appropriate Windows nodes.
295300
-->
296-
{{< note >}}
297301
如果 `IdentifyPodOS` [特性门控](/zh/docs/reference/command-line-tools-reference/feature-gates/)是启用的,
298302
你可以(并且应该)为 Pod 设置 `.spec.os.name` 以表明该 Pod
299303
中的容器所针对的操作系统。 对于运行 Linux 容器的 Pod,设置
300304
`.spec.os.name` 为 `linux`。 对于运行 Windows 容器的 Pod,设置 `.spec.os.name`
301305
为 `Windows`。
302306

307+
{{< note >}}
308+
从 1.24 开始,`IdentifyPodOS` 功能处于 Beta 阶段,默认启用。
309+
{{< /note >}}
310+
303311
在将 Pod 分配给节点时,调度程序不使用 `.spec.os.name` 的值。你应该使用正常的 Kubernetes
304312
机制[将 Pod 分配给节点](/zh/docs/concepts/scheduling-eviction/assign-pod-node/),
305313
确保集群的控制平面将 Pod 放置到适合运行的操作系统。
306-
Windows Pod 的调度没有影响,因此仍然需要污点、容忍度以及节点选择器,
314+
`.spec.os.name` 值对 Windows Pod 的调度没有影响,因此仍然需要污点、容忍度以及节点选择器,
307315
以确保 Windows Pod 调度至合适的 Windows 节点。
308-
{{< /note >}}
316+
309317
<!--
310318
### Ensuring OS-specific workloads land on the appropriate container host
311319
-->

0 commit comments

Comments
 (0)