Merge pull request vmware-tanzu#43 from DimpleRajaVamsi/issue-42

Bump cloud init version, use systemd cgroup for containerd and disable cgroup kernel memory accounting
DimpleRajaVamsi · Jun 29, 2023 · df9a0d5 · df9a0d5
2 parents bb06cbd + 22c7e55
commit df9a0d5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/ansible/tasks/photon.yml b/ansible/tasks/photon.yml
@@ -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'
diff --git a/ansible/templates/etc/containerd/config_v2.toml b/ansible/templates/etc/containerd/config_v2.toml
@@ -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 = ""

diff --git a/scripts/utkg_custom_ovf_properties.py b/scripts/utkg_custom_ovf_properties.py
@@ -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"],
     }