Skip to content

Commit 7dc2962

Browse files
authored
Merge pull request #33262 from kinzhi/kinzhi43
[zh]Update content/zh/docs/setup/production-environment/windows/user-guide-windows-containers.md
2 parents aae0e2e + 75a812c commit 7dc2962

File tree

1 file changed

+29
-2
lines changed

1 file changed

+29
-2
lines changed

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

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Windows 应用程序构成了许多组织中运行的服务和应用程序的很
4343
control plane and a [worker node running Windows Server](/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes/)
4444
* It is important to note that creating and deploying services and workloads on Kubernetes
4545
behaves in much the same way for Linux and Windows containers.
46-
[Kubectl commands](/docs/reference/kubectl/overview/) to interface with the cluster are identical.
46+
[Kubectl commands](/docs/reference/kubectl/) to interface with the cluster are identical.
4747
The example in the section below is provided to jumpstart your experience with Windows containers.
4848
-->
4949
## 在你开始之前
@@ -278,7 +278,34 @@ with one of its main goals being that this approach should not break compatibili
278278
目前,用户需要将 Linux 和 Windows 工作负载运行在各自特定的操作系统的节点上,
279279
因而需要结合使用污点和节点选择算符。 这可能仅给 Windows 用户造成不便。
280280
推荐的方法概述如下,其主要目标之一是该方法不应破坏与现有 Linux 工作负载的兼容性。
281-
281+
<!--
282+
If the `IdentifyPodOS` [feature gate](/docs/reference/command-line-tools-reference/feature-gates/) is
283+
enabled, you can (and should) set `.spec.os.name` for a Pod to indicate the operating system
284+
that the containers in that Pod are designed for. For Pods that run Linux containers, set
285+
`.spec.os.name` to `linux`. For Pods that run Windows containers, set `.spec.os.name`
286+
to Windows.
287+
288+
The scheduler does not use the value of `.spec.os.name` when assigning Pods to nodes. You should
289+
use normal Kubernetes mechanisms for
290+
[assigning pods to nodes](/docs/concepts/scheduling-eviction/assign-pod-node/)
291+
to ensure that the control plane for your cluster places pods onto nodes that are running the
292+
appropriate operating system.
293+
no effect on the scheduling of the Windows pods, so taints and tolerations and node selectors are still required
294+
to ensure that the Windows pods land onto appropriate Windows nodes.
295+
-->
296+
{{< note >}}
297+
如果 `IdentifyPodOS` [特性门控](/zh/docs/reference/command-line-tools-reference/feature-gates/)是启用的,
298+
你可以(并且应该)为 Pod 设置 `.spec.os.name` 以表明该 Pod
299+
中的容器所针对的操作系统。 对于运行 Linux 容器的 Pod,设置
300+
`.spec.os.name` 为 `linux`。 对于运行 Windows 容器的 Pod,设置 `.spec.os.name`
301+
为 `Windows`。
302+
303+
在将 Pod 分配给节点时,调度程序不使用 `.spec.os.name` 的值。你应该使用正常的 Kubernetes
304+
机制[将 Pod 分配给节点](/zh/docs/concepts/scheduling-eviction/assign-pod-node/),
305+
确保集群的控制平面将 Pod 放置到适合运行的操作系统。
306+
对 Windows Pod 的调度没有影响,因此仍然需要污点、容忍度以及节点选择器,
307+
以确保 Windows Pod 调度至合适的 Windows 节点。
308+
{{< /note >}}
282309
<!--
283310
### Ensuring OS-specific workloads land on the appropriate container host
284311
-->

0 commit comments

Comments
 (0)