Skip to content

Commit 5012773

Browse files
authored
Merge pull request #36226 from jzhupup/doc_windows
[zh-cn] sync1.25 intro.md
2 parents d3cced8 + 25d7e69 commit 5012773

File tree

1 file changed

+11
-13
lines changed
  • content/zh-cn/docs/concepts/windows

1 file changed

+11
-13
lines changed

content/zh-cn/docs/concepts/windows/intro.md

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,12 @@ Kubernetes 关键组件在 Windows 上的工作方式与在 Linux 上相同。
143143
* Resource limits
144144
* OS field:
145145
The `.spec.os.name` field should be set to `windows` to indicate that the current Pod uses Windows containers.
146-
The `IdentifyPodOS` feature gate needs to be enabled for this field to be recognized.
147146
148147
{{< note >}}
149-
Starting from 1.24, the `IdentifyPodOS` feature gate is in Beta stage and defaults to be enabled.
148+
Starting from 1.25, the `IdentifyPodOS` feature gate is in GA stage and defaults to be enabled.
150149
{{< /note >}}
151150
152-
If the `IdentifyPodOS` feature gate is enabled and you set the `.spec.os.name` field to `windows`,
151+
If you set the `.spec.os.name` field to `windows`,
153152
you must not set the following fields in the `.spec` of that Pod:
154153
In the above list, wildcards (`*`) indicate all elements in a list.
155154
For example, `spec.containers[*].securityContext` refers to the SecurityContext object
@@ -174,15 +173,14 @@ Kubernetes 关键组件在 Windows 上的工作方式与在 Linux 上相同。
174173
* 操作系统字段:
175174

176175
`.spec.os.name` 字段应设置为 `windows` 以表明当前 Pod 使用 Windows 容器。
177-
需要启用 `IdentifyPodOS` 特性门控才能让这个字段被识别。
178-
179-
{{< note >}}
180-
从 1.24 开始,`IdentifyPodOS` 特性门控进入 Beta 阶段,默认启用。
176+
177+
{{< note >}}
178+
从 1.25 开始,`IdentifyPodOS` 特性门控进入 GA 阶段,默认启用。
181179
{{< /note >}}
182-
183-
如果 `IdentifyPodOS` 特性门控已启用并且你将 `.spec.os.name` 字段设置为 `windows`
184-
则你不得在对应 Pod 的 `.spec` 中设置以下字段:
185-
180+
181+
如果你将 `.spec.os.name` 字段设置为 `windows`
182+
则你必须不能在对应 Pod 的 `.spec` 中设置以下字段:
183+
186184
* `spec.hostPID`
187185
* `spec.hostIPC`
188186
* `spec.securityContext.seLinuxOptions`
@@ -524,7 +522,7 @@ Kubernetes 使用 pause 容器以允许工作容器崩溃或重启,而不会
524522

525523
<!--
526524
Kubernetes maintains a multi-architecture image that includes support for Windows.
527-
For Kubernetes v{{< skew currentVersion >}} the recommended pause image is `k8s.gcr.io/pause:3.6`.
525+
For Kubernetes v{{< skew currentVersion >}} the recommended pause image is `registry.k8s.io/pause:3.6`.
528526
The [source code](https://github.com/kubernetes/kubernetes/tree/master/build/pause)
529527
is available on GitHub.
530528
@@ -537,7 +535,7 @@ deploying to a production or production-like environment that requires signed
537535
binaries.
538536
-->
539537
Kubernetes 维护一个多体系结构的镜像,包括对 Windows 的支持。
540-
对于 Kubernetes v{{< skew currentVersion >}},推荐的 pause 镜像为 `k8s.gcr.io/pause:3.6`
538+
对于 Kubernetes v{{< skew currentVersion >}},推荐的 pause 镜像为 `registry.k8s.io/pause:3.6`
541539
可在 GitHub 上获得[源代码](https://github.com/kubernetes/kubernetes/tree/master/build/pause)
542540

543541
Microsoft 维护一个不同的多体系结构镜像,支持 Linux 和 Windows amd64,

0 commit comments

Comments
 (0)