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

223 Commits

Author SHA1 Message Date
Evan Lezar
b7e5cef934 Include xorg discoverer with graphics mounts 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-10 17:07:55 +02:00
Evan Lezar
9378d0cd0f Move discover.FindNvidiaCTK to config.ResolveNVIDIACTKPath 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-10 15:12:44 +02:00
Evan Lezar
8bb0235c92 Remove discover.Config 
These changes remove the use of discover.Config which was used
to pass the driver root and the nvidiaCTK path in some cases.

Instead, the nvidiaCTKPath is resolved at the begining of runtime
invocation to ensure that this is valid at all points where it is
used.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-10 15:03:37 +02:00
Evan Lezar
37c66fc33c Ensure that the nvidia-container-cli.user option is uncommented on suse 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-08 11:26:54 +02:00
Evan Lezar
1bd5798a99 Use toml representation to get defaults 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-08 11:26:53 +02:00
Evan Lezar
90c4c4811a Fallback to ldconfig if ldconfig.real does not exist 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-08 11:26:24 +02:00
Evan Lezar
49de170652 Generate default config.toml contents 
This change adds a GetDefaultConfigToml function to the config package.

This function returns the default config in the form of raw TOML
including comments. This is useful for generating a default config at
installation time, with platform-specific differences codified.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-08 11:26:22 +02:00
Evan Lezar
2e3a12438a Fix toml definition in cli config struct 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-05-03 15:59:02 +02:00
Evan Lezar
ae2a683929 Run go fmt 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-25 11:27:58 +02:00
Evan Lezar
2b5eeb8d24 Regenerate mocks for formatting 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-25 11:26:55 +02:00
Carlos Eduardo Arango Gutierrez
81d8b94cdc
Export pkg config/engine 
Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
 2023-04-25 07:16:59 +02:00
Evan Lezar
f1e201d368 Refactor runtime configure cli 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-24 18:32:04 +02:00
Evan Lezar
fc7c8f7520 Resolve all symlinks in ldcache 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-21 17:28:49 +02:00
Evan Lezar
46c1c45d85 Add /usr/lib/current to search path 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-21 11:47:42 +02:00
Evan Lezar
2136266d1d Make discovery of Xorg libraries optional 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-04-13 18:41:38 +02:00
Christopher Desiniotis
ee5be5e3f2 Merge branch 'CNT-4056/add-cdi-annotations' into 'main' 
Add nvidia-container-runtime.modes.cdi.annotation-prefixes config option.

See merge request nvidia/container-toolkit/container-toolkit!356
 2023-03-28 16:47:51 +00:00
Evan Lezar
149236b002 Configure containerd config based on specified annotation prefixes 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-28 16:22:48 +02:00
Evan Lezar
e774c51c97 Add nvidia-ctk system create-device-nodes command 
This change adds an nvidia-ctk system create-device-nodes command for
creating NVIDIA device nodes. Currently this is limited to control devices
(nvidia-uvm, nvidia-uvm-tools, nvidia-modeset, nvidiactl).

A --dry-run mode is included for outputing commands that would be executed and
the driver root can be specified.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-28 11:29:45 +02:00
Evan Lezar
c46b118f37 Add nvidia-container-runtime.modes.cdi.annotation-prefixes config option. 
This change adds an nvidia-container-runtime.modes.cdi.annotation-prefixes config
option that defaults to cdi.k8s.io/. This allows the annotation prefixes parsed
for CDI devices to be overridden in cases where CDI support in container engines such
as containerd or crio need to be overridden.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-27 16:36:54 +02:00
Evan Lezar
c13c6ebadb Inject xorg libs and config in container 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-26 17:04:06 +02:00
Evan Lezar
2abe679dd1 Move libcuda locator to internal/lookup package 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-26 17:04:06 +02:00
Christopher Desiniotis
b2aaa21b0a Instantiate a logger when constructing a library Locator 
Signed-off-by: Christopher Desiniotis <cdesiniotis@nvidia.com>
 2023-03-21 13:38:36 -07:00
Evan Lezar
df40fbe03e Locate persistenced and fabricmanager sockets at /run instead of /var/run 
This chagne prefers (non-symlink) sockets at /run over /var/run for
nvidia-persistenced and nvidia-fabricmanager sockets.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-17 09:23:48 +02:00
Christopher Desiniotis
48414e97bb Return empty list of devices for unprivileged containers when 'accept-nvidia-visible-devices-envvar-unprivileged=false' 
Signed-off-by: Christopher Desiniotis <cdesiniotis@nvidia.com>
 2023-03-10 13:11:29 -08:00
Evan Lezar
3a11f6ee0a Add nvidia-container-runtime-hook.skip-mode-detection option to config 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-09 20:15:40 +02:00
Evan Lezar
973e7bda5e Check accept-nvidia-visible-devices-envvar-when-unprivileged option for CDI 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-09 11:15:53 +02:00
Evan Lezar
154cd4ecf3 Add to config struct 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-09 11:15:53 +02:00
Evan Lezar
936fad1d04 Move check for privileged images to config/image/ package 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-09 11:15:53 +02:00
Evan Lezar
510fb248fe Add cdi.k8s.io annotations to containerd config 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-08 07:23:27 +02:00
Evan Lezar
1c696b1e39 Merge branch 'CNT-3894/configure-mode-specific-runtimes' into 'main' 
Configure .cdi and .legacy executables in Toolkit Container

See merge request nvidia/container-toolkit/container-toolkit!308
 2023-03-08 05:12:50 +00:00
Evan Lezar
dca8e3123f Migrate containerd config to engine.Interface 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 20:59:55 +02:00
Evan Lezar
3bac4fad09 Migrate cri-o config update to engine.Interface 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 20:59:54 +02:00
Evan Lezar
9fff19da23 Migrate docker config to engine.Interface 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 20:59:54 +02:00
Evan Lezar
e5bb4d2718 Move runtime config code from config to config/engine 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 20:59:54 +02:00
Evan Lezar
5bfb51f801 Add API for interacting with runtime engine configs 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 20:59:53 +02:00
Evan Lezar
6d220ed9a2 Rework selection of devices in CDI mode 
The following changes are made:
* The default-cdi-kind config option is used to convert an envvar entry to a fully-qualified device name
* If annotation devices exist, these are used instead of the envvar devices.
* The `all` device is no longer treated as a special case and MUST exist in the CDI spec.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 16:18:53 +02:00
Evan Lezar
f00439c93e Add nvidia-container-runtime.modes.csv.default-kind config option 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-03-07 16:18:53 +02:00
Evan Lezar
35fc57291f Deduplicate WSL driverstore paths 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-21 11:48:56 +02:00
Evan Lezar
7eb435eb73 Add basic dxcore bindings 
This change copies dxcore.h and dxcore.c from libnvidia-container to
allow for the driver store path to be queried. Modifications are made
to dxcore to remove the code associated with checking the components
in the driver store path.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-20 10:30:13 +02:00
Evan Lezar
5d011c1333 Add Discoverer to create a single symlink 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-20 10:30:13 +02:00
Evan Lezar
7789ac6331 Fix logger.Update and Reset 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-16 15:22:56 +01:00
Evan Lezar
7a3aabbbda Add logger test 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-16 15:22:56 +01:00
Evan Lezar
bf6babe07e Fix issue with blank nvidia-ctk path 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-16 14:18:07 +01:00
Evan Lezar
456d2864a6 Log config in JSON if possible 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-13 16:09:46 +01:00
Evan Lezar
406a5ec76f Implement runtime package for creating runtime CLI 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-13 16:09:46 +01:00
Evan Lezar
f71c419cfb Move modifying OCI runtime wrapper to oci package 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-13 16:09:46 +01:00
Evan Lezar
076eed7eb4 Update ipcMount to add noexec option 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-08 09:06:07 +01:00
Evan Lezar
33c7b056ea Add ipcMounts type 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-08 09:06:07 +01:00
Evan Lezar
3b8c40c3e6 Move IPC discoverer to internal/discover package 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-08 09:06:07 +01:00
Evan Lezar
3f70521a63 Add Options to discover.Mount 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-08 09:06:07 +01:00