cri-o: use cgroupsv2 where available (fedora)

kubernetes-sigs · Dec 2, 2021 · 186ebd8 · 186ebd8
1 parent 9e957b2
commit 186ebd8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
@@ -239,6 +239,11 @@ packet_fedora35-calico-swap-selinux:
   extends: .packet_pr
   when: manual
 
+packet_fedora35-crio:
+  stage: deploy-part2
+  extends: .packet_pr
+  when: manual
+
 packet_amazon-linux-2-aio:
   stage: deploy-part2
   extends: .packet_pr

diff --git a/roles/container-engine/cri-o/tasks/main.yaml b/roles/container-engine/cri-o/tasks/main.yaml
@@ -35,22 +35,6 @@
   tags:
     - facts
 
-- name: disable unified_cgroup_hierarchy in Fedora 31+
-  command: grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0"
-  when:
-    - ansible_distribution == "Fedora"
-    - (ansible_distribution_major_version | int) >= 31
-    - ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] is not defined or ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] != '0'
-    - not is_ostree
-
-- name: reboot in Fedora 31+
-  reboot:
-  when:
-    - ansible_distribution == "Fedora"
-    - (ansible_distribution_major_version | int) >= 31
-    - ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] is not defined or ansible_proc_cmdline['systemd.unified_cgroup_hierarchy'] != '0'
-    - not is_ostree
-
 - name: import crio repo
   import_tasks: "crio_repo.yml"
   when: crio_add_repos