From afcd738bf91254ff80d6421147e965d67165c059 Mon Sep 17 00:00:00 2001 From: ekristov Date: Tue, 18 Apr 2023 11:55:30 +0200 Subject: [PATCH] RHDEVDOCS-5142: Document tainting nodes --- ...ing-an-application-with-cluster-configurations.adoc | 9 +++++++-- ...n-gitops-control-plane-workload-on-infra-nodes.adoc | 10 ++++++++-- modules/go-add-infra-nodes.adoc | 5 ++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc b/cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc index 34c10f68de..0fd9b7f52e 100644 --- a/cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc +++ b/cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc @@ -6,15 +6,20 @@ include::_attributes/common-attributes.adoc[] toc::[] -With Red Hat OpenShift GitOps, you can configure Argo CD to recursively sync the content of a Git directory with an application that contains custom configurations for your cluster. +With {gitops-title}, you can configure Argo CD to recursively sync the content of a Git directory with an application that contains custom configurations for your cluster. .Prerequisites -* Red Hat OpenShift GitOps is installed in your cluster. +* {gitops-title} is installed in your cluster. * Logged into Argo CD instance. include::modules/go-run-argo-cd-instance-on-infrastructure-nodes.adoc[leveloffset=+1] +[role="_additional-resources"] +.Additional resources +* To learn more about taints and tolerations, see xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]. +* For more information on infrastructure machine sets, see xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets]. + include::modules/gitops-creating-an-application-by-using-the-argo-cd-dashboard.adoc[leveloffset=+1] include::modules/gitops-creating-an-application-by-using-the-oc-tool.adoc[leveloffset=+1] diff --git a/cicd/gitops/run-gitops-control-plane-workload-on-infra-nodes.adoc b/cicd/gitops/run-gitops-control-plane-workload-on-infra-nodes.adoc index 4c3f848a29..21122fe294 100644 --- a/cicd/gitops/run-gitops-control-plane-workload-on-infra-nodes.adoc +++ b/cicd/gitops/run-gitops-control-plane-workload-on-infra-nodes.adoc @@ -1,6 +1,6 @@ :_content-type: ASSEMBLY [id="run-gitops-control-plane-workload-on-infra-nodes"] -= Running GitOps control plane workloads on infrastructure nodes += Running {gitops-shortname} control plane workloads on infrastructure nodes :context: run-gitops-control-plane-workload-on-infra-nodes include::_attributes/common-attributes.adoc[] @@ -12,7 +12,13 @@ You can use the {product-title} to run certain workloads on infrastructure nodes [NOTE] ==== -Any other Argo CD instances installed to user namespaces are not eligible to run on Infrastructure nodes. +Any other Argo CD instances installed to user namespaces are not eligible to run on infrastructure nodes. ==== include::modules/go-add-infra-nodes.adoc[leveloffset=+1] + +[role="_additional-resources"] +[id="additional-resources_run-gitops-control-plane-workload-on-infra-nodes"] +== Additional resources +* To learn more about taints and tolerations, see xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]. +* For more information on infrastructure machine sets, see xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets]. diff --git a/modules/go-add-infra-nodes.adoc b/modules/go-add-infra-nodes.adoc index 28e0437832..6e22560530 100644 --- a/modules/go-add-infra-nodes.adoc +++ b/modules/go-add-infra-nodes.adoc @@ -4,7 +4,7 @@ :_content-type: PROCEDURE [id="add-infra-nodes_{context}"] -= Moving GitOps workloads to infrastructure nodes += Moving {gitops-shortname} workloads to infrastructure nodes You can move the default workloads installed by the {gitops-title} to the infrastructure nodes. The workloads that can be moved are: @@ -19,7 +19,6 @@ You can move the default workloads installed by the {gitops-title} to the infras * `openshift-gitops-application-controller statefulset` * `openshift-gitops-redis-server statefulset` - .Procedure . Label existing nodes as infrastructure by running the following command: @@ -28,7 +27,7 @@ You can move the default workloads installed by the {gitops-title} to the infras ---- $ oc label node node-role.kubernetes.io/infra= ---- -. Edit the `GitOpsService` Custom Resource (CR) to add the infrastructure node selector: +. Edit the `GitOpsService` custom resource (CR) to add the infrastructure node selector: + [source,terminal] ----