From 4c5cf970986f063e36df37125609c8c520da8155 Mon Sep 17 00:00:00 2001 From: "xin.li" Date: Mon, 16 May 2022 19:53:12 +0800 Subject: [PATCH] [zh] Update windows/user-guide-windows-containers.md Signed-off-by: xin.li --- .../windows/user-guide-windows-containers.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/content/zh/docs/setup/production-environment/windows/user-guide-windows-containers.md b/content/zh/docs/setup/production-environment/windows/user-guide-windows-containers.md index f13822c0bf..a8f582472c 100644 --- a/content/zh/docs/setup/production-environment/windows/user-guide-windows-containers.md +++ b/content/zh/docs/setup/production-environment/windows/user-guide-windows-containers.md @@ -285,27 +285,35 @@ that the containers in that Pod are designed for. For Pods that run Linux contai `.spec.os.name` to `linux`. For Pods that run Windows containers, set `.spec.os.name` to Windows. +{{< note >}} +Starting from 1.24, the `IdentifyPodOS` feature is in Beta stage and defaults to be enabled. +{{< /note >}} + The scheduler does not use the value of `.spec.os.name` when assigning Pods to nodes. You should use normal Kubernetes mechanisms for [assigning pods to nodes](/docs/concepts/scheduling-eviction/assign-pod-node/) to ensure that the control plane for your cluster places pods onto nodes that are running the appropriate operating system. - no effect on the scheduling of the Windows pods, so taints and tolerations and node selectors are still required +The `.spec.os.name` value has no effect on the scheduling of the Windows pods, +so taints and tolerations and node selectors are still required to ensure that the Windows pods land onto appropriate Windows nodes. --> - {{< note >}} 如果 `IdentifyPodOS` [特性门控](/zh/docs/reference/command-line-tools-reference/feature-gates/)是启用的， 你可以（并且应该）为 Pod 设置 `.spec.os.name` 以表明该 Pod 中的容器所针对的操作系统。 对于运行 Linux 容器的 Pod，设置 `.spec.os.name` 为 `linux`。 对于运行 Windows 容器的 Pod，设置 `.spec.os.name` 为 `Windows`。 +{{< note >}} +从 1.24 开始，`IdentifyPodOS` 功能处于 Beta 阶段，默认启用。 +{{< /note >}} + 在将 Pod 分配给节点时，调度程序不使用 `.spec.os.name` 的值。你应该使用正常的 Kubernetes 机制[将 Pod 分配给节点](/zh/docs/concepts/scheduling-eviction/assign-pod-node/)， 确保集群的控制平面将 Pod 放置到适合运行的操作系统。 -对 Windows Pod 的调度没有影响，因此仍然需要污点、容忍度以及节点选择器， +`.spec.os.name` 值对 Windows Pod 的调度没有影响，因此仍然需要污点、容忍度以及节点选择器， 以确保 Windows Pod 调度至合适的 Windows 节点。 - {{< /note >}} +