Merge pull request #7331 from stolostron/swope-move-content3

https://issues.redhat.com/browse/ACM-15363--infra nodes file for 2.13…

clusters/install_upgrade/install_connected.adoc

@@ -249,4 +249,4 @@ If you are reinstalling the {mce-short} and the pods do not start, see xref:./un
 {mce-short} and to any user credentials with access to the namespace where you install 
 {mce-short}.
 
-You can now configure your {ocp-short} cluster to contain infrastructure nodes to run approved management components. Running components on infrastructure nodes avoids allocating {ocp-short} subscription quota for the nodes that are running those management components. See xref:./config_infra_nodes.adoc#config-infra-node-mce[Configuring infrastructure nodes for {mce-short}] for that procedure.
+You can now configure your {ocp-short} cluster to contain infrastructure nodes to run approved management components. Running components on infrastructure nodes avoids allocating {ocp-short} subscription quota for the nodes that are running those management components. See xref:./config_infra_nodes_mce.adoc#config-infra-node-mce[Configuring infrastructure nodes for {mce-short}] for that procedure.

clusters/install_upgrade/install_intro.adoc

@@ -16,7 +16,7 @@ For full support information, see the link:https://access.redhat.com/articles/70
 See the following documentation:
 
 * xref:./install_connected.adoc#installing-while-connected-online-mce[Installing while connected online]
-* xref:./config_infra_nodes.adoc#config-infra-node-mce[Configuring infrastructure nodes for {mce-short}]
+* xref:./config_infra_nodes_mce.adoc#config-infra-node-mce[Configuring infrastructure nodes for {mce-short}]
 * xref:./install_disconnected.adoc#install-on-disconnected-networks[Installing on disconnected networks]
 * xref:./uninstall.adoc#uninstalling-mce[Uninstalling]
 * xref:../about/mce_networking.adoc#mce-network-configuration[Network configuration]

clusters/main.adoc

@@ -13,7 +13,7 @@ include::release_notes/mce_known_issues.adoc[leveloffset=+3]
 include::release_notes/mce_deprecate_remove.adoc[leveloffset=+3]
 include::install_upgrade/install_intro.adoc[leveloffset=+2]
 include::install_upgrade/install_connected.adoc[leveloffset=+3]
-include::install_upgrade/config_infra_nodes.adoc[leveloffset=+3]
+include::install_upgrade/config_infra_nodes_mce.adoc[leveloffset=+3]
 include::install_upgrade/install_disconnected.adoc[leveloffset=+3]
 include::install_upgrade/adv_config_install.adoc[leveloffset=+3]
 include::install_upgrade/uninstall.adoc[leveloffset=+3]

install/config_infra_nodes_acm.adoc

@@ -0,0 +1,50 @@
+[#config-infra-node-acm]
+= Configuring infrastructure nodes for {acm-short}
+
+Configure your {ocp-short} cluster to contain infrastructure nodes to run approved {acm-short} management components. Running components on infrastructure nodes avoids allocating {ocp-short} subscription quota for the nodes that are running {acm-short} management components.
+
+After adding infrastructure nodes to your {ocp-short} cluster, follow the xref:../install/install_connected.adoc#installing-from-the-cli[Installing from the {ocp-short} CLI] instructions and add configurations to the {olm} subscription and `MultiClusterHub` custom resource.
+
+[#config-infra-nodes-ocp]
+== Configuring infrastructure nodes to the {ocp-short} cluster
+
+Follow the procedures that are described in link:https://docs.redhat.com/documentation/en-us/openshift_container_platform/4.15/html/machine_management/creating-infrastructure-machinesets[Creating infrastructure machine sets] in the {ocp-short} documentation. Infrastructure nodes are configured with a Kubernetes `taints` and `labels` to keep non-management workloads from running on them.
+
+. To be compatible with the infrastructure node enablement provided by {acm-short}, ensure your infrastructure nodes have the following `taints` and `labels` applied:
+
++
+[source,yaml]
+----
+metadata:
+  labels:
+    node-role.kubernetes.io/infra: ""
+spec:
+  taints:
+  - effect: NoSchedule
+    key: node-role.kubernetes.io/infra
+----
+
+. Add the following additional configuration before applying the {olm} Subscription:
+
++
+[source,yaml]
+----
+spec:
+  config:
+    nodeSelector:
+      node-role.kubernetes.io/infra: ""
+    tolerations:
+    - key: node-role.kubernetes.io/infra
+      effect: NoSchedule
+      operator: Exists
+----
+
+. Add the following additional configuration before you apply the `MultiClusterHub` custom resource:
+
++
+[source,yaml]
+----
+spec:
+  nodeSelector:
+    node-role.kubernetes.io/infra: ""
+----

install/install_connected.adoc

@@ -260,13 +260,13 @@ oc get mch -o yaml
 
 - *Important:* For security reasons, do not give access to the `local-cluster` namespace to any user that is not a `cluster-administrator`.
 
-You can now configure your {ocp-short} cluster to contain infrastructure nodes to run approved management components. Running components on infrastructure nodes avoids allocating {ocp-short} subscription quota for the nodes that are running those management components. See xref:./config_infra_nodes.adoc#config-infra-node-mce[Configuring infrastructure nodes for {acm-short}] for that procedure.
+You can now configure your {ocp-short} cluster to contain infrastructure nodes to run approved management components. Running components on infrastructure nodes avoids allocating {ocp-short} subscription quota for the nodes that are running those management components. See xref:./config_infra_nodes_acm.adoc#config-infra-node-acm[Configuring infrastructure nodes for {acm-short}] for that procedure.
 
 [#additional-resources-install]
 
 Learn about sizing, scaling, and advanced configuration.
 
+* xref:../install/adv_config_install.adoc#advanced-config-hub[MultiClusterHub advanced configuration]
 * xref:../install/cluster_size.adoc#sizing-your-cluster[Sizing your cluster]
 * xref:../install/perform_scale.adoc#performance-and-scalability[Performance and scalability]
-* xref:../install/adv_config_install.adoc#advanced-config-hub[MultiClusterHub advanced configuration]
 * link:../console/console_access.adoc#accessing-your-console[Accessing your console]

install/install_overview.adoc

@@ -17,16 +17,16 @@ For full support information, see the link:https://access.redhat.com/articles/70
 
 The documentation references the earliest supported {ocp-short} version, unless a specific component or function is introduced and tested only on a more recent version of {ocp-short}.
 
-Installing {acm} sets up a multi-node cluster production environment. You can install {acm} in either standard or high-availability configurations. View the following documentation for more information about the installation and upgrade procedures, as well as information about advanced configuration, scalability, and sizing:
+Installing {acm} sets up a multi-node cluster production environment. You can install {acm} in either standard or high-availability configurations. View the following documentation for more information about the installation and upgrade procedures, and information about advanced configuration, scalability, and sizing:
 
 * xref:../install/install_connected.adoc#installing-while-connected-online[Installing while connected online]
-* xref:../install/config_infra_nodes.adoc#config-infra-node-mce[Configuring infrastructure nodes for {acm-short}]
+xref:../config_infra_nodes_acm.adoc#config-infra-node-acm[Configuring infrastructure nodes for {acm-short}]
 * xref:../install/install_disconnected.adoc#install-on-disconnected-networks[Install on disconnected networks]
-* xref:../install/cluster_size.adoc#sizing-your-cluster[Sizing your cluster]
-* xref:../install/perform_scale.adoc#performance-and-scalability[Performance and scalability]
 * xref:../install/adv_config_install.adoc#advanced-config-hub[MultiClusterHub advanced configuration]
 * xref:../install/upgrade_hub.adoc#upgrading[Upgrading]
-* xref:../install/upgrade_hub.adoc#upgrading-disconnected[Upgrading in a disconnected network environment]
-* xref:../install/upgrade_cluster_disconnected_policies.adoc#upgrading-disconnected-clusters-policies[Upgrading disconnected clusters using policies]
+* xref:../install/upgrade_disconnected.adoc#upgrading-disconnected[Upgrading in a disconnected network environment]
+* xref:../install/cluster_size.adoc#sizing-your-cluster[Sizing your cluster]
+* xref:../install/perform_scale.adoc#performance-and-scalability[Performance and scalability]
 * xref:../install/uninstall.adoc#uninstalling[Uninstalling]
-* xref:../install/cleanup_reinstall.adoc#cleanup-reinstall[Cleaning up artifacts before reinstalling]
+* xref:../install/cleanup_reinstall.adoc#cleanup-reinstall[Cleaning up artifacts before reinstalling]
+* xref:../install/upgrade_cluster_disconnected_policies.adoc#upgrading-disconnected-clusters-policies[Upgrading disconnected clusters using policies]

install/main.adoc

@@ -3,14 +3,16 @@ include::modules/common-attributes.adoc[]
 = Install
 
 include::install_overview.adoc[leveloffset=+1]
-include::perform_scale.adoc[leveloffset=+2]
-include::cluster_size.adoc[leveloffset=+3]
+include::config_infra_nodes_acm.adoc[leveloffset=+2]
 include::install_connected.adoc[leveloffset=+2]
 include::config_infra_nodes.adoc[leveloffset=+2]
 include::install_disconnected.adoc[leveloffset=+2]
 include::adv_config_install.adoc[leveloffset=+2]
 include::upgrade_hub.adoc[leveloffset=+2]
 include::upgrade_disconnected.adoc[leveloffset=+2]
-include::upgrade_cluster_disconnected_policies.adoc[leveloffset=+2]
+include::cluster_size.adoc[leveloffset=+3]
+include::perform_scale.adoc[leveloffset=+2]
 include::uninstall.adoc[leveloffset=+2]
 include::cleanup_reinstall.adoc[leveloffset=+2]
+include::upgrade_cluster_disconnected_policies.adoc[leveloffset=+2]
+