Default to cdi #910
Draft
Default to cdi #910
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
elezar
force-pushed
the
default-to-cdi
branch
from
1bb5f35 to
7343c9c
Compare
Signed-off-by: Evan Lezar <[email protected]>
elezar
force-pushed
the
default-to-cdi
branch
2 times, most recently
from
323f7b8 to
3e2c4d9
Compare
Signed-off-by: Evan Lezar <[email protected]>
Signed-off-by: Evan Lezar <[email protected]>
elezar
force-pushed
the
default-to-cdi
branch
from
3e2c4d9 to
23f6d28
Compare
jgehrcke
reviewed
Mar 21, 2025
| @@ -116,6 +117,24 @@ func getDevicesFromSpec(logger logger.Interface, ociSpec oci.Spec, cfg *config.C | |||
| return nil, nil | |||
| } | |||
|
|
|||
| func normalizeDeviceList(logger logger.Interface, defaultKind string, devices ...string) []string { | |||
There was a problem hiding this comment.
Maybe add a code comment showing an example of what this function is doing (supposed to do).
jgehrcke
reviewed
Mar 21, 2025
| require.NotEmpty(t, spec.Hooks, "there should be hooks in config.json") | ||
| require.Equal(t, 1, nvidiaHookCount(spec.Hooks), "exactly one nvidia prestart hook should be inserted correctly into config.json") | ||
| require.Empty(t, spec.Hooks, "there should be hooks in config.json") | ||
| require.Equal(t, 0, nvidiaHookCount(spec.Hooks), "exactly one nvidia prestart hook should be inserted correctly into config.json") |
jgehrcke
approved these changes
Mar 21, 2025
cdesiniotis
approved these changes
Mar 21, 2025
| @@ -125,8 +125,8 @@ func TestGoodInput(t *testing.T) { | |||
| // Check config.json for NVIDIA prestart hook | |||
| spec, err = cfg.getRuntimeSpec() | |||
| require.NoError(t, err, "should be no errors when reading and parsing spec from config.json") | |||
| require.NotEmpty(t, spec.Hooks, "there should be hooks in config.json") | |||
| require.Equal(t, 1, nvidiaHookCount(spec.Hooks), "exactly one nvidia prestart hook should be inserted correctly into config.json") | |||
| require.Empty(t, spec.Hooks, "there should be hooks in config.json") | |||
There was a problem hiding this comment.
Suggested change
| require.Empty(t, spec.Hooks, "there should be hooks in config.json") | |
| require.Empty(t, spec.Hooks, "there should be no hooks in config.json") |
| require.NotEmpty(t, spec.Hooks, "there should be hooks in config.json") | ||
| require.Equal(t, 1, nvidiaHookCount(spec.Hooks), "exactly one nvidia prestart hook should be inserted correctly into config.json") | ||
| require.Empty(t, spec.Hooks, "there should be hooks in config.json") | ||
| require.Equal(t, 0, nvidiaHookCount(spec.Hooks), "exactly one nvidia prestart hook should be inserted correctly into config.json") |
There was a problem hiding this comment.
Suggested change
| require.Equal(t, 0, nvidiaHookCount(spec.Hooks), "exactly one nvidia prestart hook should be inserted correctly into config.json") | |
| require.Equal(t, 0, nvidiaHookCount(spec.Hooks), "no nvidia prestart hook should be inserted into config.json") |
| require.NotEmpty(t, spec.Hooks, "there should be hooks in config.json") | ||
| require.Equal(t, 1, nvidiaHookCount(spec.Hooks), "exactly one nvidia prestart hook should be inserted correctly into config.json") | ||
| require.Empty(t, spec.Hooks, "there should be no hooks in config.json") | ||
| require.Equal(t, 0, nvidiaHookCount(spec.Hooks), "exactly one nvidia prestart hook should be inserted correctly into config.json") |
There was a problem hiding this comment.
Suggested change
| require.Equal(t, 0, nvidiaHookCount(spec.Hooks), "exactly one nvidia prestart hook should be inserted correctly into config.json") | |
| require.Equal(t, 0, nvidiaHookCount(spec.Hooks), "no nvidia prestart hook should be inserted into config.json") |
| logger.Debugf("Ignoring duplicate device %q", name) | ||
| continue | ||
| if cfg.AcceptDeviceListAsVolumeMounts { | ||
| devices = normalizeDeviceList(logger, defaultKind, append(container.DevicesFromMounts(), container.CDIDevicesFromMounts()...)...) |
There was a problem hiding this comment.
Before this change I notice that we were only calling container.CDIDevicesFromMounts() to construct the list of devices specified as volume mounts, but now we are also calling container.DeviceFromMounts() -- is there a reason we weren't calling both functions prior?
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.
No description provided.