Skip to content

Commit 9b7d992

Browse files
authored
Merge pull request #70653 from bergerhoffer/OSDOCS-8969
OSDOCS#8969: Restructuring docs for the descheduler operator being async
2 parents a8597ec + 220c08b commit 9b7d992

21 files changed

+123
-54
lines changed

_attributes/common-attributes.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ endif::openshift-origin[]
5858
:cert-manager-operator: cert-manager Operator for Red Hat OpenShift
5959
:secondary-scheduler-operator-full: Secondary Scheduler Operator for Red Hat OpenShift
6060
:secondary-scheduler-operator: Secondary Scheduler Operator
61+
:descheduler-operator: Kube Descheduler Operator
6162
// Backup and restore
6263
:velero-domain: velero.io
6364
:velero-version: 1.12

_topic_maps/_topic_map.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2375,8 +2375,18 @@ Topics:
23752375
# File: nodes-scheduler-node-projects
23762376
# - Name: Keeping your cluster balanced using the descheduler
23772377
# File: nodes-scheduler-descheduler
2378-
- Name: Evicting pods using the descheduler
2379-
File: nodes-descheduler
2378+
- Name: Descheduler
2379+
Dir: descheduler
2380+
Distros: openshift-enterprise
2381+
Topics:
2382+
- Name: Descheduler overview
2383+
File: index
2384+
- Name: Descheduler release notes
2385+
File: nodes-descheduler-release-notes
2386+
- Name: Evicting pods using the descheduler
2387+
File: nodes-descheduler-configuring
2388+
- Name: Uninstalling the descheduler
2389+
File: nodes-descheduler-uninstalling
23802390
- Name: Secondary scheduler
23812391
Dir: secondary_scheduler
23822392
Distros: openshift-enterprise

_topic_maps/_topic_map_osd.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,17 @@ Topics:
888888
# File: nodes-scheduler-node-projects
889889
# - Name: Keeping your cluster balanced using the descheduler
890890
# File: nodes-scheduler-descheduler
891-
- Name: Evicting pods using the descheduler
892-
File: nodes-descheduler
891+
- Name: Descheduler
892+
Dir: descheduler
893+
Topics:
894+
- Name: Descheduler overview
895+
File: index
896+
- Name: Descheduler release notes
897+
File: nodes-descheduler-release-notes
898+
- Name: Evicting pods using the descheduler
899+
File: nodes-descheduler-configuring
900+
- Name: Uninstalling the descheduler
901+
File: nodes-descheduler-uninstalling
893902
- Name: Secondary scheduler
894903
Dir: secondary_scheduler
895904
Distros: openshift-enterprise

modules/nodes-descheduler-about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * nodes/scheduling/nodes-descheduler.adoc
3+
// * nodes/scheduling/descheduler/index.adoc
44

55
:_mod-docs-content-type: CONCEPT
66
[id="nodes-descheduler-about_{context}"]

modules/nodes-descheduler-configuring-interval.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * nodes/scheduling/nodes-descheduler.adoc
3+
// * nodes/scheduling/descheduler/nodes-descheduler-configuring.adoc
44

55
:_mod-docs-content-type: PROCEDURE
66
[id="nodes-descheduler-configuring-interval_{context}"]

modules/nodes-descheduler-configuring-profiles.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * nodes/scheduling/nodes-descheduler.adoc
3+
// * nodes/scheduling/descheduler/nodes-descheduler-configuring.adoc
44

55
:_mod-docs-content-type: PROCEDURE
66
[id="nodes-descheduler-configuring-profiles_{context}"]

modules/nodes-descheduler-installing.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Module included in the following assemblies:
22
//
3-
// * nodes/scheduling/nodes-descheduler.adoc
3+
// * nodes/scheduling/descheduler/nodes-descheduler-configuring.adoc
44

5-
ifeval::["{context}" == "nodes-descheduler"]
5+
ifeval::["{context}" == "nodes-descheduler-about"]
66
:nodes:
77
endif::[]
88

@@ -14,7 +14,7 @@ endif::[]
1414
[id="nodes-descheduler-installing_{context}"]
1515
= Installing the descheduler
1616

17-
The descheduler is not available by default. To enable the descheduler, you must install the Kube Descheduler Operator from OperatorHub and enable one or more descheduler profiles.
17+
The descheduler is not available by default. To enable the descheduler, you must install the {descheduler-operator} from OperatorHub and enable one or more descheduler profiles.
1818

1919
By default, the descheduler runs in predictive mode, which means that it only simulates pod evictions. You must change the mode to automatic for the descheduler to perform the pod evictions.
2020

@@ -41,18 +41,18 @@ endif::[]
4141
.Procedure
4242

4343
. Log in to the {product-title} web console.
44-
. Create the required namespace for the Kube Descheduler Operator.
44+
. Create the required namespace for the {descheduler-operator}.
4545
.. Navigate to *Administration* -> *Namespaces* and click *Create Namespace*.
4646
.. Enter `openshift-kube-descheduler-operator` in the *Name* field, enter `openshift.io/cluster-monitoring=true` in the *Labels* field to enable descheduler metrics, and click *Create*.
47-
. Install the Kube Descheduler Operator.
47+
. Install the {descheduler-operator}.
4848
.. Navigate to *Operators* -> *OperatorHub*.
49-
.. Type *Kube Descheduler Operator* into the filter box.
50-
.. Select the *Kube Descheduler Operator* and click *Install*.
49+
.. Type *{descheduler-operator}* into the filter box.
50+
.. Select the *{descheduler-operator}* and click *Install*.
5151
.. On the *Install Operator* page, select *A specific namespace on the cluster*. Select *openshift-kube-descheduler-operator* from the drop-down menu.
5252
.. Adjust the values for the *Update Channel* and *Approval Strategy* to the desired values.
5353
.. Click *Install*.
5454
. Create a descheduler instance.
55-
.. From the *Operators* -> *Installed Operators* page, click the *Kube Descheduler Operator*.
55+
.. From the *Operators* -> *Installed Operators* page, click the *{descheduler-operator}*.
5656
.. Select the *Kube Descheduler* tab and click *Create KubeDescheduler*.
5757
.. Edit the settings as necessary.
5858
... To evict pods instead of simulating the evictions, change the *Mode* field to *Automatic*.
@@ -105,7 +105,7 @@ This setting is experimental and should not be used in a production environment.
105105
You can also configure the profiles and settings for the descheduler later using the OpenShift CLI (`oc`). If you did not adjust the profiles when creating the descheduler instance from the web console, the `AffinityAndTaints` profile is enabled by default.
106106
endif::nodes[]
107107

108-
ifeval::["{context}" == "nodes-descheduler"]
108+
ifeval::["{context}" == "nodes-descheduler-about"]
109109
:!nodes:
110110
endif::[]
111111

modules/nodes-descheduler-profiles.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Module included in the following assemblies:
22
//
3-
// * nodes/scheduling/nodes-descheduler.adoc
3+
// * nodes/scheduling/descheduler/index.adoc
44

5-
ifeval::["{context}" == "nodes-descheduler"]
5+
ifeval::["{context}" == "nodes-descheduler-about"]
66
:nodes:
77
endif::[]
88

@@ -73,7 +73,7 @@ Use the Technology Preview `DevPreviewLongLifecycle` profile to enable the desch
7373
** A node is considered overutilized if its usage is above 50% for any of the thresholds (CPU, memory, and number of pods).
7474
endif::virt[]
7575

76-
ifeval::["{context}" == "nodes-descheduler"]
76+
ifeval::["{context}" == "nodes-descheduler-about"]
7777
:!nodes:
7878
endif::[]
7979

modules/nodes-descheduler-uninstalling.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Module included in the following assemblies:
22
//
3-
// * nodes/scheduling/nodes-descheduler.adoc
3+
// * nodes/scheduling/descheduler/nodes-descheduler-uninstalling.adoc
44

55
:_mod-docs-content-type: PROCEDURE
66
[id="nodes-descheduler-uninstalling_{context}"]
77
= Uninstalling the descheduler
88

9-
You can remove the descheduler from your cluster by removing the descheduler instance and uninstalling the Kube Descheduler Operator. This procedure also cleans up the `KubeDescheduler` CRD and `openshift-kube-descheduler-operator` namespace.
9+
You can remove the descheduler from your cluster by removing the descheduler instance and uninstalling the {descheduler-operator}. This procedure also cleans up the `KubeDescheduler` CRD and `openshift-kube-descheduler-operator` namespace.
1010

1111
.Prerequisites
1212

@@ -22,13 +22,13 @@ endif::openshift-rosa,openshift-dedicated[]
2222

2323
. Log in to the {product-title} web console.
2424
. Delete the descheduler instance.
25-
.. From the *Operators* -> *Installed Operators* page, click *Kube Descheduler Operator*.
25+
.. From the *Operators* -> *Installed Operators* page, click *{descheduler-operator}*.
2626
.. Select the *Kube Descheduler* tab.
2727
.. Click the Options menu {kebab} next to the *cluster* entry and select *Delete KubeDescheduler*.
2828
.. In the confirmation dialog, click *Delete*.
29-
. Uninstall the Kube Descheduler Operator.
29+
. Uninstall the {descheduler-operator}.
3030
.. Navigate to *Operators* -> *Installed Operators*.
31-
.. Click the Options menu {kebab} next to the *Kube Descheduler Operator* entry and select *Uninstall Operator*.
31+
.. Click the Options menu {kebab} next to the *{descheduler-operator}* entry and select *Uninstall Operator*.
3232
.. In the confirmation dialog, click *Uninstall*.
3333
. Delete the `openshift-kube-descheduler-operator` namespace.
3434
.. Navigate to *Administration* -> *Namespaces*.

nodes/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ The following list of tasks provides an overview of how an administrator can man
9696
// Cannot create namespace to install Operator
9797
ifndef::openshift-rosa,openshift-dedicated[]
9898
** xref:../nodes/scheduling/secondary_scheduler/index.adoc#nodes-secondary-scheduler-about[Secondary scheduling].
99-
* xref:../nodes/scheduling/nodes-descheduler.adoc#nodes-descheduler[Configure the descheduler to evict pods] based on specific strategies so that the scheduler reschedules the pods to more appropriate nodes.
99+
* xref:../nodes/scheduling/descheduler/index.adoc#nodes-descheduler-about[Configure the descheduler to evict pods] based on specific strategies so that the scheduler reschedules the pods to more appropriate nodes.
100100
endif::openshift-rosa,openshift-dedicated[]
101101
* xref:../nodes/pods/nodes-pods-configuring.adoc#nodes-pods-configuring-restart_nodes-pods-configuring[Configure how pods behave after a restart using pod controllers and restart policies].
102102
* xref:../nodes/pods/nodes-pods-configuring.adoc#nodes-pods-configuring-bandwidth_nodes-pods-configuring[Limit both egress and ingress traffic on a pod].

0 commit comments

Comments
 (0)