UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 08:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
883 Commits 20 Branches 73 Tags 28 MiB
763e4936cd
Commit Graph

883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Lezar
ae3b213b0e Merge branch 'fix-cdi-library-container-path' into 'main' 
Reuse mount discovery for driver libraries

See merge request nvidia/container-toolkit/container-toolkit!262
 2023-01-19 11:52:21 +00:00
Evan Lezar
eaf9bdaeb4 Determine the minumum required spec version 
This change uses functionality from the CDI package to determine
the minimum required CDI spec version. This allows for a spec with
the widest compatibility to be specified.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 12:14:00 +01:00
Evan Lezar
bc4bfb94a2 Update CDI package 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 12:12:54 +01:00
Evan Lezar
a77331f8f0 Reuse mount discovery for driver libraries 
This change implements the discovery of versioned driver libaries
by reusing the mounts and update ldcache discoverers use for, for example,
CVS file discovery. This allows the container paths to be correctly generated
without requiring specific manipulation.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 12:11:13 +01:00
Evan Lezar
94b7add334 Merge branch 'bugfix-nvidia-ctk' into 'main' 
Fix nvidia-ctk path in spec generation

See merge request nvidia/container-toolkit/container-toolkit!264
 2023-01-19 11:10:38 +00:00
Evan Lezar
9c9e6cd324 Fix nvidia-ctk path in spec generation 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 12:03:07 +01:00
Evan Lezar
f50efca73f Merge branch 'specify-nvidia-ctk-path' into 'main' 
Make handling of nvidia-ctk path consistent

See merge request nvidia/container-toolkit/container-toolkit!261
 2023-01-19 10:20:25 +00:00
Evan Lezar
19cfb2774d Use common code to construct nvidia-ctk hooks 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 10:37:10 +01:00
Evan Lezar
27347c98d9 Consolidate code to find nvidia-ctk 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 10:31:42 +01:00
Evan Lezar
ebbc47702d Remove 'Executable' from private struct member names 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-18 17:02:42 +01:00
Evan Lezar
09d42f0ad9 Remove 'Executable' from config struct member 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-18 17:02:42 +01:00
Evan Lezar
35df24d63a Make handling of nvidia-ctk path consistent 
This change adds an --nvidia-ctk-path to the nvidia-ctk cdi generate
command. This ensures that the executable path for the generated
hooks can be specified consistently.

Since the NVIDIA Container Runtime already allows for the executable
path to be specified in the config the utility code to update the
LDCache and create other nvidia-ctk hooks are also updated.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-18 17:02:42 +01:00
Claudius Volz
f93b6a13f4 Preserve a temporary copy of nvidia-container-runtime-hook during rpm update, 
to avoid being destroyed by when updating from <=1.10.0

Signed-off-by: Claudius Volz <c.volz@gmx.de>
 2023-01-15 01:22:37 +01:00
Evan Lezar
50d7fb8f41 Merge branch 'missing-dra-devices' into 'main' 
Ensure existence of DRM devices nodes is checked

See merge request nvidia/container-toolkit/container-toolkit!260
 2022-12-13 12:42:04 +00:00
Evan Lezar
311e7a1feb Ensure existence of DRM devices nodes is checked 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-12 14:48:54 +01:00
Evan Lezar
14e587d55f Merge branch 'update-libnvidia-container' into 'main' 
Update libnvidia-container to v1.12.0-rc.3

See merge request nvidia/container-toolkit/container-toolkit!259
 2022-12-09 09:38:27 +00:00
Evan Lezar
66ec967de2 Update libnvidia-container to 1.12.0-rc.3 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-09 10:20:36 +01:00
Evan Lezar
252693aeac Use SHA for ineffassign 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-09 09:58:49 +01:00
Evan Lezar
079b47ed94 Use sha instead of latest for golint 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-09 09:51:22 +01:00
Evan Lezar
d2952b07aa Merge branch 'fix-from-discover' into 'main' 
Ensure that an empty discoverer returns valid edits

See merge request nvidia/container-toolkit/container-toolkit!258
 2022-12-09 08:37:26 +00:00
Evan Lezar
41f1b93422 Use NewContainerEdits utility function for CDI generation 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-07 11:09:19 +01:00
Evan Lezar
3140810c95 Add NewContainerEdits utility function 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-07 11:03:45 +01:00
Evan Lezar
046d761f4c Ensure that an empty discoverer returns valid edits 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-06 14:01:35 +01:00
Evan Lezar
0a2083df72 Merge branch 'CNT-3707/add-root-flag' into 'main' 
Add --root flag to nvidia-ctk cdi generate command

See merge request nvidia/container-toolkit/container-toolkit!256
 2022-12-02 15:54:27 +00:00
Evan Lezar
80c810bf9e Add --root flag to CDI generate command 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 16:13:53 +01:00
Evan Lezar
82ba424212 Simplify device folder permission hook 
This simplifies the device folder permission hook to only handle
/dev/dri and /dev/nvidia-caps folders.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 16:13:53 +01:00
Evan Lezar
c131b99cb3 Merge branch 'CNT-3613/add-firmware-cdi' into 'main' 
Include GSP firmware path in CDI specification

See merge request nvidia/container-toolkit/container-toolkit!254
 2022-12-02 14:51:53 +00:00
Evan Lezar
64a85fb832 Include GSP firmware path in CDI specification 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 14:35:22 +01:00
Evan Lezar
ebf1772068 Merge branch 'CNT-3580/inject-egl-wayland' into 'main' 
Add egl_external_platform.d/10_nvidia_wayland.json to graphics mounts

See merge request nvidia/container-toolkit/container-toolkit!252
 2022-12-02 13:05:18 +00:00
Evan Lezar
8604c255c4 Use Options to set FileLocator options 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:57:33 +01:00
Evan Lezar
bea8321205 Use prefix search for locating graphics files 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
db962c4bf2 Use getSearchPrefixes for all locators 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
d1a3de7671 Add test for device locator 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
8da7e74408 Add tests for executable locator 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
55eb898186 Add support for specifying multiple prefixes 
This change allows the file Locator to be instantiated with multiple
search prefixes.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
a7fc29d4bd Add tests for file locator 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
fdb3e51294 Add egl_external_platform.d/10_nvidia_wayland.json to graphics mounts 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 13:55:13 +01:00
Evan Lezar
0582180cab Merge branch 'rework-cdi-generation' into 'main' 
Rework CDI spec generation to use discoverers

See merge request nvidia/container-toolkit/container-toolkit!248
 2022-12-02 11:32:29 +00:00
Evan Lezar
46667b5a8c Remove unused code 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 11:49:37 +01:00
Evan Lezar
e4e1de82ec Refactor nvidia-ctk cdi generate command 
This change refactors the generation of CDI specifications
to use discoverers and generate the CDI specifications from these
discoverers. This allows for better reuse.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 11:49:37 +01:00
Evan Lezar
d51c8fcfa7 Add utility function to generatee nvidia-ctk OCI hook 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 10:01:22 +01:00
Evan Lezar
9b33c34a57 Allow graphics mount discoverer to be instantiated independently 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 10:01:22 +01:00
Evan Lezar
0b6cd7e90e Add FromDiscoverer function to generate container edits 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 10:01:22 +01:00
Evan Lezar
029a04c37d Use blank device hostPath if same as Path 
The HostPath field was added in the v0.5.0 CDI specification.
The cdi package uses strict unmarshalling when loading specs
from file causing failures for unexpected fields.

Since the behaviour for HostPath == "" and HostPath == Path are
equivalent, we clear HostPath if it is equal to Path to ensure
compatibility with the widest range of specs.

This allows, for example, a v0.4.0 spec to be generated as required.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 10:01:22 +01:00
Evan Lezar
60c1df4e9c Remove unneeded workaround for CDI edit generation 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-02 10:01:22 +01:00
Evan Lezar
3e35312537 Merge branch 'fix-json-mode' into 'main' 
Remove unused jsonMode and fix output

See merge request nvidia/container-toolkit/container-toolkit!255
 2022-12-01 16:01:33 +00:00
Evan Lezar
932b39fd08 Remove unused jsonMode and fix output 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-01 16:21:50 +01:00
Evan Lezar
78cafe45d4 Merge branch 'create-cdi-output-folder' into 'main' 
Ensure output folder exists for CDI spec

See merge request nvidia/container-toolkit/container-toolkit!250
 2022-12-01 12:44:49 +00:00
Evan Lezar
584e792a5a Ensure output folder exists for CDI spec 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-11-30 19:40:58 +01:00
Evan Lezar
f0bcfa0415 Merge branch 'add-format-flag' into 'main' 
Switch to string-based flag for CDI output format

See merge request nvidia/container-toolkit/container-toolkit!247
 2022-11-29 16:47:40 +00:00