Skip to content

Commit 763befc

Browse files
authored
Merge pull request #35137 from EricPonvelle/RevealWMCO3
[WMCO-3.x]: Revealed the hidden WMCO 3.x content for 4.8+
2 parents 49f3d2d + a8766a3 commit 763befc

File tree

8 files changed

+42
-33
lines changed

8 files changed

+42
-33
lines changed

_topic_map.yml

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,35 +1779,34 @@ Topics:
17791779
Topics:
17801780
- Name: Using remote worker node at the network edge
17811781
File: nodes-edge-remote-workers
1782-
#---
1783-
# WMCO-3.0 Note: This section was hidden in the 4.8 documentation set since WMCO 3.0 releases a few days later.
1784-
# Name: Windows Container Support for OpenShift
1785-
# Dir: windows_containers
1786-
#Distros: openshift-origin,openshift-enterprise
1787-
#Topics:
1788-
#- Name: Windows Container Support for OpenShift release notes
1789-
# File: windows-containers-release-notes-2-x
1790-
#- Name: Understanding Windows container workloads
1791-
# File: understanding-windows-container-workloads
1792-
#- Name: Enabling Windows container workloads
1793-
# File: enabling-windows-container-workloads
1794-
#- Name: Creating Windows MachineSet objects
1795-
# Dir: creating_windows_machinesets
1796-
# Topics:
1797-
# - Name: Creating a Windows MachineSet object on AWS
1798-
# File: creating-windows-machineset-aws
1799-
# - Name: Creating a Windows MachineSet object on Azure
1800-
# File: creating-windows-machineset-azure
1801-
# - Name: Creating a Windows MachineSet object on vSphere
1802-
# File: creating-windows-machineset-vsphere
1803-
#- Name: Scheduling Windows container workloads
1804-
# File: scheduling-windows-workloads
1805-
#- Name: Windows node upgrades
1806-
# File: windows-node-upgrades
1807-
#- Name: Removing Windows nodes
1808-
# File: removing-windows-nodes
1809-
#- Name: Disabling Windows container workloads
1810-
# File: disabling-windows-container-workloads
1782+
---
1783+
Name: Windows Container Support for OpenShift
1784+
Dir: windows_containers
1785+
Distros: openshift-origin,openshift-enterprise
1786+
Topics:
1787+
- Name: Windows Container Support for OpenShift release notes
1788+
File: windows-containers-release-notes-2-x
1789+
- Name: Understanding Windows container workloads
1790+
File: understanding-windows-container-workloads
1791+
- Name: Enabling Windows container workloads
1792+
File: enabling-windows-container-workloads
1793+
- Name: Creating Windows MachineSet objects
1794+
Dir: creating_windows_machinesets
1795+
Topics:
1796+
- Name: Creating a Windows MachineSet object on AWS
1797+
File: creating-windows-machineset-aws
1798+
- Name: Creating a Windows MachineSet object on Azure
1799+
File: creating-windows-machineset-azure
1800+
- Name: Creating a Windows MachineSet object on vSphere
1801+
File: creating-windows-machineset-vsphere
1802+
- Name: Scheduling Windows container workloads
1803+
File: scheduling-windows-workloads
1804+
- Name: Windows node upgrades
1805+
File: windows-node-upgrades
1806+
- Name: Removing Windows nodes
1807+
File: removing-windows-nodes
1808+
- Name: Disabling Windows container workloads
1809+
File: disabling-windows-container-workloads
18111810
---
18121811
Name: Sandboxed Containers Support for OpenShift
18131812
Dir: sandboxed_containers

installing/installing-preparing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ For a production cluster, you must configure the following integrations:
9292
[id="installing-preparing-cluster-for-workloads"]
9393
== Preparing your cluster for workloads
9494

95-
Depending on your workload needs, you might need to take extra steps before you begin deploying applications. For example, after you prepare infrastructure to support your application xref:../cicd/builds/build-strategies.adoc#build-strategies[build strategy], you might need to make provisions for xref:../scalability_and_performance/cnf-performance-addon-operator-for-low-latency-nodes.adoc#cnf-performance-addon-operator-for-low-latency-nodes[low-latency] workloads or to xref:../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets[protect sensitive workloads]. You can also configure xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[monitoring] for application workloads. If you plan to run Windows workloads, you must enable xref:../networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc#configuring-hybrid-networking[hybrid networking with OVN-Kubernetes] during the installation process; hybrid networking cannot be enabled after your cluster is installed.
95+
Depending on your workload needs, you might need to take extra steps before you begin deploying applications. For example, after you prepare infrastructure to support your application xref:../cicd/builds/build-strategies.adoc#build-strategies[build strategy], you might need to make provisions for xref:../scalability_and_performance/cnf-performance-addon-operator-for-low-latency-nodes.adoc#cnf-performance-addon-operator-for-low-latency-nodes[low-latency] workloads or to xref:../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets[protect sensitive workloads]. You can also configure xref:../monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[monitoring] for application workloads. If you plan to run xref:../windows_containers/enabling-windows-container-workloads.adoc#enabling-windows-container-workloads[Windows workloads], you must enable xref:../networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc#configuring-hybrid-networking[hybrid networking with OVN-Kubernetes] during the installation process; hybrid networking cannot be enabled after your cluster is installed.
9696

9797
[id="supported-installation-methods-for-different-platforms"]
9898
== Supported installation methods for different platforms

installing/installing_aws/installing-aws-network-customizations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1]
6868

6969
[NOTE]
7070
====
71-
For more information on using Linux and Windows nodes in the same cluster, see Understanding Windows container workloads.
71+
For more information on using Linux and Windows nodes in the same cluster, see xref:../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads].
7272
====
7373

7474
include::modules/installation-launching-installer.adoc[leveloffset=+1]

installing/installing_azure/installing-azure-network-customizations.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1]
4444
include::modules/nw-operator-cr.adoc[leveloffset=+1]
4545
include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1]
4646

47+
[NOTE]
48+
====
49+
For more information on using Linux and Windows nodes in the same cluster, see xref:../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads].
50+
====
51+
4752
include::modules/installation-launching-installer.adoc[leveloffset=+1]
4853

4954
include::modules/cli-installing-cli.adoc[leveloffset=+1]

networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@ Complete any further installation configurations, and then create your cluster.
1414
[id="configuring-hybrid-networking-additional-resources"]
1515
== Additional resources
1616

17+
* xref:../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads]
18+
* xref:../../windows_containers/enabling-windows-container-workloads.adoc#enabling-windows-container-workloads[Enabling Windows container workloads]
1719
* xref:../../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[Installing a cluster on AWS with network customizations]
1820
* xref:../../installing/installing_azure/installing-azure-network-customizations.adoc#installing-azure-network-customizations[Installing a cluster on Azure with network customizations]

windows_containers/disabling-windows-container-workloads.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ include::modules/deleting-wmco-namespace.adoc[leveloffset=+1]
1515
== Additional Resources
1616

1717
* xref:../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-a-cluster[Deleting Operators from a cluster]
18+
* xref:../windows_containers/removing-windows-nodes.adoc#removing-windows-nodes[Removing Windows nodes]

windows_containers/enabling-windows-container-workloads.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ Before adding Windows workloads to your cluster, you must install the Windows Ma
2020

2121
* You are running an {product-title} cluster version 4.6.8 or later.
2222

23+
.Additional resources
24+
* For the comprehensive prerequisites for the Windows Machine Config Operator, see xref:../windows_containers/understanding-windows-container-workloads.adoc#wmco-prerequisites_understanding-windows-container-workloads[Understanding Windows container workloads].
25+
2326
[id="installing-the-wmco"]
2427
== Installing the Windows Machine Config Operator
2528

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ This release adds the following new features and improvements.
6161

6262
[id="wmco-2-0-0-vsphere-support"]
6363
==== Support for clusters running on VMware vSphere
64-
65-
You can now run Windows nodes on a cluster that is installed on VMware vSphere version 6.5, 6.7, or 7.0. You can create a Windows MachineSet object on vSphere to host Windows Server compute nodes.
64+
You can now run Windows nodes on a cluster installed on VMware vSphere version 6.5, 6.7, or 7.0. You can create a Windows `MachineSet` object on vSphere to host Windows Server compute nodes. For more information, see xref:../windows_containers/creating_windows_machinesets/creating-windows-machineset-vsphere.adoc#creating-windows-machineset-vsphere[Creating a Windows `MachineSet` object on vSphere].
6665

6766
[id="wmco-2-0-0-monitoring"]
6867
==== Enhanced Windows node monitoring

0 commit comments

Comments
 (0)