devel: better support for runtime integration #43
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
Accept all OCI supported device types in CDI Spec files. Address a few bugs and omissions in InjectDevices making it more complete / better usable in runtimes: - generate cgroup device access rules - remove conflicting devices/mounts prior to injection - fill in missing device type, major/minor number from host - use container uid/gid if they are unspecified in CDI Spec - sort mounts after injection Signed-off-by: Krisztian Litkey <[email protected]>
|
from my perspective, looks good. |
klihub
force-pushed
the
devel/crio-integration
branch
from
c39afa7 to
a53df63
Compare
|
I've tested this on both sides - in the device plugin and in containerd. Worked just fine. |
|
/assign @elezar |
|
Hi sorry. Been off sick. Will have a look once I'm back. |
elezar
reviewed
Jan 27, 2022
elezar
reviewed
Jan 27, 2022
klihub
force-pushed
the
devel/crio-integration
branch
from
a53df63 to
b502a0b
Compare
Add functions for annotating containers for CDI device injection
and for extracting CDI device names from such annotations. These
functions can be used by CDI-aware devices plugins and runtimes,
to request the injection of CDI devices and to recover the names
of devices to inject correspondingly.
For example, the following call to AnnotateInjection
annotations := map[string]string{}
AnnotateInjection(annotations, "vendor.gpu", []string{
"vendor.com/gpu=gpu0",
"vendor.com/gpu=gpu1",
})
produces the following annotations
map[string]string{
"cdi.k8s.io/vendor.gpu": "vendor.com/gpu=gpu0,vendor.com/gpu=gpu1",
}
Subsequently parsing these annotations with
devices, err := ParseAnnotations(annotations)
extracts and returns the original slice of devices to inject:
[]string{
"vendor.com/gpu=gpu0",
"vendor.com/gpu=gpu1",
}
Notes:
These functions provide a temporary solution for delivering
CDI device injection requests from either a client or a K8s
Device Plugin to the container runtime. They can be removed
once dedicated fields to the same effect are added natively
to the CRI protocol.
Signed-off-by: Krisztian Litkey <[email protected]>
Signed-off-by: Krisztian Litkey <[email protected]>
klihub
force-pushed
the
devel/crio-integration
branch
from
b502a0b to
10f8f04
Compare
No problemo, I think this was pretty fast. Thanks for the review ! |
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.
This PR improves support for runtime CDI integration. See this accompanying branch for cri-o CDI integration as an example of using it.
In particular this PR
Requesting injection via annotation is a stop-gap solution until the CRI protocol gains dedicated CDI support.