Skip to content

Commit 52267d3

Browse files
authored
Merge pull request #54012 from openshift-cherrypick-robot/cherry-pick-54011-to-main
[main] GH53536: [OKD] Documentation is unclear about status of cgroups v2
2 parents 73da0b9 + e8dbc1c commit 52267d3

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

_topic_maps/_topic_map.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@ Topics:
489489
File: configuring-firewall
490490
- Name: Enabling Linux control group version 2 (cgroup v2)
491491
File: enabling-cgroup-v2
492-
Distros: openshift-enterprise
493492
- Name: Validating an installation
494493
File: validating-an-installation
495494
Distros: openshift-origin,openshift-enterprise

installing/install_config/enabling-cgroup-v2.adoc

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,34 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9+
10+
ifndef::openshift-origin[]
911
You can enable link:https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v2.html[Linux control group version 2] (cgroup v2) in your cluster by editing the `node.config` object. Enabling cgroup v2 in {product-title} disables all cgroups version 1 controllers and hierarchies in your cluster. cgroup v1 is enabled by default.
1012

1113
cgroup v2 is the next version of the Linux cgroup API. cgroup v2 offers several improvements over cgroup v1, including a unified hierarchy, safer sub-tree delegation, new features such as link:https://www.kernel.org/doc/html/latest/accounting/psi.html[Pressure Stall Information], and enhanced resource management and isolation.
1214

1315
:FeatureName: {product-title} cgroups version 2 support
1416
include::snippets/technology-preview.adoc[leveloffset=+0]
17+
endif::openshift-origin[]
18+
19+
ifdef::openshift-origin[]
20+
By default, {product-title} uses link:https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v2.html[Linux control group version 2] (cgroup v2) in your cluster. You can switch to link:https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v1.html[Linux control group version 1] (cgroup v1), if needed.
21+
22+
cgroup v2 is the next version of the kernel link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/html/resource_management_guide/ch01[control group] and offers multiple improvements. However, it can have some unwanted effects on your nodes.
23+
endif::openshift-origin[]
1524

1625
// The following include statements pull in the module files that comprise
1726
// the assembly. Include any combination of concept, procedure, or reference
1827
// modules required to cover the user story. You can also include other
1928
// assemblies.
2029

21-
30+
ifndef::openshift-origin[]
2231
include::modules/nodes-clusters-cgroups-2-install.adoc[leveloffset=+1]
32+
endif::openshift-origin[]
33+
34+
ifdef::openshift-origin[]
35+
include::modules/nodes-clusters-cgroups-okd-configure.adoc[leveloffset=+1]
36+
endif::openshift-origin[]
2337

2438
.Additional resources
2539

0 commit comments

Comments
 (0)