From b43d9ac086336f53d0644bd1707b9bbffe1583a3 Mon Sep 17 00:00:00 2001 From: Michael Burke Date: Mon, 1 Jul 2024 11:04:05 -0400 Subject: [PATCH] Reverting changes made to 4.16 to hide WMCO --- _topic_maps/_topic_map.yml | 76 +++++++++---------- installing/installing-preparing.adoc | 2 +- ...installing-aws-network-customizations.adoc | 4 +- ...stalling-azure-network-customizations.adoc | 4 +- ...zure-stack-hub-network-customizations.adoc | 4 +- modules/configuring-hybrid-ovnkubernetes.adoc | 33 +------- .../configuring-hybrid-networking.adoc | 4 +- welcome/index.adoc | 4 +- 8 files changed, 49 insertions(+), 82 deletions(-) diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index d0fb5733af..e2c8f4d906 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -787,8 +787,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 @@ -2638,42 +2638,42 @@ Topics: #- Name: Manage secure signatures with sigstore # File: nodes-sigstore-using --- -# 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-10-15-x -#- Name: Understanding Windows container workloads -# File: understanding-windows-container-workloads -#- Name: Enabling Windows container workloads -# File: enabling-windows-container-workloads -#- Name: Creating Windows machine sets -# Dir: creating_windows_machinesets -# Topics: -# - Name: Creating a Windows machine set on AWS -# File: creating-windows-machineset-aws -# - Name: Creating a Windows machine set on Azure -# File: creating-windows-machineset-azure -# - Name: Creating a Windows machine set on GCP -# File: creating-windows-machineset-gcp -# - Name: Creating a Windows machine set on Nutanix -# File: creating-windows-machineset-nutanix -# - Name: Creating a Windows machine set 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-10-15-x +- Name: Understanding Windows container workloads + File: understanding-windows-container-workloads +- Name: Enabling Windows container workloads + File: enabling-windows-container-workloads +- Name: Creating Windows machine sets + Dir: creating_windows_machinesets + Topics: + - Name: Creating a Windows machine set on AWS + File: creating-windows-machineset-aws + - Name: Creating a Windows machine set on Azure + File: creating-windows-machineset-azure + - Name: Creating a Windows machine set on GCP + File: creating-windows-machineset-gcp + - Name: Creating a Windows machine set on Nutanix + File: creating-windows-machineset-nutanix + - Name: Creating a Windows machine set 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: OpenShift sandboxed containers Dir: sandboxed_containers Distros: openshift-enterprise diff --git a/installing/installing-preparing.adoc b/installing/installing-preparing.adoc index 347af37a5b..43b80aca9d 100644 --- a/installing/installing-preparing.adoc +++ b/installing/installing-preparing.adoc @@ -114,7 +114,7 @@ For a production cluster, you must configure the following integrations: == 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/low_latency_tuning/cnf-tuning-low-latency-nodes-with-perf-profile.adoc#cnf-low-latency-perf-profile[low-latency] workloads or to xref:../nodes/pods/nodes-pods-secrets.adoc#nodes-pods-secrets[protect sensitive workloads]. You can also configure xref:../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects[monitoring] for application workloads. -//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. +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. [id="supported-installation-methods-for-different-platforms"] == Supported installation methods for different platforms diff --git a/installing/installing_aws/ipi/installing-aws-network-customizations.adoc b/installing/installing_aws/ipi/installing-aws-network-customizations.adoc index ae15a42818..c4a0557a46 100644 --- a/installing/installing_aws/ipi/installing-aws-network-customizations.adoc +++ b/installing/installing_aws/ipi/installing-aws-network-customizations.adoc @@ -104,12 +104,10 @@ include::modules/nw-aws-nlb-new-cluster.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 ../../../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 xref:../../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[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 index dfb5968f8f..48cf7f84df 100644 --- a/installing/installing_azure/installing-azure-network-customizations.adoc +++ b/installing/installing_azure/installing-azure-network-customizations.adoc @@ -60,12 +60,10 @@ 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 ../../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 xref:../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads]. ==== -//// [role="_additional-resources"] .Additional resources diff --git a/installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc b/installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc index 9d9eddbed7..d8e01c05e2 100644 --- a/installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc +++ b/installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc @@ -56,12 +56,10 @@ 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 ../../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 xref:../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads]. ==== -//// include::modules/installation-launching-installer.adoc[leveloffset=+1] diff --git a/modules/configuring-hybrid-ovnkubernetes.adoc b/modules/configuring-hybrid-ovnkubernetes.adoc index e24c510735..28d821fb84 100644 --- a/modules/configuring-hybrid-ovnkubernetes.adoc +++ b/modules/configuring-hybrid-ovnkubernetes.adoc @@ -15,12 +15,10 @@ endif::[] You can configure your cluster to use hybrid networking with the OVN-Kubernetes network plugin. This allows a hybrid cluster that supports different node networking configurations. -//// [NOTE] ==== This configuration is necessary to run both Linux and Windows nodes in the same cluster. ==== -//// ifndef::post-install[] .Prerequisites @@ -62,32 +60,6 @@ where: `manifests/` directory for your cluster. -- -. Open the `cluster-network-03-config.yml` file in an editor and configure OVN-Kubernetes with hybrid networking, such as in the following example: -+ -.Specify a hybrid networking configuration -[source,yaml] ----- -apiVersion: operator.openshift.io/v1 -kind: Network -metadata: - name: cluster -spec: - defaultNetwork: - ovnKubernetesConfig: - hybridOverlayConfig: - hybridClusterNetwork: <1> - - cidr: 10.132.0.0/14 - hostPrefix: 23 ----- -<1> Specify the CIDR configuration used for nodes on the additional overlay network. The `hybridClusterNetwork` CIDR cannot overlap with the `clusterNetwork` CIDR. - -. Save the `cluster-network-03-config.yml` file and quit the text editor. -. Optional: Back up the `manifests/cluster-network-03-config.yml` file. The -installation program deletes the `manifests/` directory when creating the -cluster. - -//// -Hide this step until WMCO 10.16 GAs. Remove the duplicate step that follows. . Open the `cluster-network-03-config.yml` file in an editor and configure OVN-Kubernetes with hybrid networking, such as in the following example: + -- @@ -115,8 +87,11 @@ spec: ==== Windows Server Long-Term Servicing Channel (LTSC): Windows Server 2019 is not supported on clusters with a custom `hybridOverlayVXLANPort` value because this Windows server version does not support selecting a custom VXLAN port. ==== -//// +. Save the `cluster-network-03-config.yml` file and quit the text editor. +. Optional: Back up the `manifests/cluster-network-03-config.yml` file. The +installation program deletes the `manifests/` directory when creating the +cluster. endif::post-install[] ifdef::post-install[] .Prerequisites diff --git a/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc b/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc index 76f3cf9982..9e2d6a640d 100644 --- a/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc +++ b/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc @@ -14,7 +14,7 @@ include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1] [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] +* 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/ipi/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/welcome/index.adoc b/welcome/index.adoc index 28c9c2514f..363e89590c 100644 --- a/welcome/index.adoc +++ b/welcome/index.adoc @@ -248,9 +248,7 @@ xref:../networking/network_security/network_policy/about-network-policy.adoc#abo - **xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Manage Operators]**: Lists of Red Hat, ISV, and community Operators can be reviewed by cluster administrators and xref:../operators/admin/olm-adding-operators-to-cluster.adoc#olm-adding-operators-to-a-cluster[installed on their clusters]. After you install them, you can xref:../operators/user/olm-creating-apps-from-installed-operators.adoc#olm-creating-apps-from-installed-operators[run], xref:../operators/admin/olm-upgrading-operators.adoc#olm-upgrading-operators[upgrade], back up, or otherwise manage the Operator on your cluster. -//// -- ** ../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads_understanding-windows-container-workloads[Understanding Windows container workloads]**. You can use the {productwinc} feature 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. -//// +- ** xref:../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads_understanding-windows-container-workloads[Understanding Windows container workloads]**. You can use the {productwinc} feature 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. === Change cluster components