From ff89d1dc695ff97f49406ea4dcb7109bf5c2a4c7 Mon Sep 17 00:00:00 2001 From: Michael Burke Date: Mon, 23 Jun 2025 09:49:05 -0400 Subject: [PATCH] [enterprise-4.20] OSDOCS WMCO rework RN to make more version generic --- _topic_maps/_topic_map.yml | 82 +++++++++---------- ...dows-containers-release-notes-10-20-0.adoc | 22 +++++ .../enabling-windows-container-workloads.adoc | 4 +- windows_containers/index.adoc | 9 +- ...dows-containers-release-notes-10-17-x.adoc | 21 ----- ...containers-release-notes-limitations.adoc} | 4 +- ...indows-containers-release-notes-past.adoc} | 18 ++-- ...ows-containers-release-notes-prereqs.adoc} | 10 +-- .../windows-containers-release-notes.adoc | 11 +++ 9 files changed, 97 insertions(+), 84 deletions(-) create mode 100644 modules/windows-containers-release-notes-10-20-0.adoc delete mode 100644 windows_containers/wmco_rn/windows-containers-release-notes-10-17-x.adoc rename windows_containers/wmco_rn/{windows-containers-release-notes-10-17-x-limitations.adoc => windows-containers-release-notes-limitations.adoc} (94%) rename windows_containers/wmco_rn/{windows-containers-release-notes-10-17-x-past.adoc => windows-containers-release-notes-past.adoc} (56%) rename windows_containers/wmco_rn/{windows-containers-release-notes-10-17-x-prereqs.adoc => windows-containers-release-notes-prereqs.adoc} (94%) create mode 100644 windows_containers/wmco_rn/windows-containers-release-notes.adoc diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 8121c35bbf..22bf48ae9b 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -2865,47 +2865,47 @@ Distros: openshift-origin,openshift-enterprise Topics: - Name: Red Hat OpenShift support for Windows Containers overview File: index -#- Name: Release notes -# Dir: wmco_rn -# Topics: -# - Name: Red Hat OpenShift support for Windows Containers release notes -# File: windows-containers-release-notes-10-17-x -# - Name: Past releases -# File: windows-containers-release-notes-10-17-x-past -# - Name: Windows Machine Config Operator prerequisites -# File: windows-containers-release-notes-10-17-x-prereqs -# - Name: Windows Machine Config Operator known limitations -# File: windows-containers-release-notes-10-17-x-limitations -#- Name: Getting support -# File: windows-containers-support -# Distros: openshift-enterprise -#- Name: Understanding Windows container workloads -# File: understanding-windows-container-workloads -#- Name: Enabling Windows container workloads -# File: enabling-windows-container-workloads -#- Name: Creating Windows machine sets -# Dir: creating_windows_machinesets -# Topics: -# - Name: Creating a Windows machine set on AWS -# File: creating-windows-machineset-aws -# - Name: Creating a Windows machine set on Azure -# File: creating-windows-machineset-azure -# - Name: Creating a Windows machine set on GCP -# File: creating-windows-machineset-gcp -# - Name: Creating a Windows machine set on Nutanix -# File: creating-windows-machineset-nutanix -# - Name: Creating a Windows machine set on vSphere -# File: creating-windows-machineset-vsphere -#- Name: Scheduling Windows container workloads -# File: scheduling-windows-workloads -#- Name: Windows node updates -# File: windows-node-upgrades -#- Name: Using Bring-Your-Own-Host Windows instances as nodes -# File: byoh-windows-instance -#- Name: Removing Windows nodes -# File: removing-windows-nodes -#- Name: Disabling Windows container workloads -# File: disabling-windows-container-workloads +- Name: Release notes + Dir: wmco_rn + Topics: + - Name: Red Hat OpenShift support for Windows Containers release notes + File: windows-containers-release-notes + - Name: Past releases + File: windows-containers-release-notes-past + - Name: Windows Machine Config Operator prerequisites + File: windows-containers-release-notes-prereqs + - Name: Windows Machine Config Operator known limitations + File: windows-containers-release-notes-limitations +- Name: Getting support + File: windows-containers-support + Distros: openshift-enterprise +- Name: Understanding Windows container workloads + File: understanding-windows-container-workloads +- Name: Enabling Windows container workloads + File: enabling-windows-container-workloads +- Name: Creating Windows machine sets + Dir: creating_windows_machinesets + Topics: + - Name: Creating a Windows machine set on AWS + File: creating-windows-machineset-aws + - Name: Creating a Windows machine set on Azure + File: creating-windows-machineset-azure + - Name: Creating a Windows machine set on GCP + File: creating-windows-machineset-gcp + - Name: Creating a Windows machine set on Nutanix + File: creating-windows-machineset-nutanix + - Name: Creating a Windows machine set on vSphere + File: creating-windows-machineset-vsphere +- Name: Scheduling Windows container workloads + File: scheduling-windows-workloads +- Name: Windows node updates + File: windows-node-upgrades +- Name: Using Bring-Your-Own-Host Windows instances as nodes + File: byoh-windows-instance +- Name: Removing Windows nodes + File: removing-windows-nodes +- Name: Disabling Windows container workloads + File: disabling-windows-container-workloads --- Name: OpenShift sandboxed containers Dir: sandboxed_containers diff --git a/modules/windows-containers-release-notes-10-20-0.adoc b/modules/windows-containers-release-notes-10-20-0.adoc new file mode 100644 index 0000000000..6d990deba0 --- /dev/null +++ b/modules/windows-containers-release-notes-10-20-0.adoc @@ -0,0 +1,22 @@ +// Module included in the following assemblies: +// +// * windows_containers/wmco_rn/windows-containers-release-notes.adoc + +:_mod-docs-content-type: CONCEPT +[id="windows-containers-release-notes-10-20-0_{context}"] += Release notes for Red Hat Windows Machine Config Operator 10.20.0 + +Issued: + +The components of the WMCO 10.20.0 were released in . + +[id="wmco-10-20-0-new-features"] +== New features and improvements + +[id="wmco-10-20-0-new-features-kubernetes"] +=== Kubernetes upgrade +The WMCO now uses Kubernetes . + +[id="wmco-10-20-0-bug-fixes"] +== Bug fixes +* Previously, (link:https://issues.redhat.com/browse/OCPBUGS-46473[*OCPBUGS-46473*]) diff --git a/windows_containers/enabling-windows-container-workloads.adoc b/windows_containers/enabling-windows-container-workloads.adoc index 91397a7803..a0734e17e5 100644 --- a/windows_containers/enabling-windows-container-workloads.adoc +++ b/windows_containers/enabling-windows-container-workloads.adoc @@ -31,9 +31,11 @@ Dual NIC is not supported on WMCO-managed Windows instances. Windows instances deployed by the WMCO are configured with the containerd container runtime. Because WMCO installs and manages the runtime, it is recommended that you do not manually install containerd on nodes. ==== +For the comprehensive prerequisites for the Windows Machine Config Operator, see "Windows Machine Config Operator prerequisites". + [role="_additional-resources"] .Additional resources -* For the comprehensive prerequisites for the Windows Machine Config Operator, see xref:../windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-prereqs.adoc#windows-containers-release-notes-10-17-x-prereqs[Windows Machine Config Operator prerequisites]. +* xref:../windows_containers/wmco_rn/windows-containers-release-notes-prereqs.adoc#windows-containers-release-notes-prereqs[Windows Machine Config Operator prerequisites] [id="installing-the-wmco"] == Installing the Windows Machine Config Operator diff --git a/windows_containers/index.adoc b/windows_containers/index.adoc index 7451ff946e..e9d04cdc16 100644 --- a/windows_containers/index.adoc +++ b/windows_containers/index.adoc @@ -7,11 +7,11 @@ include::_attributes/common-attributes.adoc[] toc::[] -Documentation for {productwinc} is planned to be available for {product-title} {product-version} in the near future. - //// -Hiding until WMCO 10.19.0 GAs -{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}. Windows instances deployed by the WMCO are configured with the containerd container runtime. For more information, see the xref:../windows_containers/wmco_rn/windows-containers-release-notes-10-19-x.adoc#windows-containers-release-notes-10-19-x[release notes]. +Documentation for {productwinc} is planned to be available for {product-title} {product-version} in the near future. +//// + +{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}. Windows instances deployed by the WMCO are configured with the containerd container runtime. For more information, see the xref:../windows_containers/wmco_rn/windows-containers-release-notes.adoc#windows-containers-release-notes[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[compute 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]. @@ -38,4 +38,3 @@ You can xref:../windows_containers/disabling-windows-container-workloads.adoc#di * Uninstalling the Windows Machine Config Operator * Deleting the Windows Machine Config Operator namespace -//// diff --git a/windows_containers/wmco_rn/windows-containers-release-notes-10-17-x.adoc b/windows_containers/wmco_rn/windows-containers-release-notes-10-17-x.adoc deleted file mode 100644 index 7de41cf70a..0000000000 --- a/windows_containers/wmco_rn/windows-containers-release-notes-10-17-x.adoc +++ /dev/null @@ -1,21 +0,0 @@ -:_mod-docs-content-type: ASSEMBLY -[id="windows-containers-release-notes-10-17-x"] -= {productwinc} release notes -include::_attributes/common-attributes.adoc[] -:context: windows-containers-release-notes - -toc::[] - - -[id="wmco-10-17-0"] -== Release notes for Red Hat Windows Machine Config Operator 10.17.0 - -This release of the WMCO provides bug fixes for running Windows compute nodes in an {product-title} cluster. The components of the WMCO 10.17.0 were released in - - -[id="wmco-10-17-0-new-features"] -=== New features and improvements - -[id="wmco-10-17-0-bug-fixes"] -=== Bug fixes - diff --git a/windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-limitations.adoc b/windows_containers/wmco_rn/windows-containers-release-notes-limitations.adoc similarity index 94% rename from windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-limitations.adoc rename to windows_containers/wmco_rn/windows-containers-release-notes-limitations.adoc index 9ef3b6df9a..80379e124e 100644 --- a/windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-limitations.adoc +++ b/windows_containers/wmco_rn/windows-containers-release-notes-limitations.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY -:context: windows-containers-release-notes-10-17-x-limitations -[id="windows-containers-release-notes-10-17-x-limitations"] +:context: windows-containers-release-notes-limitations +[id="windows-containers-release-notes-limitations"] = Windows Machine Config Operator known limitations include::_attributes/common-attributes.adoc[] diff --git a/windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-past.adoc b/windows_containers/wmco_rn/windows-containers-release-notes-past.adoc similarity index 56% rename from windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-past.adoc rename to windows_containers/wmco_rn/windows-containers-release-notes-past.adoc index 7366e0d0b0..5ca996b771 100644 --- a/windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-past.adoc +++ b/windows_containers/wmco_rn/windows-containers-release-notes-past.adoc @@ -1,25 +1,25 @@ :_mod-docs-content-type: ASSEMBLY -:context: windows-containers-release-notes-10-17-x-past -[id="windows-containers-release-notes-10-17-x-past"] +:context: windows-containers-release-notes-past +[id="windows-containers-release-notes-past"] = Release notes for past releases of the Windows Machine Config Operator include::_attributes/common-attributes.adoc[] toc::[] +// Release notes for past versions; cut and paste current version to top of this file for next release The following release notes are for previous versions of the Windows Machine Config Operator (WMCO). -For the current version, see xref:../../windows_containers/wmco_rn/windows-containers-release-notes-10-17-x.adoc#windows-containers-release-notes-10-17-x[{productwinc} release notes]. +For the current version, see xref:../../windows_containers/wmco_rn/windows-containers-release-notes.adoc#windows-containers-release-notes[{productwinc} release notes]. -[id="wmco-10-17-"] -== Release notes for Red Hat Windows Machine Config Operator 10.17.0 +[id="wmco-10-x-x-past-release-notes"] +== Release notes for Red Hat Windows Machine Config Operator 10.x.0 -This release of the WMCO provides bug fixes for running Windows compute nodes in an {product-title} cluster. The components of the WMCO 10.17.0 were released in +This release of the WMCO provides bug fixes for running Windows compute nodes in an {product-title} cluster. The components of the WMCO 10.x.0 were released in - -[id="wmco-10-17-past-new-features"] +[id="wmco-10-x-x-past-new-features"] === New features and improvements -[id="wmco-10-17-bug-fixes"] +[id="wmco-10-x-x-past-bug-fixes"] === Bug fixes diff --git a/windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-prereqs.adoc b/windows_containers/wmco_rn/windows-containers-release-notes-prereqs.adoc similarity index 94% rename from windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-prereqs.adoc rename to windows_containers/wmco_rn/windows-containers-release-notes-prereqs.adoc index adecea7d1c..ef98b970b3 100644 --- a/windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-prereqs.adoc +++ b/windows_containers/wmco_rn/windows-containers-release-notes-prereqs.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY -:context: windows-containers-release-notes-10-17-x-prereqs -[id="windows-containers-release-notes-10-17-x-prereqs"] +:context: windows-containers-release-notes-prereqs +[id="windows-containers-release-notes-prereqs"] = Windows Machine Config Operator prerequisites include::_attributes/common-attributes.adoc[] @@ -13,10 +13,10 @@ The WMCO fully supports installing Windows nodes into installer-provisioned infr For user-provisioned infrastructure (UPI) clusters, the WMCO supports installing Windows nodes only into a UPI cluster installed with the `platform: none` field set in the `install-config.yaml` file (bare-metal or provider-agnostic) and only for the xref:../../windows_containers/byoh-windows-instance.adoc#byoh-windows-instance[BYOH (Bring Your Own Host)] use case. UPI is not supported for any other platform. -[id="wmco-prerequisites-supported-10.17.0_{context}"] -== WMCO 10.17.0 supported platforms and Windows Server versions +[id="wmco-prerequisites-supported_{context}"] +== WMCO supported platforms and Windows Server 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 10.17.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. +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 10.20.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="3,7",options="header"] |=== diff --git a/windows_containers/wmco_rn/windows-containers-release-notes.adoc b/windows_containers/wmco_rn/windows-containers-release-notes.adoc new file mode 100644 index 0000000000..565e589e64 --- /dev/null +++ b/windows_containers/wmco_rn/windows-containers-release-notes.adoc @@ -0,0 +1,11 @@ +:_mod-docs-content-type: ASSEMBLY +[id="windows-containers-release-notes"] += {productwinc} release notes +include::_attributes/common-attributes.adoc[] +:context: windows-containers-release-notes + +toc::[] + +This release of the Windows Machine Config Operator (WMCO) provides bug fixes for running Windows compute nodes in an {product-title} cluster. + +include::modules/windows-containers-release-notes-10-20-0.adoc[leveloffset=+1]