[release/2.0] Move CDI device spec out of the OCI package#11265
Merged
mikebrow merged 2 commits intocontainerd:release/2.0from Jan 23, 2025
Merged
[release/2.0] Move CDI device spec out of the OCI package#11265mikebrow merged 2 commits intocontainerd:release/2.0from
mikebrow merged 2 commits intocontainerd:release/2.0from
Conversation
The CDI device injection spec opt was mistakenly added to the OCI package which brought in an unintended dependency on CDI and its transitive dependencies. Signed-off-by: Derek McGowan <[email protected]> (cherry picked from commit e20f7f4) Signed-off-by: Derek McGowan <[email protected]>
dosubot
Bot
added
area/cri
AkihiroSuda
reviewed
Jan 17, 2025
| // well. Therefore it is important that none of the corresponding | ||
| // OCI Spec fields are reset up in the call stack once we return. | ||
| return nil | ||
| return errors.New("must use cdi package for CDI device injection") |
Member
There was a problem hiding this comment.
The function should remain functional, as it is only "deprecated"?
Member
There was a problem hiding this comment.
Or maybe just remove the function, if the impact is considered low.
Member
Author
There was a problem hiding this comment.
I'm ok removing completely
This function has been moved to prevent an unintended dependency on CDI. Signed-off-by: Derek McGowan <[email protected]> (cherry picked from commit bdc847f) Signed-off-by: Derek McGowan <[email protected]>
Member
Author
|
/retest |
AkihiroSuda
approved these changes
Jan 17, 2025
Member
Author
|
/retest |
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.
The CDI device injection spec opt was mistakenly added to the OCI package which brought in an unintended dependency on CDI and its transitive dependencies.
(cherry picked from commit e20f7f4)
Backport of #11262 with only the first commit. The function should remain and be marked deprecated in 2.0.