Skip to content

Commit 8043812

Browse files
authored
Merge pull request #75120 from mburke5678/node-cgroup-v1-deprecation
cGroup v1 is deprecated in 4.16
2 parents 836985e + f491a79 commit 8043812

9 files changed

+38
-5
lines changed

installing/install_config/enabling-cgroup-v1.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ toc::[]
99

1010
As of {product-title} 4.14, {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. If you are using cgroup v1 on {product-title} 4.13 or earlier, migrating to {product-title} 4.15 will not automatically update your cgroup configuration to version 2. A fresh installation of {product-title} 4.14 or later will use cgroup v2 by default. However, you can enable link:https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v1/index.html[Linux control group version 1] (cgroup v1) upon installation. Enabling cgroup v1 in {product-title} disables all cgroup v2 controllers and hierarchies in your cluster.
1111

12+
:FeatureName: cgroup v1
13+
include::snippets/deprecated-feature.adoc[]
14+
1215
include::snippets/cgroupv2-vs-cgroupv1.adoc[]
1316

1417
ifndef::openshift-origin[]

installing/installing_openstack/installing-openstack-nfv-preparing.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ You must configure {rh-openstack} before you install a cluster that uses SR-IOV
1919

2020
When installing a cluster using SR-IOV, you must deploy clusters using cgroup v1. For more information, xref:../../installing/install_config/enabling-cgroup-v1.adoc#enabling-cgroup-v1[Enabling Linux control group version 1 (cgroup v1)].
2121

22+
:FeatureName: cgroup v1
23+
include::snippets/deprecated-feature.adoc[]
24+
2225
include::modules/installation-osp-configuring-sr-iov.adoc[leveloffset=+2]
2326

2427
[id="installing-openstack-nfv-preparing-tasks-ovs-dpdk"]

modules/cnf-tuning-nodes-for-low-latency-via-performanceprofile.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ The performance profile lets you control latency tuning aspects of nodes that be
1414

1515
You can use a performance profile to specify whether to update the kernel to kernel-rt, to allocate huge pages, and to partition the CPUs for performing housekeeping duties or running workloads.
1616

17+
:FeatureName: cgroup v1
18+
include::snippets/deprecated-feature.adoc[]
19+
1720
[NOTE]
1821
====
1922
You can manually create the `PerformanceProfile` object or use the Performance Profile Creator (PPC) to generate a performance profile. See the additional resources below for more information on the PPC.

modules/nodes-clusters-cgroups-2-install.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
You can enable Linux control group version 1 (cgroup v1) when you install a cluster by creating installation manifests.
1010

11+
:FeatureName: cgroup v1
12+
include::snippets/deprecated-feature.adoc[]
13+
1114
.Procedure
1215

1316
. Create or edit the `node.config` object to specify the `v1` cgroup:
@@ -23,4 +26,3 @@ spec:
2326
----
2427

2528
. Proceed with the installation as usual.
26-

modules/nodes-clusters-cgroups-2.adoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ endif::[]
1616

1717
ifndef::openshift-origin[]
1818
ifdef::post[]
19-
As of {product-title} 4.14, {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. If you are using cgroup v1 on {product-title} 4.13 or earlier, migrating to {product-title} 4.14 or later will not automatically update your cgroup configuration to version 2. A fresh installation of {product-title} 4.14 or later will use cgroup v2 by default. However, you can enable link:https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v1/index.html[Linux control group version 1] (cgroup v1) upon installation.
19+
As of {product-title} 4.14, {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. If you are using cgroup v1 on {product-title} 4.13 or earlier, migrating to {product-title} 4.14 or later will not automatically update your cgroup configuration to version 2. A fresh installation of {product-title} 4.14 or later will use cgroup v2 by default. However, you can enable link:https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v1/index.html[Linux control group version 1] (cgroup v1) upon installation.
2020
endif::post[]
2121
endif::openshift-origin[]
2222
ifdef::openshift-origin[]
@@ -28,13 +28,16 @@ endif::openshift-origin[]
2828
ifdef::post[]
2929
cgroup v2 is the current 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. However, cgroup v2 has different CPU, memory, and I/O management characteristics than cgroup v1. Therefore, some workloads might experience slight differences in memory or CPU usage on clusters that run cgroup v2.
3030

31-
You can change between cgroup v1 and cgroup v2, as needed. Enabling cgroup v1 in {product-title} disables all cgroup v2 controllers and hierarchies in your cluster.
31+
You can change between cgroup v1 and cgroup v2, as needed. Enabling cgroup v1 in {product-title} disables all cgroup v2 controllers and hierarchies in your cluster.
3232
endif::post[]
3333

3434
ifdef::nodes[]
3535
You can enable link:https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v1/index.html[Linux control group version 1] (cgroup v1) or link:https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v2.html[Linux control group version 2] (cgroup v2) by editing the `node.config` object. The default is cgroup v2.
3636
endif::nodes[]
3737

38+
:FeatureName: cgroup v1
39+
include::snippets/deprecated-feature.adoc[]
40+
3841
[NOTE]
3942
====
4043
Currently, disabling CPU load balancing is not supported by cgroup v2. As a result, you might not get the desired behavior from performance profiles if you have cgroup v2 enabled. Enabling cgroup v2 is not recommended if you are using performance profiles.

modules/nodes-nodes-kernel-arguments.adoc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ Examples of kernel arguments you could set include:
2020
2121
ifndef::openshift-origin[]
2222
* **systemd.unified_cgroup_hierarchy**: Enables link:https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v2.html[Linux control group version 2] (cgroup v2). 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.
23+
+
24+
--
25+
:FeatureName: cgroup v1
26+
include::snippets/deprecated-feature.adoc[]
27+
--
2328
endif::openshift-origin[]
2429

2530
ifdef::openshift-origin[]
@@ -29,6 +34,11 @@ ifdef::openshift-origin[]
2934
====
3035
cgroup v2 is enabled by default. To disable cgroup v2, use the `systemd.unified_cgroup_hierarchy=0` kernel argument, as shown in the following procedure.
3136
====
37+
+
38+
--
39+
:FeatureName: cgroup v1
40+
include::snippets/deprecated-feature.adoc[]
41+
--
3242
endif::openshift-origin[]
3343

3444
* **enforcing=0**: Configures Security Enhanced Linux (SELinux) to run in permissive mode. In permissive mode, the system acts as if SELinux is enforcing the loaded security policy, including labeling objects and emitting access denial entries in the logs, but it does not actually deny any operations. While not supported for production systems, permissive mode can be helpful for debugging.

modules/telco-ran-crs-machine-configuration.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ Set RCU Normal,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#z
3030
SR-IOV related kernel arguments,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-07-sriov-related-kernel-args-master-yaml[07-sriov-related-kernel-args-master.yaml],No,No
3131
SR-IOV related kernel arguments,xref:../../telco_ref_design_specs/ran/telco-ran-ref-du-crs.adoc#ztp-07-sriov-related-kernel-args-worker-yaml[07-sriov-related-kernel-args-worker.yaml],No,No
3232
|====
33+
34+
:FeatureName: cgroup v1
35+
include::snippets/deprecated-feature.adoc[]

modules/telco-ran-node-tuning-operator.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,6 @@ In {product-title} {product-version}, any `PerformanceProfile` CR configured on
7272
7373
For more information about cgroups, see link:https://docs.openshift.com/container-platform/4.15/nodes/clusters/nodes-cluster-cgroups-2.html#nodes-clusters-cgroups-2_nodes-cluster-cgroups-2[Configuring Linux cgroup].
7474
====
75+
76+
:FeatureName: cgroup v1
77+
include::snippets/deprecated-feature.adoc[]

nodes/clusters/nodes-cluster-cgroups-2.adoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@ include::_attributes/common-attributes.adoc[]
77
toc::[]
88

99
ifndef::openshift-origin[]
10-
As of {product-title} 4.14, {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. If you are using cgroup v1 on {product-title} 4.13 or earlier, migrating to {product-title} 4.14 or later will not automatically update your cgroup configuration to version 2. A fresh installation of {product-title} 4.14 or later will use cgroup v2 by default. However, you can enable link:https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v1/index.html[Linux control group version 1] (cgroup v1) upon installation.
10+
As of {product-title} 4.14, {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. If you are using cgroup v1 on {product-title} 4.13 or earlier, migrating to {product-title} 4.14 or later will not automatically update your cgroup configuration to version 2. A fresh installation of {product-title} 4.14 or later will use cgroup v2 by default. However, you can enable link:https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v1/index.html[Linux control group version 1] (cgroup v1) upon installation.
1111
endif::openshift-origin[]
1212
ifdef::openshift-origin[]
1313
{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.
1414
endif::openshift-origin[]
1515

16+
:FeatureName: cgroup v1
17+
include::snippets/deprecated-feature.adoc[]
18+
1619
include::snippets/cgroupv2-vs-cgroupv1.adoc[]
1720

18-
You can change between cgroup v1 and cgroup v2, as needed. Enabling cgroup v1 in {product-title} disables all cgroup v2 controllers and hierarchies in your cluster.
21+
You can change between cgroup v1 and cgroup v2, as needed. Enabling cgroup v1 in {product-title} disables all cgroup v2 controllers and hierarchies in your cluster.
1922

2023
[NOTE]
2124
====

0 commit comments

Comments
 (0)