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

Conversation

DimpleRajaVamsi
Copy link
Collaborator

@DimpleRajaVamsi DimpleRajaVamsi commented Jun 26, 2023

This PR has the below changes

  • Bump the cloud-init version from 19.4 to 22.4.2
  • Use systemd cgroup driver for containerd (Upstream already uses systemd cgroup driver for containerd)
  • Disable cgroups kernel memory account and disable cgroups v2 for Photon (Photon grub command line changes)

All the above changes are applicable for both 1.24 and 1.25(In progress)

Fixes #42

Testing

  • Built Photon/Ubuntu 1.24/1.25 Images
  • gce2e for Photon 1.24.9 (gce2e#8926) 🟢
  • gce2e for Photon 1.25.7 (gce2e#8927) 🟢
  • gce2e for Ubuntu 1.24.9 (gce2e#8942) 🟢
  • gce2e for Ubuntu 1.25.7 (gce2e#8935) 🟢
  • Live cluster verification details
root@cc-2zbsx-n28qq [ ~ ]# cat /boot/photon.cfg
# GRUB Environment Block
photon_cmdline=init=/lib/systemd/systemd rcupdate.rcu_expedited=1 rw systemd.show_status=0 quiet noreplace-smp cpu_init_udelay=0 transparent_hugepage=madvise apparmor=1 pos=1 cgroup.memory=nokmem systemd.legacy_systemd_cgroup_controller=yes
photon_linux=vmlinuz-4.19.283-3.ph3-esx
photon_initrd=initrd.img-4.19.283-3.ph3-esx
root@cc-2zbsx-n28qq [ ~ ]# cat /etc/containerd/config.toml | grep SystemdCgroup
           SystemdCgroup = true
root@cc-2zbsx-n28qq [ ~ ]# cloud-init --version
/bin/cloud-init 22.4.2

Signed-off-by: Dimple Raja Vamsi Kosaraju kosarajud@vmware.com

…e cgroup kernel memory accounting

Signed-off-by: Dimple Raja Vamsi Kosaraju <kosarajud@vmware.com>
@DimpleRajaVamsi DimpleRajaVamsi self-assigned this Jun 26, 2023
Copy link
Contributor

@ridaz ridaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, Thanks

@DimpleRajaVamsi DimpleRajaVamsi merged commit df9a0d5 into vmware-tanzu:main Jun 29, 2023
@DimpleRajaVamsi DimpleRajaVamsi deleted the issue-42 branch June 29, 2023 06:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bump cloud init version, use systemd cgroup for containerd and disable cgroup kernel memory accounting
2 participants