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

[release/1.6] Fix panic due to nil dereference cgroups v2 #11100

Merged

Conversation

djdongjin
Copy link
Member

This PR ports #11069 to release/1.6 (with minor modification due to that 1.6 uses logrus and containerd/cgroups v1.0.4).

@djdongjin djdongjin force-pushed the cherry-pick-11069-to-1.6 branch 3 times, most recently from 272c933 to a125657 Compare December 5, 2024 04:40
@djdongjin
Copy link
Member Author

/retest

@djdongjin djdongjin force-pushed the cherry-pick-11069-to-1.6 branch from a125657 to ce0b973 Compare December 5, 2024 15:28
@djdongjin djdongjin force-pushed the cherry-pick-11069-to-1.6 branch from ce0b973 to db09679 Compare December 5, 2024 15:51
Copy link
Member

@austinvazquez austinvazquez left a comment

Choose a reason for hiding this comment

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

LGTM on green. Thanks

@djdongjin
Copy link
Member Author

hi @AkihiroSuda could you PTAL this cherrypick PR (since you helped review the original one :) )? thank you!

@AkihiroSuda AkihiroSuda merged commit aa03a81 into containerd:release/1.6 Dec 9, 2024
49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants