TOFIX: Fix docker arguments

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

cmd/nvidia-ctk-installer/container/runtime/runtime.go

@@ -54,6 +54,13 @@ func Flags(opts *Options) []cli.Flag {
 			Destination: &opts.Config,
 			Sources:     cli.EnvVars("RUNTIME_CONFIG", "CONTAINERD_CONFIG", "DOCKER_CONFIG"),
 		},
+		&cli.StringFlag{
+			Name:        "drop-in-config",
+			Usage:       "Path to the NVIDIA-specific drop-in config file",
+			Value:       runtimeSpecificDefault,
+			Destination: &opts.DropInConfig,
+			Sources:     cli.EnvVars("RUNTIME_DROP_IN_CONFIG"),
+		},
 		&cli.StringFlag{
 			Name:        "executable-path",
 			Usage:       "The path to the runtime executable. This is used to extract the current config",
@@ -120,12 +127,20 @@ func (opts *Options) Validate(logger logger.Interface, c *cli.Command, runtime s
 		opts.EnableCDI = to.CDI.Enabled
 	}
 
-	if opts.ExecutablePath != "" && opts.RuntimeName == docker.Name {
-		logger.Warningf("Ignoring executable-path=%q flag for %v", opts.ExecutablePath, opts.RuntimeName)
-		opts.ExecutablePath = ""
+	switch runtime {
+	case docker.Name:
+		if opts.ExecutablePath != "" {
+			logger.Warningf("Ignoring executable-path=%q flag for %v", opts.ExecutablePath, opts.RuntimeName)
+			opts.ExecutablePath = ""
+		}
+		if opts.DropInConfig != "" && opts.DropInConfig != runtimeSpecificDefault {
+			logger.Warningf("Ignorining drop-in-config=%q flag for %v", opts.DropInConfig, opts.RuntimeName)
+			opts.DropInConfig = ""
+		}
 	}
 
 	// Apply the runtime-specific config changes.
+	// TODO: Add the runtime-specific DropInConfigs here.
 	switch runtime {
 	case containerd.Name:
 		if opts.Config == runtimeSpecificDefault {
@@ -151,6 +166,10 @@ func (opts *Options) Validate(logger logger.Interface, c *cli.Command, runtime s
 		if opts.Config == runtimeSpecificDefault {
 			opts.Config = docker.DefaultConfig
 		}
+		// Docker does not support drop-in configs.
+		if opts.DropInConfig == runtimeSpecificDefault {
+			opts.DropInConfig = ""
+		}
 		if opts.Socket == runtimeSpecificDefault {
 			opts.Socket = docker.DefaultSocket
 		}

cmd/nvidia-ctk-installer/main_test.go

@@ -40,10 +40,11 @@ func TestApp(t *testing.T) {
 	hostRoot := filepath.Join(moduleRoot, "testdata", "lookup", "rootfs-1")
 
 	testCases := []struct {
-		description           string
-		args                  []string
-		expectedToolkitConfig string
-		expectedRuntimeConfig string
+		description                 string
+		args                        []string
+		expectedToolkitConfig       string
+		expectedRuntimeConfig       string
+		expectedDropInRuntimeConfig string
 	}{
 		{
 			description: "no args",
@@ -285,7 +286,10 @@ swarm-resource = ""
 [nvidia-ctk]
   path = "{{ .toolkitRoot }}/toolkit/nvidia-ctk"
 `,
-			expectedRuntimeConfig: `version = 2
+			expectedRuntimeConfig: `imports = ["{{ .testRoot }}/config.d/*.toml"]
+version = 2
+`,
+			expectedDropInRuntimeConfig: `version = 2
 
 [plugins]
 
@@ -371,7 +375,10 @@ swarm-resource = ""
 [nvidia-ctk]
   path = "{{ .toolkitRoot }}/toolkit/nvidia-ctk"
 `,
-			expectedRuntimeConfig: `version = 2
+			expectedRuntimeConfig: `imports = ["{{ .testRoot }}/config.d/*.toml"]
+version = 2
+`,
+			expectedDropInRuntimeConfig: `version = 2
 
 [plugins]
 
@@ -418,6 +425,7 @@ swarm-resource = ""
 
 			cdiOutputDir := filepath.Join(testRoot, "/var/run/cdi")
 			runtimeConfigFile := filepath.Join(testRoot, "config.file")
+			runtimeDropInConfigFile := filepath.Join(testRoot, "config.d/config.toml")
 
 			toolkitRoot := filepath.Join(testRoot, "toolkit-test")
 			toolkitConfigFile := filepath.Join(toolkitRoot, "toolkit/.config/nvidia-container-runtime/config.toml")
@@ -430,6 +438,7 @@ swarm-resource = ""
 				"--no-daemon",
 				"--cdi-output-dir=" + cdiOutputDir,
 				"--config=" + runtimeConfigFile,
+				"--drop-in-config=" + runtimeDropInConfigFile,
 				"--create-device-nodes=none",
 				"--driver-root-ctr-path=" + hostRoot,
 				"--pid-file=" + filepath.Join(testRoot, "toolkit.pid"),
@@ -446,10 +455,24 @@ swarm-resource = ""
 			require.NoError(t, err)
 			require.EqualValues(t, strings.ReplaceAll(tc.expectedToolkitConfig, "{{ .toolkitRoot }}", toolkitRoot), string(toolkitConfigFileContents))
 
-			require.FileExists(t, runtimeConfigFile)
-			runtimeConfigFileContents, err := os.ReadFile(runtimeConfigFile)
-			require.NoError(t, err)
-			require.EqualValues(t, strings.ReplaceAll(tc.expectedRuntimeConfig, "{{ .toolkitRoot }}", toolkitRoot), string(runtimeConfigFileContents))
+			if len(tc.expectedRuntimeConfig) > 0 {
+				require.FileExists(t, runtimeConfigFile)
+				runtimeConfigFileContents, err := os.ReadFile(runtimeConfigFile)
+				require.NoError(t, err)
+				expected := strings.ReplaceAll(tc.expectedRuntimeConfig, "{{ .testRoot }}", testRoot)
+				require.Equal(t, strings.ReplaceAll(expected, "{{ .toolkitRoot }}", toolkitRoot), string(runtimeConfigFileContents))
+			} else {
+				require.NoFileExists(t, runtimeConfigFile)
+			}
+
+			if len(tc.expectedDropInRuntimeConfig) > 0 {
+				require.FileExists(t, runtimeDropInConfigFile)
+				runtimeDropInConfigFileContents, err := os.ReadFile(runtimeDropInConfigFile)
+				require.NoError(t, err)
+				require.Equal(t, strings.ReplaceAll(tc.expectedDropInRuntimeConfig, "{{ .toolkitRoot }}", toolkitRoot), string(runtimeDropInConfigFileContents))
+			} else {
+				require.NoFileExists(t, runtimeDropInConfigFile)
+			}
 		})
 	}
 

cmd/nvidia-ctk/runtime/configure/configure.go

@@ -272,7 +272,7 @@ func (m command) configureConfigFile(config *config) error {
 	case "crio":
 		cfg, err = crio.New(
 			crio.WithLogger(m.logger),
-			crio.WithPath(config.configFilePath),
+			crio.WithTopLevelConfigPath(config.configFilePath),
 			crio.WithConfigSource(configSource),
 		)
 	case "docker":