UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-03-17 02:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove exsiting NVIDIA Container Runtime Hooks from the spec

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2022-04-06 16:18:56 +02:00
parent dab6f4b768
commit 45160b88a4
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/nvidia-container-runtime/modifier/experimental_test.go
View File

@ -231,7 +231,7 @@ func TestExperimentalModifier(t *testing.T) {
}, },
}, },
{ {
description: "modification fails for existing nvidia-container-runtime-hook", description: "modification removes existing nvidia-container-runtime-hook",
spec: &specs.Spec{ spec: &specs.Spec{
Hooks: &specs.Hooks{ Hooks: &specs.Hooks{
Prestart: []specs.Hook{ Prestart: []specs.Hook{
@ -254,20 +254,19 @@ func TestExperimentalModifier(t *testing.T) {
return hooks, nil return hooks, nil
}, },
}, },
expectedError: fmt.Errorf("nvidia-container-runtime-hook already exists"),
expectedSpec: &specs.Spec{ expectedSpec: &specs.Spec{
Hooks: &specs.Hooks{ Hooks: &specs.Hooks{
Prestart: []specs.Hook{ Prestart: []specs.Hook{
{ {
Path: "/path/to/nvidia-container-runtime-hook", Path: "/hook/b",
Args: []string{"/path/to/nvidia-container-runtime-hook", "prestart"}, Args: []string{"/hook/b", "argb"},
}, },
}, },
}, },
}, },
}, },
{ {
description: "modification fails for existing nvidia-container-toolkit", description: "modification removes existing nvidia-container-toolkit",
spec: &specs.Spec{ spec: &specs.Spec{
Hooks: &specs.Hooks{ Hooks: &specs.Hooks{
Prestart: []specs.Hook{ Prestart: []specs.Hook{
@ -290,13 +289,12 @@ func TestExperimentalModifier(t *testing.T) {
return hooks, nil return hooks, nil
}, },
}, },
expectedError: fmt.Errorf("nvidia-container-toolkit already exists"),
expectedSpec: &specs.Spec{ expectedSpec: &specs.Spec{
Hooks: &specs.Hooks{ Hooks: &specs.Hooks{
Prestart: []specs.Hook{ Prestart: []specs.Hook{
{ {
Path: "/path/to/nvidia-container-toolkit", Path: "/hook/b",
Args: []string{"/path/to/nvidia-container-toolkit", "prestart"}, Args: []string{"/hook/b", "argb"},
}, },
}, },
}, },

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

@ -17,7 +17,6 @@
package modifier package modifier
import ( import (
"fmt"
"path/filepath" "path/filepath"
"github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
@ -46,10 +45,19 @@ func (m nvidiaContainerRuntimeHookRemover) Modify(spec *specs.Spec) error {
return nil return nil
} }
var newPrestart []specs.Hook
for _, hook := range spec.Hooks.Prestart { for _, hook := range spec.Hooks.Prestart {
if isNVIDIAContainerRuntimeHook(&hook) { if isNVIDIAContainerRuntimeHook(&hook) {
return fmt.Errorf("spec already contains required 'prestart' hook") m.logger.Debugf("Removing hook %v", hook)
continue
} }
newPrestart = append(newPrestart, hook)
}
if len(newPrestart) != len(spec.Hooks.Prestart) {
m.logger.Debugf("Updating 'prestart' hooks to %v", newPrestart)
spec.Hooks.Prestart = newPrestart
} }
return nil return nil