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
482 Commits 20 Branches 73 Tags 28 MiB
3a1404f2f4
Commit Graph

70 Commits

Author SHA1 Message Date
Evan Lezar
3a1404f2f4 Move isTegraSystem to internal info package 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-12 10:28:56 +02:00
Evan Lezar
ae57a2fc93 Merge branch 'CNT-2875/create-specific-symlinks' into 'main' 
Create specific symlinks for CSV mode

See merge request nvidia/container-toolkit/container-toolkit!150
 2022-05-12 05:27:43 +00:00
Evan Lezar
1eb0e3c8b3 Merge branch 'fix-executable-locator' into 'main' 
Fix location of executables in PATH

See merge request nvidia/container-toolkit/container-toolkit!148
 2022-05-12 05:26:22 +00:00
Evan Lezar
a524c44161 Merge branch 'CNT-2926/runc-logging' into 'main' 
Support runc logging command line options

See merge request nvidia/container-toolkit/container-toolkit!144
 2022-05-12 05:24:25 +00:00
Evan Lezar
675fbace01 Add hook to create specific links 
This change updates the create-symlinks hook to also create symlinks for
libcuda.so, libGLX_indirect.so.0, and libnvidia-opticalflow.so

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-11 16:36:49 +02:00
Evan Lezar
eac326c5ea Add --link option to nvidia-ctk hook create-symlinks command 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-11 15:28:53 +02:00
Evan Lezar
b0f7a3809f Factor linkCreation into method 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-11 15:28:02 +02:00
Evan Lezar
126c004ee0 Improve symlink creation loop 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-11 15:17:15 +02:00
Evan Lezar
d2516cb5d5 Merge branch 'fix-container-root' into 'main' 
Fix bug in update-ldcache hook when OCI spec contains a relative root

See merge request nvidia/container-toolkit/container-toolkit!147
 2022-05-10 22:01:14 +00:00
Evan Lezar
4696d7ee69 Merge branch 'fix-hook-flags' into 'main' 
Use singular instead of plural for hook arguments

See merge request nvidia/container-toolkit/container-toolkit!146
 2022-05-10 22:00:51 +00:00
Evan Lezar
ef6f48e9f7 Use singular instead of plural for hook arguments 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-10 19:55:31 +02:00
Evan Lezar
b8ef6be6ea Use lookup.GetPath from runtime hook 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-10 14:53:26 +02:00
Evan Lezar
55efdc8765 Use state.GetContainerRoot in nvidia-ctk hook subcommands 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-10 11:48:43 +02:00
Evan Lezar
e9d929dc2f Support runc logging command line options 
This change processes and supports runc logging command line arguments.
This allows for better integration into container engines such as
docker.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-09 19:32:38 +02:00
Evan Lezar
c76946cbcc Add nvidia-container-runtime.runtimes config option 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-09 09:38:12 +02:00
Evan Lezar
70c4588197 Add compute capability of first device as arch property 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-05 14:11:30 +02:00
Evan Lezar
75ce057878 Add debug log for command line arguments 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-05 13:47:39 +02:00
Evan Lezar
9d2363e12e Return low-level runtime if subcommand is not create 
This also removes a test that invokes nvidia-container-runtime run --bundle
expecting an error. This test is no longer valid since this command line
is forwared to runc where the error should be detected.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-05 13:43:13 +02:00
Evan Lezar
49f4bb3198 Check requirements before creating CSV discoverer 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-05 13:43:13 +02:00
Evan Lezar
5d7b3a4a96 Return raw spec from Spec.Load 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-05 13:43:13 +02:00
Evan Lezar
50cf07e4cd Use CUDA image abstraction for runtime hook 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-05-05 13:43:13 +02:00
Evan Lezar
bdf997c761 Use semver package to parse CUDA version 
This avoids the use of scanf on a user-provided string which is flagged
as a security vulnerability.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-22 14:57:52 +02:00
Evan Lezar
c224832a6d Add log-level config option for nvidia-container-runtime 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 13:56:17 +02:00
Evan Lezar
5211960fc3 Merge branch 'detect-gpus-flag' into 'master' 
Detect use of --gpus flag in experimental mode

See merge request nvidia/container-toolkit/container-toolkit!125
 2022-04-08 11:18:11 +00:00
Evan Lezar
45160b88a4 Remove exsiting NVIDIA Container Runtime Hooks from the spec 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 12:03:22 +02:00
Evan Lezar
a9a4704273 Raise error if hook invoked in experimental mode without force flag 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 12:03:22 +02:00
Evan Lezar
7ec3cd0b5b Fix creation of CSV parser in create-symlinks 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 11:39:18 +02:00
Evan Lezar
ab7f25500f Fix creation of CSV parser in create-symlinks 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 11:36:48 +02:00
Evan Lezar
196d5c5461 Move NVIDIA Container Runtime Hook executable name to shared constant 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 11:29:27 +02:00
Evan Lezar
f07d110e85 Use DefaultExecutableDir to determine default paths 
This change adds a DefaultExecutableDir = /usr/bin constant that is used
to construct default paths for executables instead of specifying these
explicitly.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 11:28:03 +02:00
Evan Lezar
1ebd48dea6 Merge branch 'add-symlink-hook' into 'master' 
Add hook create-symlinks subcommand to create symlinks in container

See merge request nvidia/container-toolkit/container-toolkit!121
 2022-04-08 09:14:07 +00:00
Evan Lezar
f7c74d35cc Merge branch 'add-hooks-cli' into 'master' 
Add nvidia-ctk CLI with hook command and update-ldcache subcommand to update LD cache

See merge request nvidia/container-toolkit/container-toolkit!115
 2022-04-08 09:13:39 +00:00
Evan Lezar
67602b28f9 Return unmodified runtime if specModifier is nil 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 07:50:40 +02:00
Evan Lezar
907736b053 Inject symlinks hook for creating symlinks in a container 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 20:25:55 +02:00
Evan Lezar
ecb4ef495a Add create-symlinks subcommand to create symlinks in container for specified CSV files 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 20:25:55 +02:00
Evan Lezar
95797a8252 Move reading of container state for internal/oci package 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 20:25:55 +02:00
Evan Lezar
c87ae586d4 FIX: Rename containerSpec flag to container-spec 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 20:25:19 +02:00
Evan Lezar
d970d0a627 Add discovery for ldconfig hook that updates the LDCache 
This change adds a discovered hook for updating the ldcache as a container-create
hook. The mounts from a discoverer are inspected to determine the folders that must
be added to the cache using the nvidia-ctk hook update-ldcache command.

This is added to the "csv" discovery mode for the experimental runtime.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 20:25:19 +02:00
Evan Lezar
1c892af215 Add hook command to nvidia-ctk with update-ldcache subcommand 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 16:38:01 +02:00
Evan Lezar
c945cc714d Add stub nvidia-ctk CLI 
This change adds an nvidia-ctk CLI that is used as the basis for
utilities related to the NVIDIA Container Toolkit.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 16:32:25 +02:00
Evan Lezar
bb086d4b44 Add auto discover mode and use this as the default 
This change adds an 'auto' discover mode that attempts to select the correct mode
for a given platform. This currently attempts to detect whether the platform is a
Tegra-based system in which case the 'csv' discover mode is used. The 'legacy'
discover mode is used as the fallback.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 15:37:03 +02:00
Evan Lezar
26d2873bb2 FIX: Rename DefaultRoot to DefaultMountSpecPath 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 14:11:52 +02:00
Evan Lezar
6682bc90b4 Add support for NVIDIA_REQUIRE_JETPACK envvar 
This change ensures that by default, the CSV discovery only considers the base CSV
files (l4t.csv, drivers.csv, devices.csv) and skips the rest unless the
NVIDIA_REQUIRE_JETPACK is set to "csv-mounts=all", in which case, all CSV files in the
specified folder are considered.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 10:46:26 +02:00
Evan Lezar
1c05a463bd Add csv discovery mode to experimental runtime 
This change adds support for a "csv" discovery mode to the experimental runtime.
If this is set with experimental = true, a CSV-based discovery of devices and
mounts are used to define the modifications required to the OCI spec. The edits
are expressed as CDI ContainerEdits.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 10:45:19 +02:00
Evan Lezar
9ce690093d FIX: Make isNVIDIAContainerRuntimeHook mode idiomatic 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-06 17:18:06 +02:00
Evan Lezar
b8dd473343 FIX: Simplify hook remover 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-06 17:15:57 +02:00
Evan Lezar
11aa1d2a7d FIX: Factor out specModifier construction into function 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-06 15:18:12 +02:00
Evan Lezar
e6730fd0f0 FIX: Don't log that hooks is being removed if it is not 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-06 15:13:32 +02:00
Evan Lezar
8db287af8b FIX: Fix typo in comment 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-06 14:46:27 +02:00
Evan Lezar
282a2c145e Fix typo in variable name 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-04 14:16:26 +02:00