Skip graphics modifier in CSV mode #874
Merged
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
added
the
must-backport
|
Seems reasonable, albeit a little hacky |
elezar
force-pushed
the
skip-graphics-for-csv
branch
from
fd99379 to
fea991f
Compare
I have refactored this a bit based on our discussions. Note that the intent here is to have CSV mode in the NVIDIA Container Runtime behave the same way as what CDI mode would if the spec was generated from the CSV files. This is not currently the case due to the "graphics" modifiers being triggered when I understand that we don't want to "silently" ignore options that the user passes, but since this is already the case in CDI mode, I feel that doing the same in the case of CSV mode is justified. |
Signed-off-by: Evan Lezar <[email protected]>
In CSV mode the CSV files at /etc/nvidia-container-runtime/host-files-for-container.d/ should be the source of truth for container modifications. This change skips graphics modifications to a container. This prevents conflicts when handling files such as vulkan icd files which are already defined in the CSV file. Signed-off-by: Evan Lezar <[email protected]>
elezar
force-pushed
the
skip-graphics-for-csv
branch
from
fea991f to
991b9c2
Compare
|
Thanks for the rework. It reads much better now. |
klueska
approved these changes
Jan 22, 2025
Merged
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.
In CSV mode the CSV files at /etc/nvidia-container-runtime/host-files-for-container.d/ should be the source of truth for container modifications. This change skips graphics modifications to a container. This prevents conflicts when handling files such as vulkan icd files which are already defined in the CSV file.
Applying both modifications leads to errors such as: