UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-04-03 04:10:47 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Move NVIDIA Container Runtime Hook executable name to shared constant

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2022-04-08 07:24:39 +02:00
parent f07d110e85
commit 196d5c5461
4 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/nvidia-container-runtime/modifier/hook_remover.go
View File

@ -20,6 +20,7 @@ import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config"
"github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -60,8 +61,8 @@ func (m nvidiaContainerRuntimeHookRemover) Modify(spec *specs.Spec) error {
// nvidia-container-runtime or docker when specifying the --gpus flag. // nvidia-container-runtime or docker when specifying the --gpus flag.
func isNVIDIAContainerRuntimeHook(hook *specs.Hook) bool { func isNVIDIAContainerRuntimeHook(hook *specs.Hook) bool {
bins := map[string]struct{}{ bins := map[string]struct{}{
nvidiaContainerRuntimeHookExecutable: {}, config.NVIDIAContainerRuntimeHookExecutable: {},
nvidiaContainerToolkitExecutable: {}, config.NVIDIAContainerToolkitExecutable: {},
} }
_, exists := bins[filepath.Base(hook.Path)] _, exists := bins[filepath.Base(hook.Path)]

11
cmd/nvidia-container-runtime/modifier/stable.go
View File

@ -28,11 +28,6 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
const (
nvidiaContainerRuntimeHookExecutable = "nvidia-container-runtime-hook"
nvidiaContainerToolkitExecutable = "nvidia-container-toolkit"
)
// NewStableRuntimeModifier creates an OCI spec modifier that inserts the NVIDIA Container Runtime Hook into an OCI // NewStableRuntimeModifier creates an OCI spec modifier that inserts the NVIDIA Container Runtime Hook into an OCI
// spec. The specified logger is used to capture log output. // spec. The specified logger is used to capture log output.
func NewStableRuntimeModifier(logger *logrus.Logger) oci.SpecModifier { func NewStableRuntimeModifier(logger *logrus.Logger) oci.SpecModifier {
@ -50,9 +45,9 @@ type stableRuntimeModifier struct {
// Modify applies the required modification to the incoming OCI spec, inserting the nvidia-container-runtime-hook // Modify applies the required modification to the incoming OCI spec, inserting the nvidia-container-runtime-hook
// as a prestart hook. // as a prestart hook.
func (m stableRuntimeModifier) Modify(spec *specs.Spec) error { func (m stableRuntimeModifier) Modify(spec *specs.Spec) error {
path, err := exec.LookPath(nvidiaContainerRuntimeHookExecutable) path, err := exec.LookPath(config.NVIDIAContainerRuntimeHookExecutable)
if err != nil { if err != nil {
path = filepath.Join(config.DefaultExecutableDir, nvidiaContainerRuntimeHookExecutable) path = filepath.Join(config.DefaultExecutableDir, config.NVIDIAContainerRuntimeHookExecutable)
_, err = os.Stat(path) _, err = os.Stat(path)
if err != nil { if err != nil {
return err return err
@ -66,7 +61,7 @@ func (m stableRuntimeModifier) Modify(spec *specs.Spec) error {
spec.Hooks = &specs.Hooks{} spec.Hooks = &specs.Hooks{}
} else if len(spec.Hooks.Prestart) != 0 { } else if len(spec.Hooks.Prestart) != 0 {
for _, hook := range spec.Hooks.Prestart { for _, hook := range spec.Hooks.Prestart {
if strings.Contains(hook.Path, nvidiaContainerRuntimeHookExecutable) { if strings.Contains(hook.Path, config.NVIDIAContainerRuntimeHookExecutable) {
m.logger.Infof("existing nvidia prestart hook found in OCI spec") m.logger.Infof("existing nvidia prestart hook found in OCI spec")
return nil return nil
} }

5
internal/config/config.go
View File

@ -34,6 +34,11 @@ var (
// DefaultExecutableDir specifies the default path to use for executables if they cannot be located in the path. // DefaultExecutableDir specifies the default path to use for executables if they cannot be located in the path.
DefaultExecutableDir = "/usr/bin" DefaultExecutableDir = "/usr/bin"
// NVIDIAContainerRuntimeHookExecutable is the executable name for the NVIDIA Container Runtime Hook
NVIDIAContainerRuntimeHookExecutable = "nvidia-container-runtime-hook"
// NVIDIAContainerToolkitExecutable is the executable name for the NVIDIA Container Toolkit (an alias for the NVIDIA Container Runtime Hook)
NVIDIAContainerToolkitExecutable = "nvidia-container-toolkit"
configDir = "/etc/" configDir = "/etc/"
) )

19
internal/discover/legacy.go
View File

@ -43,21 +43,18 @@ type legacy struct {
var _ Discover = (*legacy)(nil) var _ Discover = (*legacy)(nil)
const ( // Hooks returns the "legacy" NVIDIA Container Runtime hook. This hook calls out
nvidiaContainerRuntimeHookExecutable = "nvidia-container-runtime-hook" // to the nvidia-container-cli to make modifications to the container as defined
) // in libnvidia-container.
// Hooks returns the "legacy" NVIDIA Container Runtime hook. This mirrors the behaviour of the stable
// modifier.
func (d legacy) Hooks() ([]Hook, error) { func (d legacy) Hooks() ([]Hook, error) {
hookPath := filepath.Join(config.DefaultExecutableDir, nvidiaContainerRuntimeHookExecutable) hookPath := filepath.Join(config.DefaultExecutableDir, config.NVIDIAContainerRuntimeHookExecutable)
targets, err := d.lookup.Locate(nvidiaContainerRuntimeHookExecutable) targets, err := d.lookup.Locate(config.NVIDIAContainerRuntimeHookExecutable)
if err != nil { if err != nil {
d.logger.Warnf("Failed to locate %v: %v", nvidiaContainerRuntimeHookExecutable, err) d.logger.Warnf("Failed to locate %v: %v", config.NVIDIAContainerRuntimeHookExecutable, err)
} else if len(targets) == 0 { } else if len(targets) == 0 {
d.logger.Warnf("%v not found", nvidiaContainerRuntimeHookExecutable) d.logger.Warnf("%v not found", config.NVIDIAContainerRuntimeHookExecutable)
} else { } else {
d.logger.Debugf("Found %v candidates: %v", nvidiaContainerRuntimeHookExecutable, targets) d.logger.Debugf("Found %v candidates: %v", config.NVIDIAContainerRuntimeHookExecutable, targets)
hookPath = targets[0] hookPath = targets[0]
} }
d.logger.Debugf("Using NVIDIA Container Runtime Hook path %v", hookPath) d.logger.Debugf("Using NVIDIA Container Runtime Hook path %v", hookPath)