oci: deprecate SetCapabilities, and some minor cleanups/fixes#50461
Merged
thaJeztah merged 3 commits intomoby:masterfrom Jul 21, 2025
Merged
oci: deprecate SetCapabilities, and some minor cleanups/fixes#50461thaJeztah merged 3 commits intomoby:masterfrom
thaJeztah merged 3 commits intomoby:masterfrom
Conversation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
TweakCapabilities takes privileged into account, but SetCapabilities does not, so fix the GoDoc. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
rewrite daemon.WithCapabilities using c8d's oci.WithCapabilities. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
e939d54 to
61b19a4
Compare
austinvazquez
approved these changes
Jul 21, 2025
dmcgowan
approved these changes
Jul 21, 2025
thaJeztah
commented
Jul 21, 2025
| // capabilities in the basics capabilities list. | ||
| // capabilities in the basics capabilities list. All capabilities are added | ||
| // if privileged is true. | ||
| func TweakCapabilities(basics, adds, drops []string, privileged bool) ([]string, error) { |
Member
Author
There was a problem hiding this comment.
@austinvazquez We can probably reimplement this using WithXXX functions from containerd; there's some small bits that I think are missing;
- I don't think containerd exposes the
DefaultCapabilities - Containerd's code doesn't use
ALL(for "all capabilities"), which we use to allow the user to specify "all" capabilities, except for XYZ.
I need to give it another look though, but would be nice if we could consume more of these options from containerd instead of replicating the same things.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
oci: sort defaultLinuxMaskedPaths
oci: fix godoc for SetCapabilities, TweakCapabilities
TweakCapabilities takes privileged into account, but SetCapabilities
does not, so fix the GoDoc.
oci: deprecate SetCapabilities
rewrite daemon.WithCapabilities using c8d's oci.WithCapabilities.
- Human readable description for the release notes
- A picture of a cute animal (not mandatory but encouraged)