Skip to content

Commit db052e4

Browse files
committed
OSDOCS-10853 Remove unsupported overcommit methods from Managed docs
1 parent 636a2f1 commit db052e4

File tree

3 files changed

+32
-21
lines changed

3 files changed

+32
-21
lines changed

_topic_maps/_topic_map_rosa.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1445,6 +1445,7 @@ Topics:
14451445
- Name: Configuring cluster memory to meet container memory and risk requirements
14461446
File: nodes-cluster-resource-configure
14471447
Distros: openshift-rosa
1448+
# TODO: Remove the whole nodes-cluster-overcommit file for OSDOCS-10853?
14481449
- Name: Configuring your cluster to place pods on overcommited nodes
14491450
File: nodes-cluster-overcommit
14501451
Distros: openshift-rosa

modules/nodes-cluster-overcommit-project-disable.adoc

+10-4
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,25 @@
77
[id="nodes-cluster-overcommit-project-disable_{context}"]
88
= Disabling overcommitment for a project
99

10+
ifndef::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
1011
When enabled, overcommitment can be disabled per-project. For example, you can allow infrastructure components to be configured independently of overcommitment.
12+
endif::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
13+
14+
ifdef::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
15+
If required by your use case, you can disable overcommitment on any project that is not managed by Red Hat. For a list of projects that cannot be modified, see _Red Hat Managed resources_ in _Additional resources_.
16+
endif::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
1117

1218
.Procedure
1319

1420
To disable overcommitment in a project:
1521

16-
ifndef::openshift-rosa,openshift-dedicated[]
22+
ifndef::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
1723
. Create or edit the namespace object file.
18-
endif::openshift-rosa,openshift-dedicated[]
24+
endif::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
1925
// Invalid value: "false": field is immutable, try updating the namespace
20-
ifdef::openshift-rosa,openshift-dedicated[]
26+
ifdef::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
2127
. Edit the namespace object file.
22-
endif::openshift-rosa,openshift-dedicated[]
28+
endif::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
2329

2430
. Add the following annotation:
2531
+

nodes/clusters/nodes-cluster-overcommit.adoc

+21-17
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
10-
11-
12-
13-
149
In an _overcommitted_ state, the sum of the container compute resource requests
1510
and limits exceeds the resources available on the system. For example, you might
1611
want to use overcommitment in development environments where a trade-off of
@@ -24,33 +19,32 @@ The scheduler attempts to optimize the compute resource use across all nodes
2419
in your cluster. It places pods onto specific nodes, taking the pods' compute
2520
resource requests and nodes' available capacity into consideration.
2621

27-
ifndef::openshift-rosa,openshift-dedicated[]
22+
ifndef::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
2823
{product-title} administrators can control the level of overcommit and manage
2924
container density on nodes. You can configure cluster-level overcommit using
3025
the xref:#nodes-cluster-resource-override_nodes-cluster-overcommit[ClusterResourceOverride Operator]
3126
to override the ratio between requests and limits set on developer containers.
3227
In conjunction with xref:#nodes-cluster-node-overcommit_nodes-cluster-overcommit[node overcommit] and
3328
xref:../../applications/deployments/managing-deployment-processes.adoc#deployments-setting-resources_deployment-operations[project memory and CPU limits and defaults], you can adjust the resource limit and request to achieve the desired level of overcommit.
34-
endif::openshift-rosa,openshift-dedicated[]
35-
ifdef::openshift-rosa,openshift-dedicated[]
36-
{product-title} administrators can control the level of overcommit and manage
37-
container density on nodes. You can configure cluster-level overcommit using
38-
the xref:#nodes-cluster-resource-override_nodes-cluster-overcommit[ClusterResourceOverride Operator]
39-
to override the ratio between requests and limits set on developer containers.
40-
In conjunction with xref:#nodes-cluster-node-overcommit_nodes-cluster-overcommit[node overcommit], you can adjust the resource limit and request to achieve the desired level of overcommit.
41-
endif::openshift-rosa,openshift-dedicated[]
4229

4330
[NOTE]
4431
====
4532
In {product-title}, you must enable cluster-level overcommit. Node overcommitment is enabled by default.
4633
See xref:#nodes-cluster-overcommit-node-disable_nodes-cluster-overcommit[Disabling overcommitment for a node].
4734
====
35+
endif::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
36+
37+
//ROSA and Dedicated intro
38+
ifdef::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
39+
{product-title} administrators can manage container density on nodes by configuring pod placement behavior. Administrators can also optionally disable project-level overcommit behavior on customer-created namespaces only.
40+
endif::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
4841

4942
// The following include statements pull in the module files that comprise
5043
// the assembly. Include any combination of concept, procedure, or reference
5144
// modules required to cover the user story. You can also include other
5245
// assemblies.
5346

47+
ifndef::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
5448

5549
include::modules/nodes-cluster-overcommit-resource-requests.adoc[leveloffset=+1]
5650

@@ -72,6 +66,7 @@ include::modules/nodes-qos-about-swap.adoc[leveloffset=+2]
7266

7367
include::modules/nodes-cluster-overcommit-configure-nodes.adoc[leveloffset=+2]
7468

69+
//TODO: Omit just this file for OSDOCS-10853? Or omit this entire chapter?
7570
include::modules/nodes-cluster-overcommit-node-enforcing.adoc[leveloffset=+2]
7671

7772
include::modules/nodes-cluster-overcommit-node-resources.adoc[leveloffset=+2]
@@ -82,11 +77,20 @@ include::modules/nodes-cluster-project-overcommit.adoc[leveloffset=+1]
8277

8378
include::modules/nodes-cluster-overcommit-project-disable.adoc[leveloffset=+2]
8479

85-
ifndef::openshift-rosa,openshift-dedicated[]
80+
endif::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
81+
82+
//ROSA and Dedicated can only do this
83+
ifdef::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
84+
include::modules/nodes-cluster-overcommit-project-disable.adoc[leveloffset=+1]
85+
endif::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
86+
8687
[role="_additional-resources"]
8788
[id="nodes-cluster-overcommit-addtl-resources"]
8889
== Additional resources
89-
90+
ifndef::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
9091
* xref:../../applications/deployments/managing-deployment-processes.adoc#deployments-triggers_deployment-operations[Setting deployment resources].
9192
* xref:../../nodes/nodes/nodes-nodes-resources-configuring.adoc#nodes-nodes-resources-configuring-setting_nodes-nodes-resources-configuring[Allocating resources for nodes].
92-
endif::openshift-rosa,openshift-dedicated[]
93+
endif::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
94+
ifdef::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]
95+
* xref:../../support/troubleshooting/sd-managed-resources.adoc#sd-managed-resources[Red Hat Managed resources]
96+
endif::openshift-rosa,openshift-rosa-classic,openshift-rosa-hcp,openshift-dedicated[]

0 commit comments

Comments
 (0)