From fda99e4e5ce87bc892e116892b645092b1d8f259 Mon Sep 17 00:00:00 2001 From: brandi swope Date: Tue, 10 Dec 2024 13:35:56 -0500 Subject: [PATCH 1/5] https://issues.redhat.com/browse/ACM-15363--infra nodes file for 2.13 acm --- install/config_infra_nodes_acm.adoc | 50 +++++++++++++++++++++++++++++ install/install_overview.adoc | 1 + 2 files changed, 51 insertions(+) create mode 100644 install/config_infra_nodes_acm.adoc diff --git a/install/config_infra_nodes_acm.adoc b/install/config_infra_nodes_acm.adoc new file mode 100644 index 0000000000..f34a09e64e --- /dev/null +++ b/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: "" +---- diff --git a/install/install_overview.adoc b/install/install_overview.adoc index bbb225cc46..727ff5ea52 100644 --- a/install/install_overview.adoc +++ b/install/install_overview.adoc @@ -20,6 +20,7 @@ The documentation references the earliest supported {ocp-short} version, unless 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: * 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/cluster_size.adoc#sizing-your-cluster[Sizing your cluster] * xref:../install/perform_scale.adoc#performance-and-scalability[Performance and scalability] From 0ade063db3ded7a6d24cb84db10dfd6d6a3f6d95 Mon Sep 17 00:00:00 2001 From: brandi swope Date: Tue, 10 Dec 2024 13:47:19 -0500 Subject: [PATCH 2/5] https://issues.redhat.com/browse/ACM-15363--infra nodes file for 2.13 acm --- install/install_connected.adoc | 55 ++-------------------------------- install/install_overview.adoc | 10 +++---- install/main.adoc | 8 ++--- 3 files changed, 12 insertions(+), 61 deletions(-) diff --git a/install/install_connected.adoc b/install/install_connected.adoc index 71a8eda817..9b10fa3581 100644 --- a/install/install_connected.adoc +++ b/install/install_connected.adoc @@ -17,7 +17,7 @@ You must have a supported version of {ocp-short} to install {acm-short}. - If you plan to import Kubernetes clusters that are not {ocp-short} or {acm-short} clusters, you need to configure an image pull secret. -- If you previously installed {acm-short} on a cluster, then uninstalled, you need to follow the clean up procedure to remove artifacts. See xref:../install/reinstall.adoc#cleanup-reinstall[Cleaning up artifacts before reinstalling] and follow the procedure. +- If you previously installed {acm-short} on a cluster, then uninstalled, you need to follow the clean up procedure to remove artifacts. See xref:../install/cleanup_reinstall.adoc#cleanup-reinstall[Cleaning up artifacts before reinstalling] and follow the procedure. For information on how to configure advanced configurations, see options in the xref:../install/adv_config_install.adoc#advanced-config-hub[MultiClusterHub advanced configuration] section of the documentation. @@ -260,62 +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`. -[#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://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 `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 ----- - -. 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: "" ----- +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] diff --git a/install/install_overview.adoc b/install/install_overview.adoc index 727ff5ea52..164d977f21 100644 --- a/install/install_overview.adoc +++ b/install/install_overview.adoc @@ -22,11 +22,11 @@ Installing {acm} sets up a multi-node cluster production environment. You can in * 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/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] \ No newline at end of file +* 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] diff --git a/install/main.adoc b/install/main.adoc index 1c13338d91..f494e5fb93 100644 --- a/install/main.adoc +++ b/install/main.adoc @@ -3,13 +3,13 @@ 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::install_connected.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::uninstall.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] + From 3a1ae6ba126e8b1ac15f495aedea2cdc443cf7e7 Mon Sep 17 00:00:00 2001 From: brandi swope Date: Tue, 10 Dec 2024 13:47:54 -0500 Subject: [PATCH 3/5] https://issues.redhat.com/browse/ACM-15363--infra nodes file for 2.13 acm --- install/main.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/install/main.adoc b/install/main.adoc index f494e5fb93..d3cc5e8eac 100644 --- a/install/main.adoc +++ b/install/main.adoc @@ -3,6 +3,7 @@ include::modules/common-attributes.adoc[] = Install include::install_overview.adoc[leveloffset=+1] +include::config_infra_nodes_acm.adoc[leveloffset=+2] include::install_connected.adoc[leveloffset=+2] include::install_disconnected.adoc[leveloffset=+2] include::adv_config_install.adoc[leveloffset=+2] From 8dc1172bc9e87c702441145e492b3f5e10b399a3 Mon Sep 17 00:00:00 2001 From: brandi swope Date: Tue, 10 Dec 2024 14:16:58 -0500 Subject: [PATCH 4/5] https://issues.redhat.com/browse/ACM-15363--infra nodes file for 2.13 acm --- .../{config_infra_nodes.adoc => config_infra_nodes_mce.adoc} | 0 clusters/install_upgrade/install_connected.adoc | 3 +-- clusters/install_upgrade/install_intro.adoc | 2 +- clusters/main.adoc | 2 +- install/main.adoc | 3 ++- 5 files changed, 5 insertions(+), 5 deletions(-) rename clusters/install_upgrade/{config_infra_nodes.adoc => config_infra_nodes_mce.adoc} (100%) diff --git a/clusters/install_upgrade/config_infra_nodes.adoc b/clusters/install_upgrade/config_infra_nodes_mce.adoc similarity index 100% rename from clusters/install_upgrade/config_infra_nodes.adoc rename to clusters/install_upgrade/config_infra_nodes_mce.adoc diff --git a/clusters/install_upgrade/install_connected.adoc b/clusters/install_upgrade/install_connected.adoc index b2883f848b..48e1c4eb0c 100644 --- a/clusters/install_upgrade/install_connected.adoc +++ b/clusters/install_upgrade/install_connected.adoc @@ -20,7 +20,6 @@ The {mce-short} is installed with Operator Lifecycle Manager, which manages the * <> * <> * <> -* <> [#connect-prerequisites-mce] == Prerequisites @@ -249,4 +248,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. \ No newline at end of file +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. \ No newline at end of file diff --git a/clusters/install_upgrade/install_intro.adoc b/clusters/install_upgrade/install_intro.adoc index 068ef148c7..45bd13f148 100644 --- a/clusters/install_upgrade/install_intro.adoc +++ b/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] diff --git a/clusters/main.adoc b/clusters/main.adoc index f28d887503..9890b8e6bf 100644 --- a/clusters/main.adoc +++ b/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] diff --git a/install/main.adoc b/install/main.adoc index d3cc5e8eac..7f2a916ea6 100644 --- a/install/main.adoc +++ b/install/main.adoc @@ -10,7 +10,8 @@ include::adv_config_install.adoc[leveloffset=+2] include::upgrade_hub.adoc[leveloffset=+2] include::upgrade_disconnected.adoc[leveloffset=+2] include::cluster_size.adoc[leveloffset=+3] -include::perform_scale.adoc[leveloffset=+2]include::uninstall.adoc[leveloffset=+2] +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] From f5e42ac609f5d2c24afe46b56b764e6589713bc0 Mon Sep 17 00:00:00 2001 From: brandi swope Date: Tue, 10 Dec 2024 14:26:05 -0500 Subject: [PATCH 5/5] https://issues.redhat.com/browse/ACM-15363--infra nodes file for 2.13 acm --- install/install_overview.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install_overview.adoc b/install/install_overview.adoc index 164d977f21..10f24ddd20 100644 --- a/install/install_overview.adoc +++ b/install/install_overview.adoc @@ -17,7 +17,7 @@ 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:../config_infra_nodes_acm.adoc#config-infra-node-acm[Configuring infrastructure nodes for {acm-short}]