UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-26 22:09:35 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
459 Commits 21 Branches 73 Tags 29 MiB
e93bafa6d4
Commit Graph

459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Lezar
43ee7f1cd2 Merge branch 'cleanup-default-executable-dir' into 'master' 
Clean up NVIDIA Container Runtime Hook executable specification

See merge request nvidia/container-toolkit/container-toolkit!126
 2022-04-08 10:29:25 +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
dab6f4b768 Specify --force flag when invoking nvidia-container-runtime-hook 
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
2563c1b87c Export GetDefaultRuntimeConfig 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 12:03:22 +02:00
Evan Lezar
62f608a3fe Make order of discoverers deterministic 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 11:59:26 +02:00
Evan Lezar
2c1e356370 Refactor CSV discovery to make char device discovery clearer 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 11:47:47 +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
0de7491ce3 Merge branch 'check-for-nil-modifier' into 'master' 
Return unmodified runtime if specModifier is nil

See merge request nvidia/container-toolkit/container-toolkit!127
 2022-04-08 09:05:24 +00:00
Evan Lezar
1296a0ecf4 Merge branch 'fix-missing-close-on-csv' into 'master' 
Add missing close when reading CSV file

See merge request nvidia/container-toolkit/container-toolkit!128
 2022-04-08 08:33:23 +00:00
Evan Lezar
d1a38f10a5 Refactor CSV file parsing 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 08:11:10 +02:00
Evan Lezar
d8109dc49b Add missing close when reading CSV file 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-08 08:00:37 +02: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
7c10762768 Include nvidia-ctk in deb and rpm packages 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 20:25:19 +02:00
Evan Lezar
9c3c8e038a Add cache for mounts 
This change adds a cache to the mounts type. This means that if called to get
a list of folders, for example, the result is reused instead of recalculated.
This also avoids duplicate logging.

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
740bd3fb9d Add nvidia-ctk config section 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 20:25:18 +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
7914957105 Refactor hook creation 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 16:32:24 +02:00
Evan Lezar
99baea9d51 Merge branch 'add-auto-discover-mode' into 'master' 
Add auto discover mode and use this as the default

See merge request nvidia/container-toolkit/container-toolkit!124
 2022-04-07 14:29:44 +00:00
Evan Lezar
516a658902 Merge branch 'add-jetson-csv-discovery' into 'master' 
Add support for CSV mount specifications

See merge request nvidia/container-toolkit/container-toolkit!117
 2022-04-07 14:25:51 +00: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
b7d130e151 FIX: Improve locator map construction 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 11:12:41 +02:00
Evan Lezar
8574879560 FIX: Update TODO for container path 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 11:07:57 +02:00
Evan Lezar
5a416bc99c FIX: Use MountSpec* constants 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 11:01:57 +02:00
Evan Lezar
df7c064257 FIX: Remove unused NewFromCSV constructor 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 10:59:03 +02:00
Evan Lezar
2f2846116e Correct typo in constructor name 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 10:46:26 +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
14f9e986c9 Add CSV-based discovery of device nodes 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 10:44:14 +02:00
Evan Lezar
af0ef6fb66 Add CSV-based discovery of mounts 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 10:44:14 +02:00
Evan Lezar
7c5504a1cf Add locators for symlinks and character devices 
This change adds a symlink locator that follows symlinks and returns all
elements in the chain and a device locator that finds character devices.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 10:44:14 +02:00
Evan Lezar
8e85e96f38 Add code to process Jetpack CSV files 
This change adds code to process Jetpack CSV mount specifications.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-07 10:44:14 +02:00
Evan Lezar
1561a67d55 Merge branch 'add-v2-runtime-stub' into 'master' 
Add experimental mode to nvidia-container-runtime

See merge request nvidia/container-toolkit/container-toolkit!114
 2022-04-06 17:41:54 +00: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
96e8eb3dde FIX: Rename path locator as executable locator 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-06 15:24:48 +02:00
Evan Lezar
0054481e15 FIX: Rename CLIConfig to ContainerCLIConfig 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
 2022-04-06 15:21: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