Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Configure containerd runc plugin options with systemd cgroup driver #493

Merged
merged 8 commits into from
Oct 6, 2022
Merged

fix: Configure containerd runc plugin options with systemd cgroup driver #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b2f1c29
fix: Configure containerd runc plugin to use systemd cgroup driver
dlipovetsky Sep 9, 2022
eb6788c
Use runtime type 'io.containerd.runc.v2'
dlipovetsky Sep 12, 2022
42810c6
Use systemd cgroup driver with the nvidia runtime
dlipovetsky Sep 12, 2022
d9e4d09
Use SystemdCgroup instead of systemd_cgroup
dlipovetsky Sep 13, 2022
d9b1737
Use "io.containerd.runc.v2" for nvidia container runtime
dlipovetsky Sep 13, 2022
5b95433
Merge branch 'main' into dlipovetsky/systemd-cgroup-default
faiq Sep 14, 2022
5c9997f
fix: from poor merge
faiq Sep 14, 2022
c890621
fix: allows cgroups v2 by default for flatcar
faiq Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ansible/roles/config/templates/config.toml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ imports = ["/etc/containerd/conf.d/*.toml"]
enable_selinux = false
sandbox_image = "{{ pause_image }}"
stats_collect_period = 10
systemd_cgroup = false
enable_tls_streaming = false
max_container_log_line_size = 16384
disable_cgroup = false
Expand All @@ -88,10 +87,12 @@ imports = ["/etc/containerd/conf.d/*.toml"]
privileged_without_host_devices = false
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
runtime_type = "io.containerd.runc.v1"
runtime_type = "io.containerd.runc.v2"
runtime_engine = ""
runtime_root = ""
privileged_without_host_devices = false
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
[plugins."io.containerd.grpc.v1.cri".cni]
bin_dir = "/opt/cni/bin"
conf_dir = "/etc/cni/net.d"
Expand Down
13 changes: 0 additions & 13 deletions ansible/roles/containerd/tasks/install-flatcar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,3 @@
copy:
content: "export PATH=$PATH:/run/torcx/unpack/docker/bin/"
dest: "/etc/profile.d/my_path.sh"

- name: ensure cgroups v2 are disabled
command: grep -q systemd.unified_cgroup_hierarchy=0 /usr/share/oem/grub.cfg
changed_when: no
failed_when: false
register: cgroupsv2_check

- name: cgroups setup
when:
- cgroupsv2_check.rc != 0
block:
- name: disable cgroups v2
command: sed -E -i 's/^(set linux_append=.*)"$/\1 systemd.unified_cgroup_hierarchy=0 systemd.legacy_systemd_cgroup_controller"/g' /usr/share/oem/grub.cfg