Merge pull request #34432 from EricPonvelle/WMCO-3.0-Hide

bmcelvee · web-flow · commit db9cf36983f7 · 2021-07-21T16:57:20.000-04:00
WMCO-3.0.0: Temporarily removed WMCO information from the OCP 4.8 release
diff --git a/_topic_map.yml b/_topic_map.yml
@@ -1768,34 +1768,35 @@ Topics:
   Topics:
   - Name: Using remote worker node at the network edge
     File: nodes-edge-remote-workers
----
-Name: Windows Container Support for OpenShift
-Dir: windows_containers
-Distros: openshift-origin,openshift-enterprise
-Topics:
-- Name: Windows Container Support for OpenShift release notes
-  File: windows-containers-release-notes-2-x
-- Name: Understanding Windows container workloads
-  File: understanding-windows-container-workloads
-- Name: Enabling Windows container workloads
-  File: enabling-windows-container-workloads
-- Name: Creating Windows MachineSet objects
-  Dir: creating_windows_machinesets
-  Topics:
-  - Name: Creating a Windows MachineSet object on AWS
-    File: creating-windows-machineset-aws
-  - Name: Creating a Windows MachineSet object on Azure
-    File: creating-windows-machineset-azure
-  - Name: Creating a Windows MachineSet object on vSphere
-    File: creating-windows-machineset-vsphere
-- Name: Scheduling Windows container workloads
-  File: scheduling-windows-workloads
-- Name: Windows node upgrades
-  File: windows-node-upgrades
-- Name: Removing Windows nodes
-  File: removing-windows-nodes
-- Name: Disabling Windows container workloads
-  File: disabling-windows-container-workloads
+#---
+# WMCO-3.0 Note: This section was hidden in the 4.8 documentation set since WMCO 3.0 releases a few days later.
+# Name: Windows Container Support for OpenShift
+# Dir: windows_containers
+#Distros: openshift-origin,openshift-enterprise
+#Topics:
+#- Name: Windows Container Support for OpenShift release notes
+#  File: windows-containers-release-notes-2-x
+#- Name: Understanding Windows container workloads
+#  File: understanding-windows-container-workloads
+#- Name: Enabling Windows container workloads
+#  File: enabling-windows-container-workloads
+#- Name: Creating Windows MachineSet objects
+#  Dir: creating_windows_machinesets
+#  Topics:
+#  - Name: Creating a Windows MachineSet object on AWS
+#    File: creating-windows-machineset-aws
+#  - Name: Creating a Windows MachineSet object on Azure
+#    File: creating-windows-machineset-azure
+#  - Name: Creating a Windows MachineSet object on vSphere
+#    File: creating-windows-machineset-vsphere
+#- Name: Scheduling Windows container workloads
+#  File: scheduling-windows-workloads
+#- Name: Windows node upgrades
+#  File: windows-node-upgrades
+#- Name: Removing Windows nodes
+#  File: removing-windows-nodes
+#- Name: Disabling Windows container workloads
+#  File: disabling-windows-container-workloads
 ---
 Name: Sandboxed Containers Support for OpenShift
 Dir: sandboxed_containers
diff --git a/installing/installing-preparing.adoc b/installing/installing-preparing.adoc
@@ -92,7 +92,7 @@ For a production cluster, you must configure the following integrations:
 [id="installing-preparing-cluster-for-workloads"]
 == Preparing your cluster for workloads
 
-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.
+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.
 
 [id="supported-installation-methods-for-different-platforms"]
 == Supported installation methods for different platforms
diff --git a/installing/installing_aws/installing-aws-network-customizations.adoc b/installing/installing_aws/installing-aws-network-customizations.adoc
@@ -68,7 +68,7 @@ include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1]
 
 [NOTE]
 ====
-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].
+For more information on using Linux and Windows nodes in the same cluster, see Understanding Windows container workloads.
 ====
 
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
diff --git a/installing/installing_azure/installing-azure-network-customizations.adoc b/installing/installing_azure/installing-azure-network-customizations.adoc
@@ -44,11 +44,6 @@ include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1]
 include::modules/nw-operator-cr.adoc[leveloffset=+1]
 include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1]
 
-[NOTE]
-====
-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].
-====
-
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
 
 include::modules/cli-installing-cli.adoc[leveloffset=+1]
diff --git a/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc b/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc
@@ -14,7 +14,5 @@ Complete any further installation configurations, and then create your cluster.
 [id="configuring-hybrid-networking-additional-resources"]
 == Additional resources
 
-* xref:../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads]
-* xref:../../windows_containers/enabling-windows-container-workloads.adoc#enabling-windows-container-workloads[Enabling Windows container workloads]
 * xref:../../installing/installing_aws/installing-aws-network-customizations.adoc#installing-aws-network-customizations[Installing a cluster on AWS with network customizations]
 * xref:../../installing/installing_azure/installing-azure-network-customizations.adoc#installing-azure-network-customizations[Installing a cluster on Azure with network customizations]
diff --git a/windows_containers/disabling-windows-container-workloads.adoc b/windows_containers/disabling-windows-container-workloads.adoc
@@ -15,5 +15,3 @@ include::modules/deleting-wmco-namespace.adoc[leveloffset=+1]
 == Additional Resources
 
 * xref:../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-a-cluster[Deleting Operators from a cluster]
-
-* xref:../windows_containers/removing-windows-nodes.adoc#removing-windows-nodes[Removing Windows nodes].
diff --git a/windows_containers/enabling-windows-container-workloads.adoc b/windows_containers/enabling-windows-container-workloads.adoc
@@ -20,9 +20,6 @@ Before adding Windows workloads to your cluster, you must install the Windows Ma
 
 * You are running an {product-title} cluster version 4.6.8 or later.
 
-.Additional resources
-* 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].
-
 [id="installing-the-wmco"]
 == Installing the Windows Machine Config Operator
 
diff --git a/windows_containers/windows-containers-release-notes-2-x.adoc b/windows_containers/windows-containers-release-notes-2-x.adoc
@@ -62,7 +62,7 @@ This release adds the following new features and improvements.
 [id="wmco-2-0-0-vsphere-support"]
 ==== Support for clusters running on VMware vSphere
 
-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].
+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.
 
 [id="wmco-2-0-0-monitoring"]
 ==== Enhanced Windows node monitoring
@@ -76,4 +76,4 @@ Windows nodes are now fully integrated with most of the monitoring capabilities
 
 * The Prometheus windows_exporter used by the WMCO currently collects metrics through HTTP, so it is considered unsafe. You must ensure that only trusted users can retrieve metrics from the endpoint. The windows_exporter feature recently added support for HTTPS configuration, but this configuration has not been implemented for WMCO. Support for HTTPS configuration in the WMCO will be added in a future release.
 
-* The kube-proxy service terminates unexpectedly after the load balancer is created if you create the load balancer after the Windows pods begin running. To avoid this issue, you must create the load balancer before the Windows pods status transitions to `Running`. (link:https://bugzilla.redhat.com/show_bug.cgi?id=1939968[*BZ#1939968*])
+* The kube-proxy service terminates unexpectedly after the load balancer is created if you create the load balancer after the Windows pods begin running. To avoid this issue, you must create the load balancer before the Windows pods statuses transition to `Running`. (link:https://bugzilla.redhat.com/show_bug.cgi?id=1939968[*BZ#1939968*])
