daemon: fully resolve apparmor_parser regression
#44982
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as outdated.
This comment was marked as outdated.
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>
neersighted
force-pushed
the
containerd_1.6.18
branch
from
43f48d6
to
c4c5468
Compare
corhere
approved these changes
Feb 16, 2023
|
Cherry-picked in #45043 |
vvoland
approved these changes
Feb 21, 2023
thaJeztah
approved these changes
Feb 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- 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
apparmor_parseris missing.