address review comment

Signed-off-by: Tariq Ibrahim <[email protected]>

Author: tariq1890

tools/container/nvidia-toolkit/run.go

@@ -28,6 +28,7 @@ const (
 )
 
 var availableRuntimes = map[string]struct{}{"docker": {}, "crio": {}, "containerd": {}}
+var defaultLowLevelRuntimes = []string{"docker-runc", "runc", "crun"}
 
 var waitingForSignal = make(chan bool, 1)
 var signalReceived = make(chan bool, 1)
@@ -161,6 +162,7 @@ func Run(c *cli.Context, o *options) error {
 		if err != nil {
 			return fmt.Errorf("unable to determine runtime options: %w", err)
 		}
+		lowlevelRuntimePaths = append(lowlevelRuntimePaths, defaultLowLevelRuntimes...)
 
 		o.toolkitOptions.ContainerRuntimeRuntimes = *cli.NewStringSlice(lowlevelRuntimePaths...)
 	}

tools/container/toolkit/toolkit.go

@@ -452,7 +452,7 @@ func installToolkitConfig(c *cli.Context, toolkitConfigPath string, nvidiaContai
 		"nvidia-container-runtime-hook.skip-mode-detection": opts.ContainerRuntimeHookSkipModeDetection,
 	}
 
-	toolkitRuntimeList := getNvidiaContainerRuntimeList(cfg, opts.ContainerRuntimeRuntimes.Value())
+	toolkitRuntimeList := opts.ContainerRuntimeRuntimes.Value()
 	if len(toolkitRuntimeList) > 0 {
 		configValues["nvidia-container-runtime.runtimes"] = toolkitRuntimeList
 	}
@@ -790,19 +790,3 @@ func generateCDISpec(opts *Options, nvidiaCDIHookPath string) error {
 
 	return nil
 }
-
-// getNvidiaContainerRuntimeList returns a consolidated list of low-level runtimes to be used by the toolkit
-func getNvidiaContainerRuntimeList(cfgToml *config.Toml, containerRuntimeBinaries []string) []string {
-	var ctkRuntimes []string
-	nvidiaCTKConfig, err := cfgToml.Config()
-	if err == nil {
-		if len(containerRuntimeBinaries) > 0 {
-			ctkRuntimes = append(ctkRuntimes, containerRuntimeBinaries...)
-		}
-		defaultCfgRuntimes := nvidiaCTKConfig.NVIDIAContainerRuntimeConfig.Runtimes
-		ctkRuntimes = append(ctkRuntimes, defaultCfgRuntimes...)
-	} else {
-		log.Warningf("could not get nvidia container toolkit config: %v", err)
-	}
-	return ctkRuntimes
-}