diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 852eeb112b..ebc6e31ced 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -590,8 +590,8 @@ Topics: File: troubleshooting-s2i - Name: Troubleshooting storage issues File: troubleshooting-storage-issues - - Name: Troubleshooting Windows container workload issues - File: troubleshooting-windows-container-workload-issues +# - Name: Troubleshooting Windows container workload issues +# File: troubleshooting-windows-container-workload-issues - Name: Investigating monitoring issues File: investigating-monitoring-issues - Name: Diagnosing OpenShift CLI (oc) issues @@ -2041,38 +2041,38 @@ 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: Red Hat OpenShift support for Windows Containers overview - File: index -- Name: Red Hat OpenShift support for Windows Containers release notes - File: windows-containers-release-notes-6-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: 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: Windows Container Support for OpenShift +#Dir: windows_containers +#Distros: openshift-origin,openshift-enterprise +#Topics: +#- Name: Red Hat OpenShift support for Windows Containers overview +# File: index +#- Name: Red Hat OpenShift support for Windows Containers release notes +# File: windows-containers-release-notes-6-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: 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: Sandboxed Containers Support for OpenShift Dir: sandboxed_containers diff --git a/installing/installing_aws/installing-aws-network-customizations.adoc b/installing/installing_aws/installing-aws-network-customizations.adoc index 94ed923e9a..fd6ae44f4b 100644 --- a/installing/installing_aws/installing-aws-network-customizations.adoc +++ b/installing/installing_aws/installing-aws-network-customizations.adoc @@ -55,6 +55,7 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2] include::modules/nw-operator-cr.adoc[leveloffset=+1] include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1] + [NOTE] ==== For more information on using a Network Load Balancer (NLB) on AWS, see xref:../../networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-aws.adoc#configuring-ingress-cluster-traffic-aws-network-load-balancer[Configuring Ingress cluster traffic on AWS using a Network Load Balancer]. diff --git a/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc b/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc index 6708c90834..f44b50e79a 100644 --- a/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc +++ b/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc @@ -16,7 +16,7 @@ Complete any further installation configurations, and then create your cluster. [id="configuring-hybrid-networking-additional-resources"] == Additional resources -//* ../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads] -//* ../../windows_containers/enabling-windows-container-workloads.adoc#enabling-windows-container-workloads[Enabling Windows container workloads] +//*../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads] +//*../../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/enabling-windows-container-workloads.adoc b/windows_containers/enabling-windows-container-workloads.adoc index 0188fe6b06..f369a11cdc 100644 --- a/windows_containers/enabling-windows-container-workloads.adoc +++ b/windows_containers/enabling-windows-container-workloads.adoc @@ -28,7 +28,7 @@ Dual NIC is not supported on WMCO-managed Windows instances. [role="_additional-resources"] .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]. +//* 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