cri/server: use containerd/oci instead of libcontainer/devices (remove libcontainer/devices dependency)#5324
Merged
dmcgowan merged 1 commit intocontainerd:masterfrom Apr 8, 2021
Conversation
|
Build succeeded.
|
Member
Author
|
Oh; let me make 1 minor change; containerd/oci/spec_opts_unix.go Line 45 in 261c107 containerd/oci/spec_opts_linux.go Line 46 in a4bc817 |
Looks like we had our own copy of the "getDevices" code already, so use that code (which also matches the code that's used to _generate_ the spec, so a better match). Moving the code to a separate file, I also noticed that the _unix and _linux code was _exactly_ the same (baring some `//nolint:` comments), so also removing the duplicated code. With this patch applied, we removed the dependency on the libcontainer/devices package (leaving only libcontainer/user). Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
cc67943 to
9bc8d63
Compare
|
Build succeeded.
|
dims
approved these changes
Apr 8, 2021
Member
dims
left a comment
There was a problem hiding this comment.
LGTM
Any dependency reduction is a win!
Member
Author
|
and it's ✅ 🎉 (which is always nice to see!) |
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.
Looks like we had our own copy of the "getDevices" code already, so use
that code (which also matches the code that's used to generate the spec,
so a better match).
Moving the code to a separate file, I also noticed that the _unix and _linux
code was exactly the same (baring some
//nolint:comments), so alsoremoving the duplicated code.
With this patch applied, we removed the dependency on the libcontainer/devices
package (leaving only libcontainer/user).