Merge pull request #7297 from stolostron/swope-move-content

move content for customer bug--content does not change.

clusters/install_upgrade/config_infra_nodes_mce.adoc

@@ -0,0 +1,55 @@
+[#config-infra-node-mce]
+= Configuring infrastructure nodes for {mce-short}
+
+Configure your {ocp-short} cluster to contain infrastructure nodes to run approved {mce-short} management components. Running components on infrastructure nodes avoids allocating {ocp-short} subscription quota for the nodes that are running {mce-short} management components.
+
+After adding infrastructure nodes to your {ocp-short} cluster, follow the xref:./install_connected.adoc#installing-from-the-cli-mce[Installing from the {ocp-short} CLI] instructions and add the following configurations to the Operator Lifecycle Manager Subscription and `MultiClusterEngine` 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.14/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 
+{mce-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
+----
+
+[#infra-olm-subscription]
+== Operator Lifecycle Manager subscription configuration
+
+Add the following additional configuration before applying the Operator Lifecycle Manager Subscription:
+
+[source,yaml]
+----
+spec:
+  config:
+    nodeSelector:
+      node-role.kubernetes.io/infra: ""
+    tolerations:
+    - key: node-role.kubernetes.io/infra
+      effect: NoSchedule
+      operator: Exists
+----
+
+[#infra-mce-add-config]
+== MultiClusterEngine custom resource additional configuration
+
+Add the following additional configuration before applying the `MultiClusterEngine` custom resource:
+
+[source,yaml]
+----
+spec:
+  nodeSelector:
+    node-role.kubernetes.io/infra: ""
+----

clusters/install_upgrade/install_connected.adoc

@@ -20,7 +20,6 @@ The {mce-short} is installed with Operator Lifecycle Manager, which manages the
 * <<confirm-ocp-installation-mce,Confirm your {ocp-short} installation>>
 * <<installing-from-the-operatorhub-mce,Installing from the OperatorHub web console interface>>
 * <<installing-from-the-cli-mce,Installing from the {ocp-short} CLI>>
-* <<installing-on-infra-node-mce,Installing multicluster engine on infrastructure nodes>>
 
 [#connect-prerequisites-mce]
 == Prerequisites
@@ -193,7 +192,7 @@ spec:
 ----
 
 +
-*Note:* For installing the {mce} on infrastructure nodes, the see xref:./install_connected.adoc#infra-olm-sub-add-config-mce[Operator Lifecycle Manager Subscription additional configuration] section.
+*Note:* To configure infrastructure nodes, see xref:./config_infra_nodes_mce.adoc#config-infra-node-mce[Configuring infrastructure nodes for {mce-short}].
 
 +
 . Run the following command to create the {ocp-short} Subscription. Replace `subscription` with the name of the subscription file that you created:
@@ -248,59 +247,3 @@ If you are reinstalling the {mce-short} and the pods do not start, see xref:./un
 - A `ServiceAccount` with a `ClusterRoleBinding` automatically gives cluster administrator privileges to 
 {mce-short} and to any user credentials with access to the namespace where you install 
 {mce-short}.
-
-[#installing-on-infra-node-mce]
-== Installing on infrastructure nodes
-
-An {ocp-short} cluster can be configured to contain infrastructure nodes for running approved management components. Running components on infrastructure nodes avoids allocating {ocp-short} subscription quota for the nodes that are running those management components.
-
-After adding infrastructure nodes to your {ocp-short} cluster, follow the xref:./install_connected.adoc#installing-from-the-cli-mce[Installing from the {ocp-short} CLI] instructions and add the following configurations to the  Operator Lifecycle Manager Subscription and `MultiClusterEngine` custom resource.
-
-[#adding-infra-nodes-mce]
-=== Add infrastructure nodes to the {ocp-short} cluster
-
-Follow the procedures that are described in
-link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.14/html/machine_management/creating-infrastructure-machinesets[Creating infrastructure machine sets] in the {ocp-short} documentation. Infrastructure nodes are configured with a Kubernetes `taint` and `label` to keep non-management workloads from running on them.
-
-To be compatible with the infrastructure node enablement provided by 
-{mce-short}, ensure your infrastructure nodes have the following `taint` and `label` applied:
-
-[source,yaml]
-----
-metadata:
-  labels:
-    node-role.kubernetes.io/infra: ""
-spec:
-  taints:
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/infra
-----
-
-[#infra-olm-sub-add-config-mce]
-===  Operator Lifecycle Manager Subscription additional configuration
-
-Add the following additional configuration before applying the Operator Lifecycle Manager Subscription:
-
-[source,yaml]
-----
-spec:
-  config:
-    nodeSelector:
-      node-role.kubernetes.io/infra: ""
-    tolerations:
-    - key: node-role.kubernetes.io/infra
-      effect: NoSchedule
-      operator: Exists
-----
-
-[#infra-mce-add-config]
-=== MultiClusterEngine custom resource additional configuration
-
-Add the following additional configuration before applying the `MultiClusterEngine` custom resource:
-
-[source,yaml]
-----
-spec:
-  nodeSelector:
-    node-role.kubernetes.io/infra: ""
-----

clusters/install_upgrade/install_intro.adoc

@@ -16,6 +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_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

@@ -14,6 +14,7 @@ include::about/rbac_mce.adoc[leveloffset=+3]
 include::about/mce_networking.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_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.14/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

@@ -243,56 +243,4 @@ If you are reinstalling {acm-short} and the pods do not start, see link:../troub
 
 - The installation also creates a namespace called `local-cluster` that is reserved for the {acm-short} hub cluster when it is managed by itself. There cannot be an existing namespace called `local-cluster`. For security reasons, do not release access to the `local-cluster` namespace to any user who does not already have `cluster-administrator` access.
 
-[#installing-on-infra-node]
-== Installing the {acm-short} hub cluster on infrastructure nodes
-
-An {ocp-short} cluster can be configured to contain infrastructure nodes for running approved management components. Running components on infrastructure nodes avoids allocating {ocp-short} subscription quota for the nodes that are running those 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.
-
-[#adding-infra-nodes]
-=== Add infrastructure nodes to the {ocp-short} cluster
-
-Follow the procedures that are described in link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.14/html/machine_management/creating-infrastructure-machinesets[Creating infrastructure machine sets] in the {ocp-short} documentation. Infrastructure nodes are configured with a Kubernetes `taint` and `label` 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 `taint` and `label` applied:
-
-[source,yaml]
-----
-metadata:
-  labels:
-    node-role.kubernetes.io/infra: ""
-spec:
-  taints:
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/infra
-----
-
-[#infra-olm-sub-add-config]
-=== {olm} Subscription additional configuration
-
-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
-----
-
-[#infra-mch-add-config]
-=== MultiClusterHub custom resource additional configuration
-
-Add the following additional configuration before applying the `MultiClusterHub` custom resource:
-
-[source,yaml]
-----
-spec:
-  nodeSelector:
-    node-role.kubernetes.io/infra: ""
-----
+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:../install/config_infra_nodes.adoc#config-infra-node-acm[Configuring infrastructure nodes for {acm-short}] for that procedure.

install/install_overview.adoc

@@ -20,6 +20,7 @@ Installing {acm} sets up a multi-node cluster production environment. You can in
 * xref:../install/cluster_size.adoc#sizing-your-cluster[Sizing your cluster]
 * xref:../install/perform_scale.adoc#performance-and-scalability[Performance and scalability]
 * xref:../install/install_connected.adoc#installing-while-connected-online[Installing while connected online]
+* 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/adv_config_install.adoc#advanced-config-hub[MultiClusterHub advanced configuration]
 * xref:../install/upgrade_hub.adoc#upgrading[Upgrading]

install/main.adoc

@@ -6,6 +6,7 @@ include::install_overview.adoc[leveloffset=+1]
 include::perform_scale.adoc[leveloffset=+2]
 include::cluster_size.adoc[leveloffset=+3]
 include::install_connected.adoc[leveloffset=+2]
+include::config_infra_nodes_acm.adoc[leveloffset=+2]
 include::install_disconnected.adoc[leveloffset=+2]
 include::adv_config_install.adoc[leveloffset=+2]
 include::upgrade_hub.adoc[leveloffset=+2]