Merge pull request #46112 from openshift-cherrypick-robot/cherry-pick-45958-to-main

[main] Updated WMCO 5.0 Platform Support Tables

Author: mburke5678

modules/wmco-prerequisites.adoc

@@ -7,96 +7,58 @@
 
 The following information details the supported platform versions, Windows Server versions, and networking configurations for the Windows Machine Config Operator. See the vSphere documentation for any information that is relevant to only that platform.
 
-== Supported platforms based on {product-title} and WMCO versions
+[id="wmco-prerequisites-supported-5.1.0_{context}"]
+== WMCO 5.1.0 supported platforms and Windows Server versions
 
-[cols="5",options="header"]
-|===
-|Platform
-|Supported {product-title} version
-|Supported WMCO version
-|Installer-provisioned infrastructure installation support
-|User-provisioned infrastructure installation support
-
-|Amazon Web Services (AWS)
-|4.6+
-|WMCO 1.0+
-|GA
-|
-
-|Microsoft Azure
-|4.6+
-|WMCO 1.0+
-|GA
-|
-
-|VMware vSphere
-|4.7+
-|WMCO 2.0+
-|GA
-|
-|===
-
-== Supported platforms for Bring-Your-Own-Host (BYOH) instances based on {product-title} and WMCO versions
+The following table lists the link:https://docs.microsoft.com/en-us/windows/release-health/windows-server-release-info[Windows Server versions] that are supported by WMCO 5.1.0, based on the applicable platform. Windows Server versions not listed are not supported and attempting to use them will cause errors. To prevent these errors, use only an appropriate version for your platform.
 
-[cols="5",options="header"]
+[cols="3,7",options="header"]
 |===
 |Platform
-|Supported {product-title} version
-|Supported WMCO version
-|BYOH for installer-provisioned infrastructure installation support
-|BYOH for user-provisioned infrastructure installation support
+|Supported Windows Server version
 
 |Amazon Web Services (AWS)
-|4.8+
-|WMCO 3.1+
-|GA
-|
+|Windows Server 2019
 
 |Microsoft Azure
-|4.8+
-|WMCO 3.1+
-|GA
-|
+|Windows Server 2019
 
 |VMware vSphere
-|4.8+
-|WMCO 3.1+
-|GA
-|
-
-|Provider agnostic (Platform: none)
-|4.8+
-|WMCO 3.1+
-|
-|GA
+a|* Windows Server 2022 with the Windows link:https://support.microsoft.com/en-us/topic/april-25-2022-kb5012637-os-build-20348-681-preview-2233d69c-d4a5-4be9-8c24-04a450861a8d[KB5012637] patch.
+* Windows Server 20H2 
+
+|Bare metal or provider agnostic
+a|* Windows Server 2022 with the Windows link:https://support.microsoft.com/en-us/topic/april-25-2022-kb5012637-os-build-20348-681-preview-2233d69c-d4a5-4be9-8c24-04a450861a8d[KB5012637] patch.
+* Windows Server 20H2 
 |===
 
-== Supported Windows Server versions
+[id="wmco-prerequisites-supported-5.0.0_{context}"]
+== WMCO 5.0.0 supported platforms and Windows Server versions
 
-The following table lists the supported link:https://docs.microsoft.com/en-us/windows/release-health/windows-server-release-info[Windows Server version] based on the applicable platform. Any unlisted Windows Server version is not supported and will cause errors. To prevent these errors, only use the appropriate version according to the platform in use.
+The following table lists the link:https://docs.microsoft.com/en-us/windows/release-health/windows-server-release-info[Windows Server versions] that are supported by WMCO 5.0.0, based on the applicable platform. Windows Server versions not listed are not supported and attempting to use them will cause errors. To prevent these errors, use only the appropriate version for your platform.
 
-[cols="2",options="header"]
+[cols="3,7",options="header"]
 |===
 |Platform
 |Supported Windows Server version
 
 |Amazon Web Services (AWS)
-|Windows Server Long-Term Servicing Channel (LTSC): Windows Server 2019
+|Windows Server 2019
 
 |Microsoft Azure
-|Windows Server Long-Term Servicing Channel (LTSC): Windows Server 2019
+|Windows Server 2019
 
 |VMware vSphere
-|Windows Server Semi-Annual Channel (SAC): Windows Server 20H2
+|Windows Server 20H2 
 
-|bare metal
-|Windows Server Long-Term Servicing Channel (LTSC): Windows Server 2019
+|Bare metal or provider agnostic
+|Windows Server 2019
 |===
 
-== Supported networking
-
-Hybrid networking with OVN-Kubernetes is the only supported networking configuration. See the additional resources below for more information on this functionality. The following tables outline the type of networking configuration and Windows Server versions to use based on your platform. You must specify the network configuration when you install the cluster. Be aware that OpenShift SDN networking is the default network for {product-title} clusters. However, OpenShift SDN is not supported by WMCO.
+[id="wmco-prerequisites-networking_{context}"]
+== WMCO 5.x Supported networking
 
+Hybrid networking with OVN-Kubernetes is the only supported networking configuration for WMCO 5.x. See the following additional resources for more information on this functionality. The following tables outline the type of networking configuration and Windows Server versions to use based on your platform. You must specify the network configuration when you install the cluster. Be aware that OpenShift SDN networking is the default network for {product-title} clusters. However, OpenShift SDN is not supported by WMCO 5.x.
 
 .Platform networking support
 [cols="2",options="header"]

windows_containers/index.adoc

@@ -8,6 +8,13 @@ toc::[]
 
 {productwinc} is a feature providing the ability to run Windows compute nodes in an {product-title} cluster. This is possible by using the Red Hat Windows Machine Config Operator (WMCO) to install and manage Windows nodes. With a Red Hat subscription, you can get support for running Windows workloads in {product-title}. For more information, see the xref:../windows_containers/windows-containers-release-notes-5-x.adoc#windows-containers-release-notes-5-x[release notes].
 
+You can add Windows nodes either by creating a xref:../windows_containers/creating_windows_machinesets/creating-windows-machineset-aws.adoc#creating-windows-machineset-aws[machine set] or by specifying existing Bring-Your-Own-Host (BYOH) Window instances through a xref:../windows_containers/byoh-windows-instance.adoc#byoh-windows-instance[configuration map].
+
+[NOTE]
+====
+Machine sets are not supported for bare metal or provider agnostic clusters.
+====
+
 For workloads including both Linux and Windows, {product-title} allows you to deploy Windows workloads running on Windows Server containers while also providing traditional Linux workloads hosted on {op-system-first} or {op-system-base-full}. For more information, see xref:../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[getting started with Windows container workloads].
 
 You need the WMCO to run Windows workloads in your cluster. The WMCO orchestrates the process of deploying and managing Windows workloads on a cluster. For more information, see xref:../windows_containers/enabling-windows-container-workloads.adoc#enabling-windows-container-workloads[how to enable Windows container workloads].

windows_containers/windows-containers-release-notes-5-x.adoc

@@ -13,6 +13,8 @@ Windows Container Support for Red Hat OpenShift enables running Windows compute
 
 The release notes for Red Hat OpenShift for Windows Containers tracks the development of the WMCO, which provides all Windows container workload capabilities in {product-title}.
 
+Version 5.x of the WMCO is compatible only with {product-title} 4.10.
+
 ifndef::openshift-origin[]
 [id="getting-support"]
 == Getting support
@@ -28,6 +30,11 @@ For more information, see the Red Hat OpenShift Container Platform Life Cycle Po
 If you do not have this additional Red Hat subscription, you can use the Community Windows Machine Config Operator, a distribution that lacks official support. 
 endif::openshift-origin[]
 
+[id="wmco-5-1-0"]
+== Release notes for Red Hat Windows Machine Config Operator 5.1.0
+
+This release of the WMCO provides bug fixes for running Windows compute nodes in an {product-title} cluster.
+
 [id="wmco-5-0-0"]
 == Release notes for Red Hat Windows Machine Config Operator 5.0.0
 
@@ -50,5 +57,3 @@ include::modules/wmco-prerequisites.adoc[leveloffset=+1]
 Running Windows container workloads is not supported for clusters in a restricted network or disconnected environment.
 ====
 
-Version 5.x of the WMCO is only compatible with {product-title} 4.10.
-