Skip to content

Conversation

@neersighted
Copy link
Member

@neersighted neersighted commented Feb 11, 2023

- 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.

@neersighted

This comment was marked as outdated.

This reverts commit ab3fa46.

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

Signed-off-by: Bjorn Neergaard <[email protected]>
@neersighted neersighted marked this pull request as ready for review February 16, 2023 15:26
@neersighted neersighted added this to the v-next milestone Feb 16, 2023
Copy link
Contributor

@corhere corhere left a comment

Choose a reason for hiding this comment

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

The PR description is slightly outdated: it still lists the prerelease pseudo-version for the containerd bump

@neersighted
Copy link
Member Author

Cherry-picked in #45043

Copy link
Contributor

@vvoland vvoland 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 for picking this one up!

@neersighted neersighted merged commit a4a3efb into moby:master Feb 21, 2023
@neersighted neersighted deleted the containerd_1.6.18 branch February 21, 2023 15:19
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM (saw the PR, but somehow looks like I didn't review it 😅)

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

4 participants