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

[23.0 backport] daemon: fully resolve apparmor_parser regression #45043

Merged
merged 2 commits into from Feb 21, 2023

Conversation

neersighted
Copy link
Member

- What I did

- How I did it

Pull in containerd/containerd#8087 from containerd, and drop the partial fix we made in this repository.

- How to verify it

We really could use some sort of binary download from our CI jobs to make the friction of manual testing easier. But for now, manually, and by reviewing the clean revert of the offending change in containerd.

- Description for the changelog

  • Fully resolve a failure to start containers when an AppArmor-enabled kernel is present, but apparmor_parser is missing.

Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
(cherry picked from commit 174802e)
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
This reverts commit ab3fa46.

This fix was partial, and is not needed with the proper fix in
containerd.

Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
(cherry picked from commit c4c5468)
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
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.

Incorrect detection of lack of Apparmor installed
2 participants