-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Don't check for apparmor_parser to be present #5519
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
Don't check for apparmor_parser to be present #5519
Conversation
Signed-off-by: Shiming Zhang <[email protected]>
Signed-off-by: Shiming Zhang <[email protected]>
|
Hi @wzshiming. Thanks for your PR. I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
Build succeeded.
|
estesp
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
kzys
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
…ate k0s docs to reflect that. Fixes k0sproject#1800 Signed-off-by: Jussi Nummelin <[email protected]>
|
Just adding a note here: The comment here was read backwards. It was meant to be understood as "this check is like the one in libcontainer, but that one doesn't check this thing that we additionally do." This caused a regression in Moby as containerd stopped checking for |
|
Also it looks like we knew about this 18 months ago: #5557 (comment)
|
|
Yes. Ran into this yesterday. Assuming that you have a working apparmor just because the module was compiled in, does not seem appropriate here.
This hybrid where we check for A and do B is wrong. Just updating the comments without removing all |
|
So in a (slightly larger) nutshell;
So, yes, the changes in #4715 where specifically intended to preserve the old behavior as it was needed for containerd (CRI); the function was named The changes in this PR;
|
|
Not sure about the background, but I think @wdoekes is perfectly correct, regardless what the background is:
|
Looks like containerd also uses it ( containerd/contrib/apparmor/template.go Lines 164 to 167 in 97480af
which gets invoked by containerd/contrib/seccomp/seccomp.go Line 49 in 97480af
(and I think this PR was what led to CI failures investigated in #5557) |
|
Generally it seems like |
|
The million dollar question is what does If containerd depends on |
…ser. Update k0s docs to reflect that." This reverts commit 9af9db3. containerd v1.6.18 reverted the removal of the check. Signed-off-by: Tom Wieczorek <[email protected]>
…ser. Update k0s docs to reflect that." This reverts commit 9af9db3. containerd v1.6.18 reverted the removal of the check. Signed-off-by: Tom Wieczorek <[email protected]>
…ser. Update k0s docs to reflect that." This reverts commit 9af9db3. containerd v1.6.18 reverted the removal of the check. Signed-off-by: Tom Wieczorek <[email protected]>
…ser. Update k0s docs to reflect that." This reverts commit 9af9db3. containerd v1.6.18 reverted the removal of the check. Signed-off-by: Tom Wieczorek <[email protected]>
…ser. Update k0s docs to reflect that." This reverts commit 9af9db3. containerd v1.6.18 reverted the removal of the check. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit 5c4c78c)
containerd/pkg/apparmor/apparmor_linux.go
Lines 32 to 48 in 055c801
This comment does not match the behavior
https://github.com/opencontainers/runc/blob/0d49470392206f40eaab3b2190a57fe7bb3df458/libcontainer/apparmor/apparmor_linux.go#L13-L27
https://github.com/moby/moby/blob/de191e86321f7d3136ff42ff75826b8107399497/pkg/apparmor/apparmor.go#L15-L21