Merge pull request #77932 from bhardesty/osdocs-9791-remove-taints-osd-rosa

jab-rh · web-flow · commit 446e9476d675 · 2024-06-28T13:18:00.000-04:00
OSDOCS-9791: Remove node taints from OSD and ROSA
diff --git a/_topic_maps/_topic_map_osd.yml b/_topic_maps/_topic_map_osd.yml
@@ -1030,8 +1030,9 @@ Topics:
     File: nodes-scheduler-node-affinity
   - Name: Placing pods onto overcommited nodes
     File: nodes-scheduler-overcommit
-  - Name: Controlling pod placement using node taints
-    File: nodes-scheduler-taints-tolerations
+# Per OSDOCS-9791, OSD customers cannot add taints to individual nodes.
+#   - Name: Controlling pod placement using node taints
+#     File: nodes-scheduler-taints-tolerations
   - Name: Placing pods on specific nodes using node selectors
     File: nodes-scheduler-node-selectors
   - Name: Controlling pod placement using pod topology spread constraints
diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml
@@ -1305,8 +1305,9 @@ Topics:
     File: nodes-scheduler-node-affinity
   - Name: Placing pods onto overcommited nodes
     File: nodes-scheduler-overcommit
-  - Name: Controlling pod placement using node taints
-    File: nodes-scheduler-taints-tolerations
+# Per OSDOCS-9791, ROSA customers cannot add taints to individual nodes.
+#  - Name: Controlling pod placement using node taints
+#    File: nodes-scheduler-taints-tolerations
   - Name: Placing pods on specific nodes using node selectors
     File: nodes-scheduler-node-selectors
   - Name: Controlling pod placement using pod topology spread constraints
diff --git a/architecture/admission-plug-ins.adoc b/architecture/admission-plug-ins.adoc
@@ -29,8 +29,8 @@ endif::openshift-rosa,openshift-dedicated[]
 
 ifndef::openshift-rosa,openshift-dedicated[]
 * xref:../networking/hardware_networks/configuring-sriov-operator.adoc#configuring-sriov-operator[Configuring the SR-IOV Network Operator]
-endif::openshift-rosa,openshift-dedicated[]
 
 * xref:../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations_dedicating_nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]
+endif::openshift-rosa,openshift-dedicated[]
 
 * xref:../nodes/pods/nodes-pods-priority.adoc#admin-guide-priority-preemption-names_nodes-pods-priority[Pod priority names]
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
@@ -22,7 +22,9 @@ include::modules/go-run-argo-cd-instance-on-infrastructure-nodes.adoc[leveloffse
 
 [role="_additional-resources"]
 .Additional resources
+ifndef::openshift-dedicated,openshift-rosa[]
 * 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].
+endif::openshift-dedicated,openshift-rosa[]
 * 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]
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
@@ -20,5 +20,7 @@ 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
+ifndef::openshift-dedicated,openshift-rosa[]
 * 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].
+endif::openshift-dedicated,openshift-rosa[]
 * 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/nodes/index.adoc b/nodes/index.adoc
@@ -91,7 +91,9 @@ The following list of tasks provides an overview of how an administrator can man
 * Control scheduling of pods using the advanced scheduling features available in {product-title}:
 ** Node-to-pod binding rules such as xref:../nodes/scheduling/nodes-scheduler-pod-affinity.adoc#nodes-scheduler-pod-affinity-example-affinity_nodes-scheduler-pod-affinity[pod affinity], xref:../nodes/scheduling/nodes-scheduler-node-affinity.adoc#nodes-scheduler-node-affinity[node affinity], and xref:../nodes/scheduling/nodes-scheduler-pod-affinity.adoc#nodes-scheduler-pod-anti-affinity-configuring_nodes-scheduler-pod-affinity[anti-affinity].
 ** xref:../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Node labels and selectors].
+ifndef::openshift-dedicated,openshift-rosa[]
 ** xref:../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Taints and tolerations].
+endif::openshift-dedicated,openshift-rosa[]
 ** xref:../nodes/scheduling/nodes-scheduler-pod-topology-spread-constraints.adoc#nodes-scheduler-pod-topology-spread-constraints[Pod topology spread constraints].
 // Cannot create namespace to install Operator
 ifndef::openshift-rosa,openshift-dedicated[]
diff --git a/nodes/scheduling/nodes-scheduler-about.adoc b/nodes/scheduling/nodes-scheduler-about.adoc
@@ -27,7 +27,9 @@ endif::openshift-rosa,openshift-dedicated[]
 * xref:../../nodes/scheduling/nodes-scheduler-pod-affinity.adoc#nodes-scheduler-pod-affinity[Pod affinity and anti-affinity rules]
 * xref:../../nodes/scheduling/nodes-scheduler-node-affinity.adoc#nodes-scheduler-node-affinity-about_nodes-scheduler-node-affinity[Node affinity]
 * xref:../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Node selectors]
+ifndef::openshift-dedicated,openshift-rosa[]
 * xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Taints and tolerations]
+endif::openshift-dedicated,openshift-rosa[]
 * xref:../../nodes/scheduling/nodes-scheduler-overcommit.adoc#nodes-scheduler-overcommit[Node overcommitment]
 
 [id="about-default-scheduler"]
diff --git a/nodes/scheduling/nodes-scheduler-node-selectors.adoc b/nodes/scheduling/nodes-scheduler-node-selectors.adoc
@@ -18,9 +18,12 @@ include::modules/nodes-scheduler-node-selectors-cluster.adoc[leveloffset=+1]
 include::modules/nodes-scheduler-node-selectors-project.adoc[leveloffset=+1]
 endif::openshift-rosa,openshift-dedicated[]
 
+// The following xref points to a topic not included in the OSD and ROSA docs.
+ifndef::openshift-dedicated,openshift-rosa[]
 [role="_additional-resources"]
 .Additional resources
 
 * xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations-projects_nodes-scheduler-taints-tolerations[Creating a project with a node selector and toleration]
+endif::openshift-dedicated,openshift-rosa[]
 
 // include::modules/nodes-scheduler-node-selectors-configuring.adoc[leveloffset=+1]
diff --git a/observability/logging/scheduling_resources/logging-taints-tolerations.adoc b/observability/logging/scheduling_resources/logging-taints-tolerations.adoc
@@ -25,6 +25,3 @@ include::modules/cluster-logging-collector-pod-location.adoc[leveloffset=+1]
 ifdef::openshift-enterprise,openshift-origin[]
 * xref:../../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]
 endif::[]
-ifdef::openshift-rosa,openshift-dedicated[]
-* link:https://docs.openshift.com/container-platform/latest/nodes/scheduling/nodes-scheduler-taints-tolerations.html#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]
-endif::[]
diff --git a/operators/admin/olm-adding-operators-to-cluster.adoc b/operators/admin/olm-adding-operators-to-cluster.adoc
@@ -91,10 +91,13 @@ include::modules/olm-pod-placement.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
-
+ifndef::openshift-dedicated,openshift-rosa[]
 * Adding taints and tolerations xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations-adding_nodes-scheduler-taints-tolerations[manually to nodes] or xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations-adding-machineset_nodes-scheduler-taints-tolerations[with compute machine sets]
+endif::openshift-dedicated,openshift-rosa[]
 * xref:../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors-project_nodes-scheduler-node-selectors[Creating project-wide node selectors]
+ifndef::openshift-dedicated,openshift-rosa[]
 * xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations-projects_nodes-scheduler-taints-tolerations[Creating a project with a node selector and toleration]
+endif::openshift-dedicated,openshift-rosa[]
 endif::[]
 
 include::modules/olm-overriding-operator-pod-affinity.adoc[leveloffset=+1]
diff --git a/operators/admin/olm-cs-podsched.adoc b/operators/admin/olm-cs-podsched.adoc
@@ -53,7 +53,11 @@ include::modules/olm-priority-class-name.adoc[leveloffset=+1]
 
 include::modules/olm-tolerations.adoc[leveloffset=+1]
 
+// The following xref points to a topic that is not included in the OSD or 
+// ROSA docs.
+ifndef::openshift-dedicated,openshift-rosa[]
 [role="_additional-resources"]
 .Additional resources
 
 * xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations-about_nodes-scheduler-taints-tolerations[Understanding taints and tolerations]
+endif::openshift-dedicated,openshift-rosa[]
diff --git a/post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-compute-managing.adoc b/post_installation_configuration/configuring-multi-arch-compute-machines/multi-architecture-compute-managing.adoc
@@ -12,9 +12,11 @@ Deploying a workload on a cluster with compute nodes of different architectures
 
 You can use the Multiarch Tuning Operator to enable architecture-aware scheduling of workloads on clusters with multi-architecture compute machines. The Multiarch Tuning Operator implements additional scheduler predicates in the pods specifications based on the architectures that the pods can support at creation time. For more information, see xref:../../post_installation_configuration/configuring-multi-arch-compute-machines/multiarch-tuning-operator.adoc#multiarch-tuning-operator[Managing workloads on multi-architecture clusters by using the Multiarch Tuning Operator]. 
 
-For more information on node affinity, scheduling, taints and tolerlations, see the following documentation:
+For more information on node affinity, scheduling, taints and tolerations, see the following documentation:
 
+ifndef::openshift-dedicated,openshift-rosa[]
 * xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints].
+endif::openshift-dedicated,openshift-rosa[]
 
 * xref:../../nodes/scheduling/nodes-scheduler-node-affinity.adoc#nodes-scheduler-node-affinity[Controlling pod placement on nodes using node affinity]
 
diff --git a/virt/post_installation_configuration/virt-node-placement-virt-components.adoc b/virt/post_installation_configuration/virt-node-placement-virt-components.adoc
@@ -25,4 +25,6 @@ include::modules/virt-node-placement-rule-examples.adoc[leveloffset=+1]
 * xref:../../virt/virtual_machines/advanced_vm_management/virt-specifying-nodes-for-vms.adoc#virt-specifying-nodes-for-vms[Specifying nodes for virtual machines]
 * xref:../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors]
 * xref:../../nodes/scheduling/nodes-scheduler-node-affinity.adoc#nodes-scheduler-node-affinity[Controlling pod placement on nodes using node affinity rules]
-* xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]
+ifndef::openshift-dedicated,openshift-rosa[]
+* xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]
+endif::openshift-dedicated,openshift-rosa[]
diff --git a/virt/virtual_machines/advanced_vm_management/virt-specifying-nodes-for-vms.adoc b/virt/virtual_machines/advanced_vm_management/virt-specifying-nodes-for-vms.adoc
@@ -27,4 +27,6 @@ include::modules/virt-example-vm-node-placement-tolerations.adoc[leveloffset=+2]
 * xref:../../../virt/post_installation_configuration/virt-node-placement-virt-components.adoc#virt-node-placement-virt-components[Specifying nodes for virtualization components]
 * xref:../../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors]
 * xref:../../../nodes/scheduling/nodes-scheduler-node-affinity.adoc#nodes-scheduler-node-affinity[Controlling pod placement on nodes using node affinity rules]
+ifndef::openshift-dedicated,openshift-rosa[]
 * xref:../../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]
+endif::openshift-dedicated,openshift-rosa[]
diff --git a/windows_containers/scheduling-windows-workloads.adoc b/windows_containers/scheduling-windows-workloads.adoc
@@ -22,7 +22,9 @@ include::modules/windows-pod-placement.adoc[leveloffset=+1]
 === Additional resources
 
 * xref:../nodes/scheduling/nodes-scheduler-about.adoc#nodes-scheduler-about[Controlling pod placement using the scheduler]
+ifndef::openshift-dedicated,openshift-rosa[]
 * xref:../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]
+endif::openshift-dedicated,openshift-rosa[]
 * xref:../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors]
 
 include::modules/creating-runtimeclass.adoc[leveloffset=+1]
