Skip to content

Commit

Permalink
Bump cloud init version, use systemd cgroup for containerd and disabl…
Browse files Browse the repository at this point in the history
…e cgroup kernel memory accounting

Signed-off-by: Dimple Raja Vamsi Kosaraju <kosarajud@vmware.com>
  • Loading branch information
DimpleRajaVamsi committed Jun 23, 2023
1 parent bb06cbd commit 22c7e55
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
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

0 comments on commit 22c7e55

Please sign in to comment.