Skip to content

Commit 93d8c1f

Browse files
committed
Add xrefs to nodes content
1 parent 8adf5c3 commit 93d8c1f

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

operators/admin/olm-adding-operators-to-cluster.adoc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,27 +89,21 @@ When you initiate the Operator installation, if the Operator has dependencies, t
8989
9090
include::modules/olm-pod-placement.adoc[leveloffset=+1]
9191
92-
// TODO: Uncondition these xrefs when the Nodes content is ported to OSD/ROSA.
93-
ifndef::openshift-dedicated,openshift-rosa[]
9492
[role="_additional-resources"]
9593
.Additional resources
9694
9795
* 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]
9896
* xref:../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors-project_nodes-scheduler-node-selectors[Creating project-wide node selectors]
9997
* 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]
100-
endif::openshift-dedicated,openshift-rosa[]
10198
endif::[]
10299
103100
include::modules/olm-overriding-operator-pod-affinity.adoc[leveloffset=+1]
104101
105-
// TODO: Uncondition these xrefs when the Nodes content is ported to OSD/ROSA.
106-
ifndef::openshift-dedicated,openshift-rosa[]
107102
[role="_additional-resources"]
108103
.Additional resources
109104
110105
* xref:../../nodes/scheduling/nodes-scheduler-pod-affinity.adoc#nodes-scheduler-pod-affinity-about_nodes-scheduler-pod-affinity[Understanding pod affinity]
111106
* xref:../../nodes/scheduling/nodes-scheduler-node-affinity.adoc#nodes-scheduler-node-affinity-about_nodes-scheduler-node-affinity[Understanding node affinity]
112-
endif::openshift-dedicated,openshift-rosa[]
113107
// This xref points to a topic not currently included in the OSD and ROSA docs.
114108
ifndef::openshift-dedicated,openshift-rosa[]
115109
* xref:../../nodes/nodes/nodes-nodes-working.adoc#nodes-nodes-working-updating_nodes-nodes-working[Understanding how to update labels on nodes]

operators/admin/olm-cs-podsched.adoc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,30 +39,21 @@ endif::openshift-dedicated,openshift-rosa[]
3939

4040
include::modules/olm-node-selector.adoc[leveloffset=+1]
4141

42-
// TODO: Uncondition this xref when the Nodes content is ported to OSD/ROSA.
43-
ifndef::openshift-dedicated,openshift-rosa[]
4442
[role="_additional-resources"]
4543
.Additional resources
4644

4745
* xref:../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors]
48-
endif::openshift-dedicated,openshift-rosa[]
4946
5047
include::modules/olm-priority-class-name.adoc[leveloffset=+1]
5148

52-
// TODO: Uncondition this xref when the Nodes content is ported to OSD/ROSA.
53-
ifndef::openshift-dedicated,openshift-rosa[]
5449
[role="_additional-resources"]
5550
.Additional resources
5651

5752
* xref:../../nodes/pods/nodes-pods-priority.adoc#admin-guide-priority-preemption-priority-class_nodes-pods-priority[Pod priority classes]
58-
endif::openshift-dedicated,openshift-rosa[]
5953
6054
include::modules/olm-tolerations.adoc[leveloffset=+1]
6155

62-
// TODO: Uncondition this xref with the Nodes content is ported to OSD/ROSA.
63-
ifndef::openshift-dedicated,openshift-rosa[]
6456
[role="_additional-resources"]
6557
.Additional resources
6658

6759
* xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations-about_nodes-scheduler-taints-tolerations[Understanding taints and tolerations]
68-
endif::openshift-dedicated,openshift-rosa[]

operators/admin/olm-deleting-operators-from-cluster.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ The following describes how to delete, or uninstall, Operators that were previou
1111
[IMPORTANT]
1212
====
1313
You must successfully and completely uninstall an Operator prior to attempting to reinstall the same Operator. Failure to fully uninstall the Operator properly can leave resources, such as a project or namespace, stuck in a "Terminating" state and cause "error resolving resource" messages to be observed when trying to reinstall the Operator.
14-
// TODO: Uncondition this xref when the Support content is ported to OSD/ROSA.
14+
1515
ifndef::openshift-dedicated,openshift-rosa[]
16-
For more information, see xref:../../support/troubleshooting/troubleshooting-operator-issues.adoc#olm-reinstall_troubleshooting-operator-issues[Reinstalling Operators after failed uninstallation].
16+
For more information, see xref:../../operators/admin/olm-troubleshooting-operator-issues.adoc#olm-reinstall_olm-troubleshooting-operator-issues[Reinstalling Operators after failed uninstallation].
1717
endif::openshift-dedicated,openshift-rosa[]
1818
====
1919

0 commit comments

Comments
 (0)