Skip to content

Commit 0f6527a

Browse files
authored
Merge pull request #57197 from mburke5678/winc-pod-os
Use PodOS field in e2e tests, and document it for users
2 parents 58d80d4 + 89edbad commit 0f6527a

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

modules/sample-windows-workload-deployment.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ spec:
6969
runAsUserName: "ContainerAdministrator"
7070
nodeSelector:
7171
kubernetes.io/os: windows
72+
os:
73+
name: windows
7274
----
7375

7476
[NOTE]

modules/windows-pod-placement.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ With multiple operating systems, and the ability to run multiple Windows OS vari
1111

1212
For more information, see Microsoft's documentation on link:https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/update-containers#host-and-container-version-compatibility[Host and container version compatibility].
1313

14+
Also, it is recommended that you set the `spec.os.name.windows` parameter in your workload pods. The Windows Machine Config Operator (WMCO) uses this field to authoritatively identify the pod operating system for validation and is used to enforce Windows-specific pod security context constraints (SCCs). Currently, this parameter has no effect on pod scheduling. For more information about this parameter, see the link:https://kubernetes.io/docs/concepts/workloads/pods/#pod-os[Kubernetes Pods documentation].
15+
1416
[IMPORTANT]
1517
====
1618
The container base image must be the same Windows OS version and build number that is running on the node where the conainer is to be scheduled.

modules/wmco-upgrades.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ If you are upgrading to a new version of the WMCO and want to use cluster monito
3131

3232
For a non-disruptive upgrade, the WMCO terminates the Windows machines configured by the previous version of the WMCO and recreates them using the current version. This is done by deleting the `Machine` object, which results in the drain and deletion of the Windows node. To facilitate an upgrade, the WMCO adds a version annotation to all the configured nodes. During an upgrade, a mismatch in version annotation results in the deletion and recreation of a Windows machine. To have minimal service disruptions during an upgrade, the WMCO only updates one Windows machine at a time.
3333

34+
After the update, it is recommended that you set the `spec.os.name.windows` parameter in your workload pods. The WMCO uses this field to authoritatively identify the pod operating system for validation and is used to enforce Windows-specific pod security context constraints (SCCs).
35+
3436
[IMPORTANT]
3537
====
3638
The WMCO is only responsible for updating Kubernetes components, not for Windows operating system updates. You provide the Windows image when creating the VMs; therefore, you are responsible for providing an updated image. You can provide an updated Windows image by changing the image configuration in the `MachineSet` spec.

0 commit comments

Comments
 (0)