Skip to content

Commit 87bcf67

Browse files
authored
Merge pull request #58872 from ekristova/RHDEVDOCS-5142
RHDEVDOCS-5142: Document tainting nodes
2 parents c3f2b73 + a0b3b37 commit 87bcf67

3 files changed

+17
-7
lines changed

cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,20 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
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.
9+
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.
1010

1111
.Prerequisites
1212

13-
* Red Hat OpenShift GitOps is installed in your cluster.
13+
* {gitops-title} is installed in your cluster.
1414
* Logged into Argo CD instance.
1515
1616
include::modules/go-run-argo-cd-instance-on-infrastructure-nodes.adoc[leveloffset=+1]
1717

18+
[role="_additional-resources"]
19+
.Additional resources
20+
* 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].
21+
* For more information on infrastructure machine sets, see xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets].
22+
1823
include::modules/gitops-creating-an-application-by-using-the-argo-cd-dashboard.adoc[leveloffset=+1]
1924

2025
include::modules/gitops-creating-an-application-by-using-the-oc-tool.adoc[leveloffset=+1]

cicd/gitops/run-gitops-control-plane-workload-on-infra-nodes.adoc

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_content-type: ASSEMBLY
22
[id="run-gitops-control-plane-workload-on-infra-nodes"]
3-
= Running GitOps control plane workloads on infrastructure nodes
3+
= Running {gitops-shortname} control plane workloads on infrastructure nodes
44
:context: run-gitops-control-plane-workload-on-infra-nodes
55
include::_attributes/common-attributes.adoc[]
66

@@ -12,7 +12,13 @@ You can use the {product-title} to run certain workloads on infrastructure nodes
1212

1313
[NOTE]
1414
====
15-
Any other Argo CD instances installed to user namespaces are not eligible to run on Infrastructure nodes.
15+
Any other Argo CD instances installed to user namespaces are not eligible to run on infrastructure nodes.
1616
====
1717

1818
include::modules/go-add-infra-nodes.adoc[leveloffset=+1]
19+
20+
[role="_additional-resources"]
21+
[id="additional-resources_run-gitops-control-plane-workload-on-infra-nodes"]
22+
== Additional resources
23+
* 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].
24+
* For more information on infrastructure machine sets, see xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets].

modules/go-add-infra-nodes.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
:_content-type: PROCEDURE
66
[id="add-infra-nodes_{context}"]
7-
= Moving GitOps workloads to infrastructure nodes
7+
= Moving {gitops-shortname} workloads to infrastructure nodes
88

99
You can move the default workloads installed by the {gitops-title} to the infrastructure nodes. The workloads that can be moved are:
1010

@@ -19,7 +19,6 @@ You can move the default workloads installed by the {gitops-title} to the infras
1919
* `openshift-gitops-application-controller statefulset`
2020
* `openshift-gitops-redis-server statefulset`
2121
22-
2322
.Procedure
2423

2524
. 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
2827
----
2928
$ oc label node <node-name> node-role.kubernetes.io/infra=
3029
----
31-
. Edit the `GitOpsService` Custom Resource (CR) to add the infrastructure node selector:
30+
. Edit the `GitOpsService` custom resource (CR) to add the infrastructure node selector:
3231
+
3332
[source,terminal]
3433
----

0 commit comments

Comments
 (0)