UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-06-26 18:18:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIX: Simplify hook remover

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2022-04-06 17:15:57 +02:00
parent 96e8eb3dde
commit b8dd473343
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,24 +46,10 @@ func (m nvidiaContainerRuntimeHookRemover) Modify(spec *specs.Spec) error {
return nil return nil
} }
var updateRequired bool
newPrestart := make([]specs.Hook, 0, len(spec.Hooks.Prestart))
for _, hook := range spec.Hooks.Prestart { for _, hook := range spec.Hooks.Prestart {
if isNVIDIAContainerRuntimeHook(&hook) { if isNVIDIAContainerRuntimeHook(&hook) {
m.logger.Warnf("Found existing NVIDIA Container Runtime Hook: %v", hook) return fmt.Errorf("spec already contains required 'prestart' hook")
updateRequired = true
continue
} }
newPrestart = append(newPrestart, hook)
}
if updateRequired {
// TODO: Once we have updated the hook implementation to give an error if invoked incorrectly, we will update the spec hooks here instead of just logging.
// We can then also use a boolean to track whether this is required instead of storing the removed hooks
// spec.Hooks.Prestart = newPrestart
m.logger.Debugf("Updating 'prestart' hooks to %v", newPrestart)
return fmt.Errorf("spec already contains required 'prestart' hook")
} }
return nil return nil