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,098 Commits 20 Branches 73 Tags 28 MiB
92d82ceaee
Commit Graph

204 Commits

Author SHA1 Message Date
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
Evan Lezar
daceac9117 Rename discover.Config.Root to discover.Config.DriverRoot 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-02 15:57:15 +01:00
Evan Lezar
0c8379f681 Fix nvidia-ctk path for update ldcache hook 
This change ensures that the update-ldcache hook is created in a manner
consistent with other nvidia-ctk hooks ensuring that a full path is
used.

Without this change the update-ldcache hook on Tegra-based sytems had an
invalid path.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-01 12:00:23 +01:00
Evan Lezar
92dc0506fe Add hook path to logger output 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-01 12:00:23 +01:00
Evan Lezar
7045a223d2 Only use configured nvidia-ctk path if it is a full path 
If this is not done, the default config which sets the nvidia-ctk.path
option as "nvidia-ctk" will result in an invalid OCI spec if a hook is
injected. This change ensures that the path used is always an absolute
path as required by the hook spec.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-02-01 12:00:23 +01:00
Evan Lezar
14bcebd8b7 Fix relative link resolution for ldcache 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-31 13:51:48 +01:00
Evan Lezar
95394e0fc8 Add internal/info/proc/devices package to read device majors 
This change adds basic functionality to process the /proc/devices
file to extract device majors.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-25 13:43:43 +01:00
Evan Lezar
408eeae70f Allow locator to be marked as optional 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-25 10:38:11 +01:00
Evan Lezar
6237477ba3 Limit number of candidates for executables 
This change ensures that the first match of an executable in the path
is retured instead of a list of candidates. This prevents a CDI spec,
for example, from containing multiple entries for a single executable
(e.g. nvidia-smi).

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-20 15:10:24 +01:00
Evan Lezar
881b1c0e08 introduce resolveSelected helper 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 14:10:55 +01:00
Evan Lezar
3537d76726 Further refactoring of ldcache code 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 14:10:36 +01:00
Evan Lezar
ccd1961c60 Ensure root is included in absolute ldcache paths 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 14:09:43 +01:00
Evan Lezar
f350f0c0bb Refactor resolving of links in ldcache 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 14:09:41 +01:00
Evan Lezar
80672d33af Continue instead of break on error when listing libraries 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2023-01-19 13:54:24 +01: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
Evan Lezar
3140810c95 Add NewContainerEdits utility function 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-12-07 11:03:45 +01:00