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.

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

Bump cloud init version, use systemd cgroup for containerd and disable cgroup kernel memory accounting #43

Merged
merged 1 commit into from
Jun 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions ansible/tasks/photon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,10 @@
backrefs: yes
regexp: "^(?!.*pos=1)(photon_cmdline.*)"
line: '\1 pos=1'

- name: Disabling cgroups kernel memory accounting and disabling cgroups v2
lineinfile:
path: /boot/photon.cfg
backrefs: yes
regexp: "^(photon_cmdline.*)$"
line: '\1 cgroup.memory=nokmem systemd.legacy_systemd_cgroup_controller=yes'
6 changes: 5 additions & 1 deletion ansible/templates/etc/containerd/config_v2.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,18 @@ oom_score = 0
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_proc_mount = false
[plugins."io.containerd.grpc.v1.cri".containerd]
snapshotter = "overlayfs"
no_pivot = false
default_runtime_name = "runc"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
[plugins."io.containerd.grpc.v1.cri".containerd.untrusted_workload_runtime]
runtime_type = ""
runtime_engine = ""
Expand Down
2 changes: 1 addition & 1 deletion scripts/utkg_custom_ovf_properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def set_versions(args):
version_maps = {
"image": kubernetes_config["image_version"],
"k8s": kubernetes_config["kubernetes"],
"cloudInit": "19.4",
"cloudInit": "22.4.2",
"coredns": kubernetes_config["coredns"],
"etcd": kubernetes_config["etcd"],
}
Expand Down