Merge pull request #33796 from kannon92/cgroupv1-crio-fix

k8s-ci-robot · web-flow · commit 6b2bc1922e3f · 2024-11-13T15:44:48.000Z
use SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE for cgroup v1 nodes
diff --git a/jobs/e2e_node/crio/crio_cgroupv1.ign b/jobs/e2e_node/crio/crio_cgroupv1.ign
@@ -4,7 +4,7 @@
   },
   "kernelArguments": {
     "shouldExist": [
-      "systemd.unified_cgroup_hierarchy=0"
+      "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1"
     ],
     "shouldNotExist": [
       "mitigations=auto,nosmt"
diff --git a/jobs/e2e_node/crio/crio_cgroupv1_eventedpleg.ign b/jobs/e2e_node/crio/crio_cgroupv1_eventedpleg.ign
@@ -4,7 +4,7 @@
   },
   "kernelArguments": {
     "shouldExist": [
-      "systemd.unified_cgroup_hierarchy=0"
+      "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1"
     ],
     "shouldNotExist": [
       "mitigations=auto,nosmt"
diff --git a/jobs/e2e_node/crio/crio_cgroupv1_hugepages.ign b/jobs/e2e_node/crio/crio_cgroupv1_hugepages.ign
@@ -4,7 +4,7 @@
   },
   "kernelArguments": {
     "shouldExist": [
-      "systemd.unified_cgroup_hierarchy=0"
+      "SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1"
     ],
     "shouldNotExist": [
       "mitigations=auto,nosmt"
diff --git a/jobs/e2e_node/crio/templates/base/cgroupv1.yaml b/jobs/e2e_node/crio/templates/base/cgroupv1.yaml
@@ -1,4 +1,4 @@
 ---
 kernel_arguments:
   should_exist:
-    - systemd.unified_cgroup_hierarchy=0
+    - SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1
diff --git a/jobs/e2e_node/crio/templates/crio_cgroupv1.yaml b/jobs/e2e_node/crio/templates/crio_cgroupv1.yaml
@@ -5,7 +5,7 @@ kernel_arguments:
   should_not_exist:
     - mitigations=auto,nosmt
   should_exist:
-    - systemd.unified_cgroup_hierarchy=0
+    - SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1
 storage:
   files:
     - path: /etc/zincati/config.d/90-disable-auto-updates.toml
diff --git a/jobs/e2e_node/crio/templates/crio_cgroupv1_eventedpleg.yaml b/jobs/e2e_node/crio/templates/crio_cgroupv1_eventedpleg.yaml
@@ -5,7 +5,7 @@ kernel_arguments:
   should_not_exist:
     - mitigations=auto,nosmt
   should_exist:
-    - systemd.unified_cgroup_hierarchy=0
+    - SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1
 storage:
   files:
     - path: /etc/zincati/config.d/90-disable-auto-updates.toml
diff --git a/jobs/e2e_node/crio/templates/crio_cgroupv1_hugepages.yaml b/jobs/e2e_node/crio/templates/crio_cgroupv1_hugepages.yaml
@@ -5,7 +5,7 @@ kernel_arguments:
   should_not_exist:
     - mitigations=auto,nosmt
   should_exist:
-    - systemd.unified_cgroup_hierarchy=0
+    - SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1
 storage:
   files:
     - path: /etc/zincati/config.d/90-disable-auto-updates.toml
