Skip to content

Commit 2ab0f97

Browse files
authored
Merge pull request #95102 from mburke5678/wmco-make-rn-generic
OSDOCS WMCO rework RN to make more version generic
2 parents ab9862a + ec595f9 commit 2ab0f97

7 files changed

+35
-31
lines changed

_topic_maps/_topic_map.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2870,13 +2870,13 @@ Topics:
28702870
Dir: wmco_rn
28712871
Topics:
28722872
- Name: Red Hat OpenShift support for Windows Containers release notes
2873-
File: windows-containers-release-notes-10-17-x
2873+
File: windows-containers-release-notes
28742874
- Name: Past releases
2875-
File: windows-containers-release-notes-10-17-x-past
2875+
File: windows-containers-release-notes-past
28762876
- Name: Windows Machine Config Operator prerequisites
2877-
File: windows-containers-release-notes-10-17-x-prereqs
2877+
File: windows-containers-release-notes-prereqs
28782878
- Name: Windows Machine Config Operator known limitations
2879-
File: windows-containers-release-notes-10-17-x-limitations
2879+
File: windows-containers-release-notes-limitations
28802880
- Name: Getting support
28812881
File: windows-containers-support
28822882
Distros: openshift-enterprise

windows_containers/enabling-windows-container-workloads.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ Dual NIC is not supported on WMCO-managed Windows instances.
3131
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.
3232
====
3333

34+
For the comprehensive prerequisites for the Windows Machine Config Operator, see "Windows Machine Config Operator prerequisites".
35+
3436
[role="_additional-resources"]
3537
.Additional resources
36-
* 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].
38+
* xref:../windows_containers/wmco_rn/windows-containers-release-notes-prereqs.adoc#windows-containers-release-notes-prereqs[Windows Machine Config Operator prerequisites]
3739

3840
[id="installing-the-wmco"]
3941
== Installing the Windows Machine Config Operator

windows_containers/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include::_attributes/common-attributes.adoc[]
77
toc::[]
88

99

10-
{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-17-x.adoc#windows-containers-release-notes-10-17-x[release notes].
10+
{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].
1111

1212
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].
1313

windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-limitations.adoc renamed to windows_containers/wmco_rn/windows-containers-release-notes-limitations.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
:context: windows-containers-release-notes-10-17-x-limitations
3-
[id="windows-containers-release-notes-10-17-x-limitations"]
2+
:context: windows-containers-release-notes-limitations
3+
[id="windows-containers-release-notes-limitations"]
44
= Windows Machine Config Operator known limitations
55
include::_attributes/common-attributes.adoc[]
66

windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-past.adoc renamed to windows_containers/wmco_rn/windows-containers-release-notes-past.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
:context: windows-containers-release-notes-10-17-x-past
3-
[id="windows-containers-release-notes-10-17-x-past"]
2+
:context: windows-containers-release-notes-past
3+
[id="windows-containers-release-notes-past"]
44
= Release notes for past releases of the Windows Machine Config Operator
55
include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9+
// Release notes for past versions; cut and paste current version to top of this file for next release
910
The following release notes are for previous versions of the Windows Machine Config Operator (WMCO).
1011

11-
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].
12+
For the current version, see xref:../../windows_containers/wmco_rn/windows-containers-release-notes.adoc#windows-containers-release-notes[{productwinc} release notes].
1213

13-
[id="wmco-10-17-"]
14-
== Release notes for Red Hat Windows Machine Config Operator 10.17.0
14+
[id="wmco-10-x-x-past-release-notes"]
15+
== Release notes for Red Hat Windows Machine Config Operator 10.x.0
1516

16-
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
17+
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
1718

18-
19-
[id="wmco-10-17-past-new-features"]
19+
[id="wmco-10-x-x-past-new-features"]
2020
=== New features and improvements
2121

22-
[id="wmco-10-17-bug-fixes"]
22+
[id="wmco-10-x-x-past-bug-fixes"]
2323
=== Bug fixes
2424

2525

windows_containers/wmco_rn/windows-containers-release-notes-10-17-x-prereqs.adoc renamed to windows_containers/wmco_rn/windows-containers-release-notes-prereqs.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
:context: windows-containers-release-notes-10-17-x-prereqs
3-
[id="windows-containers-release-notes-10-17-x-prereqs"]
2+
:context: windows-containers-release-notes-prereqs
3+
[id="windows-containers-release-notes-prereqs"]
44
= Windows Machine Config Operator prerequisites
55
include::_attributes/common-attributes.adoc[]
66

7-
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.
7+
The following information details the supported platform versions, Windows Server versions, and networking configurations for the Windows Machine Config Operator (WMCO). See the vSphere documentation for any information that is relevant to only that platform.
88

9-
[id="wmco-prerequisites-supported-10.17.0_{context}"]
10-
== WMCO 10.17.0 supported platforms and Windows Server versions
9+
[id="wmco-prerequisites-supported_{context}"]
10+
== WMCO supported platforms and Windows Server versions
1111

12-
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 6.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 an appropriate version for your platform.
12+
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, 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.
1313

1414
[cols="3,7",options="header"]
1515
|===

windows_containers/wmco_rn/windows-containers-release-notes-10-17-x.adoc renamed to windows_containers/wmco_rn/windows-containers-release-notes.adoc

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
[id="windows-containers-release-notes-10-17-x"]
2+
[id="windows-containers-release-notes"]
33
= {productwinc} release notes
44
include::_attributes/common-attributes.adoc[]
55
:context: windows-containers-release-notes
66

77
toc::[]
88

9+
// Release notes for current (or next to be released) version
10+
[id="wmco-release-notes"]
11+
// Update the version numbers
12+
== Release notes for Red Hat Windows Machine Config Operator 10.x.0
913

10-
[id="wmco-10-17-0"]
11-
== Release notes for Red Hat Windows Machine Config Operator 10.17.0
14+
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
1215

13-
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
14-
15-
16-
[id="wmco-10-17-0-new-features"]
16+
// Use as needed
17+
[id="wmco-new-features"]
1718
=== New features and improvements
1819

19-
[id="wmco-10-17-0-bug-fixes"]
20+
// Use as needed
21+
[id="wmco-bug-fixes"]
2022
=== Bug fixes
2123

0 commit comments

Comments
 (0)