Skip to content

Commit fcaacaa

Browse files
authored
Merge pull request #47754 from Amrita42/hide-wmco-content
hide all wmco content
2 parents b5137d1 + fc978b0 commit fcaacaa

File tree

7 files changed

+47
-38
lines changed

7 files changed

+47
-38
lines changed

_topic_maps/_topic_map.yml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,8 @@ Topics:
591591
File: troubleshooting-s2i
592592
- Name: Troubleshooting storage issues
593593
File: troubleshooting-storage-issues
594-
- Name: Troubleshooting Windows container workload issues
595-
File: troubleshooting-windows-container-workload-issues
594+
# - Name: Troubleshooting Windows container workload issues
595+
# File: troubleshooting-windows-container-workload-issues
596596
- Name: Investigating monitoring issues
597597
File: investigating-monitoring-issues
598598
- Name: Diagnosing OpenShift CLI (oc) issues
@@ -2040,38 +2040,38 @@ Topics:
20402040
Topics:
20412041
- Name: Using remote worker node at the network edge
20422042
File: nodes-edge-remote-workers
2043-
---
2044-
Name: Windows Container Support for OpenShift
2045-
Dir: windows_containers
2046-
Distros: openshift-origin,openshift-enterprise
2047-
Topics:
2048-
- Name: Red Hat OpenShift support for Windows Containers overview
2049-
File: index
2050-
- Name: Red Hat OpenShift support for Windows Containers release notes
2051-
File: windows-containers-release-notes-6-x
2052-
- Name: Understanding Windows container workloads
2053-
File: understanding-windows-container-workloads
2054-
- Name: Enabling Windows container workloads
2055-
File: enabling-windows-container-workloads
2056-
- Name: Creating Windows MachineSet objects
2057-
Dir: creating_windows_machinesets
2058-
Topics:
2059-
- Name: Creating a Windows MachineSet object on AWS
2060-
File: creating-windows-machineset-aws
2061-
- Name: Creating a Windows MachineSet object on Azure
2062-
File: creating-windows-machineset-azure
2063-
- Name: Creating a Windows MachineSet object on vSphere
2064-
File: creating-windows-machineset-vsphere
2065-
- Name: Scheduling Windows container workloads
2066-
File: scheduling-windows-workloads
2067-
- Name: Windows node upgrades
2068-
File: windows-node-upgrades
2069-
- Name: Using Bring-Your-Own-Host Windows instances as nodes
2070-
File: byoh-windows-instance
2071-
- Name: Removing Windows nodes
2072-
File: removing-windows-nodes
2073-
- Name: Disabling Windows container workloads
2074-
File: disabling-windows-container-workloads
2043+
2044+
#Name: Windows Container Support for OpenShift
2045+
#Dir: windows_containers
2046+
#Distros: openshift-origin,openshift-enterprise
2047+
#Topics:
2048+
#- Name: Red Hat OpenShift support for Windows Containers overview
2049+
# File: index
2050+
#- Name: Red Hat OpenShift support for Windows Containers release notes
2051+
# File: windows-containers-release-notes-6-x
2052+
#- Name: Understanding Windows container workloads
2053+
# File: understanding-windows-container-workloads
2054+
#- Name: Enabling Windows container workloads
2055+
# File: enabling-windows-container-workloads
2056+
#- Name: Creating Windows MachineSet objects
2057+
# Dir: creating_windows_machinesets
2058+
# Topics:
2059+
# - Name: Creating a Windows MachineSet object on AWS
2060+
# File: creating-windows-machineset-aws
2061+
# - Name: Creating a Windows MachineSet object on Azure
2062+
# File: creating-windows-machineset-azure
2063+
# - Name: Creating a Windows MachineSet object on vSphere
2064+
# File: creating-windows-machineset-vsphere
2065+
#- Name: Scheduling Windows container workloads
2066+
# File: scheduling-windows-workloads
2067+
#- Name: Windows node upgrades
2068+
# File: windows-node-upgrades
2069+
#- Name: Using Bring-Your-Own-Host Windows instances as nodes
2070+
# File: byoh-windows-instance
2071+
#- Name: Removing Windows nodes
2072+
# File: removing-windows-nodes
2073+
#- Name: Disabling Windows container workloads
2074+
# File: disabling-windows-container-workloads
20752075
---
20762076
Name: Sandboxed Containers Support for OpenShift
20772077
Dir: sandboxed_containers

installing/installing-preparing.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ For a production cluster, you must configure the following integrations:
109109
[id="installing-preparing-cluster-for-workloads"]
110110
== Preparing your cluster for workloads
111111

112-
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.
112+
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.
113+
//If you plan to run ../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.
113114

114115
[id="supported-installation-methods-for-different-platforms"]
115116
== Supported installation methods for different platforms

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2]
5555
include::modules/nw-operator-cr.adoc[leveloffset=+1]
5656
include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1]
5757

58+
5859
[NOTE]
5960
====
6061
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].
@@ -64,10 +65,12 @@ include::modules/nw-aws-nlb-new-cluster.adoc[leveloffset=+1]
6465

6566
include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1]
6667

68+
////
6769
[NOTE]
6870
====
6971
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].
7072
====
73+
////
7174

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1]
4646
include::modules/nw-operator-cr.adoc[leveloffset=+1]
4747
include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1]
4848

49+
////
4950
[NOTE]
5051
====
5152
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].
5253
====
54+
////
5355

5456
// Enabling Accelerated Networking during install
5557
include::modules/machineset-azure-enabling-accelerated-networking-new-install.adoc[leveloffset=+1]

installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,13 @@ include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1]
5252
include::modules/nw-operator-cr.adoc[leveloffset=+1]
5353
include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1]
5454

55+
////
5556
[NOTE]
5657
====
5758
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].
5859
====
60+
////
61+
5962
include::modules/installation-launching-installer.adoc[leveloffset=+1]
6063

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

networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc

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

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

windows_containers/enabling-windows-container-workloads.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Dual NIC is not supported on WMCO-managed Windows instances.
2828

2929
[role="_additional-resources"]
3030
.Additional resources
31-
* 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].
31+
//* 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].
3232

3333
[id="installing-the-wmco"]
3434
== Installing the Windows Machine Config Operator

0 commit comments

Comments
 (0)