Skip to content

Commit c089ee6

Browse files
committed
OBSDOCS-760: Update structure of resource scheduling docs
1 parent eb39682 commit c089ee6

19 files changed

+301
-262
lines changed

_topic_maps/_topic_map.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2608,10 +2608,6 @@ Topics:
26082608
Topics:
26092609
- Name: Configuring CPU and memory limits for Logging components
26102610
File: cluster-logging-memory
2611-
- Name: Using tolerations to control Logging pod placement
2612-
File: cluster-logging-tolerations
2613-
- Name: Moving logging subsystem resources with node selectors
2614-
File: cluster-logging-moving-nodes
26152611
- Name: Configuring systemd-journald for Logging
26162612
File: cluster-logging-systemd
26172613
- Name: Log collection and forwarding
@@ -2652,6 +2648,13 @@ Topics:
26522648
Topics:
26532649
- Name: Flow control mechanisms
26542650
File: logging-flow-control-mechanisms
2651+
- Name: Scheduling resources
2652+
Dir: scheduling_resources
2653+
Topics:
2654+
- Name: Using node selectors to move logging resources
2655+
File: logging-node-selectors
2656+
- Name: Using tolerations to control logging pod placement
2657+
File: logging-taints-tolerations
26552658
- Name: Uninstalling Logging
26562659
File: cluster-logging-uninstall
26572660
- Name: Exported fields

_topic_maps/_topic_map_osd.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,10 +1077,6 @@ Topics:
10771077
Topics:
10781078
- Name: Configuring CPU and memory limits for Logging components
10791079
File: cluster-logging-memory
1080-
- Name: Using tolerations to control Logging pod placement
1081-
File: cluster-logging-tolerations
1082-
- Name: Moving logging subsystem resources with node selectors
1083-
File: cluster-logging-moving-nodes
10841080
#- Name: Configuring systemd-journald and Fluentd
10851081
# File: cluster-logging-systemd
10861082
- Name: Log collection and forwarding
@@ -1121,6 +1117,13 @@ Topics:
11211117
Topics:
11221118
- Name: Flow control mechanisms
11231119
File: logging-flow-control-mechanisms
1120+
- Name: Scheduling resources
1121+
Dir: scheduling_resources
1122+
Topics:
1123+
- Name: Using node selectors to move logging resources
1124+
File: logging-node-selectors
1125+
- Name: Using tolerations to control logging pod placement
1126+
File: logging-taints-tolerations
11241127
- Name: Uninstalling Logging
11251128
File: cluster-logging-uninstall
11261129
- Name: Exported fields

_topic_maps/_topic_map_rosa.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,10 +1312,6 @@ Topics:
13121312
Topics:
13131313
- Name: Configuring CPU and memory limits for Logging components
13141314
File: cluster-logging-memory
1315-
- Name: Using tolerations to control Logging pod placement
1316-
File: cluster-logging-tolerations
1317-
- Name: Moving logging subsystem resources with node selectors
1318-
File: cluster-logging-moving-nodes
13191315
#- Name: Configuring systemd-journald and Fluentd
13201316
# File: cluster-logging-systemd
13211317
- Name: Log collection and forwarding
@@ -1356,6 +1352,13 @@ Topics:
13561352
Topics:
13571353
- Name: Flow control mechanisms
13581354
File: logging-flow-control-mechanisms
1355+
- Name: Scheduling resources
1356+
Dir: scheduling_resources
1357+
Topics:
1358+
- Name: Using node selectors to move logging resources
1359+
File: logging-node-selectors
1360+
- Name: Using tolerations to control logging pod placement
1361+
File: logging-taints-tolerations
13591362
- Name: Uninstalling Logging
13601363
File: cluster-logging-uninstall
13611364
- Name: Exported fields

logging/config/cluster-logging-moving-nodes.adoc

Lines changed: 0 additions & 11 deletions
This file was deleted.

logging/config/cluster-logging-tolerations.adoc

Lines changed: 0 additions & 104 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../_attributes/

logging/scheduling_resources/images

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../images/
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
include::_attributes/common-attributes.adoc[]
3+
include::_attributes/attributes-openshift-dedicated.adoc[]
4+
[id="logging-node-selectors"]
5+
= Using node selectors to move logging resources
6+
:context: logging-node-selectors
7+
8+
toc::[]
9+
10+
include::snippets/about-node-selectors.adoc[]
11+
12+
include::modules/nodes-scheduler-node-selectors-about.adoc[leveloffset=+1]
13+
include::modules/infrastructure-moving-logging.adoc[leveloffset=+1]
14+
15+
[role="_additional-resources"]
16+
[id="additional-resources_logging-node-selection"]
17+
== Additional resources
18+
* xref:../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors]
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
include::_attributes/common-attributes.adoc[]
3+
include::_attributes/attributes-openshift-dedicated.adoc[]
4+
[id="logging-taints-tolerations"]
5+
= Using taints and tolerations to control logging pod placement
6+
:context: logging-taints-tolerations
7+
8+
toc::[]
9+
10+
Taints and tolerations allow the node to control which pods should (or should not) be scheduled on them.
11+
12+
include::modules/nodes-scheduler-taints-tolerations-about.adoc[leveloffset=+1]
13+
include::modules/cluster-logging-logstore-tolerations.adoc[leveloffset=+1]
14+
include::modules/cluster-logging-kibana-tolerations.adoc[leveloffset=+1]
15+
include::modules/cluster-logging-collector-tolerations.adoc[leveloffset=+1]
16+
17+
[role="_additional-resources"]
18+
[id="additional-resources_cluster-logging-tolerations"]
19+
== Additional resources
20+
ifdef::openshift-enterprise,openshift-origin[]
21+
* xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints]
22+
endif::[]
23+
ifdef::openshift-rosa,openshift-dedicated[]
24+
* 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]
25+
endif::[]

logging/scheduling_resources/modules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../modules/

0 commit comments

Comments
 (0)