Set config file path when running containerd config dump

Signed-off-by: Christopher Desiniotis <[email protected]>

Author: cdesiniotis

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

@@ -39,8 +39,9 @@ type Options struct {
 	DropInConfig         string
 	DropInConfigHostPath string
 	// TopLevelConfigPath stores the path to the top-level config for the runtime.
-	TopLevelConfigPath string
-	Socket             string
+	TopLevelConfigPath         string
+	TopLevelConfigPathHostPath string
+	Socket                     string
 	// ExecutablePath specifies the path to the container runtime executable.
 	// This is used to extract the current config, for example.
 	// If a HostRootMount is specified, this path is relative to the host root

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

@@ -176,7 +176,7 @@ func getRuntimeConfig(o *container.Options, co *Options) (engine.Interface, erro
 		containerd.WithTopLevelConfigPath(o.TopLevelConfigPath),
 		containerd.WithConfigSource(
 			toml.LoadFirst(
-				containerd.CommandLineSource(o.HostRootMount, o.ExecutablePath),
+				containerd.CommandLineSource(o.HostRootMount, o.ExecutablePath, o.TopLevelConfigPath),
 				toml.FromFile(o.TopLevelConfigPath),
 			),
 		),

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

@@ -54,6 +54,13 @@ func Flags(opts *Options) []cli.Flag {
 			Destination: &opts.TopLevelConfigPath,
 			Sources:     cli.EnvVars("RUNTIME_CONFIG", "CONTAINERD_CONFIG", "DOCKER_CONFIG"),
 		},
+		&cli.StringFlag{
+			Name: "config-host-path",
+			Usage: "When running in a container, this is the path to the runtime config file (--config) on the host. " +
+				"This is used to extract the current config.",
+			Destination: &opts.TopLevelConfigPathHostPath,
+			Sources:     cli.EnvVars("RUNTIME_CONFIG_HOST_PATH"),
+		},
 		&cli.StringFlag{
 			Name:        "drop-in-config",
 			Usage:       "Path to the NVIDIA-specific drop-in config file",

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

@@ -368,7 +368,7 @@ func (c *config) resolveConfigSource() (toml.Loader, error) {
 func (c *config) getCommandConfigSource() toml.Loader {
 	switch c.runtime {
 	case "containerd":
-		return containerd.CommandLineSource("", c.executablePath)
+		return containerd.CommandLineSource("", c.executablePath, c.configFilePath)
 	case "crio":
 		return crio.CommandLineSource("", c.executablePath)
 	}

pkg/config/engine/containerd/containerd.go

@@ -195,11 +195,18 @@ func (c *Config) GetRuntimeConfig(name string) (engine.RuntimeConfig, error) {
 }
 
 // CommandLineSource returns the CLI-based containerd config loader
-func CommandLineSource(hostRoot string, executablePath string) toml.Loader {
+func CommandLineSource(hostRoot string, executablePath string, topLevelConfig string) toml.Loader {
 	if executablePath == "" {
 		executablePath = "containerd"
 	}
-	return toml.FromCommandLine(chrootIfRequired(hostRoot, executablePath, "config", "dump")...)
+
+	var commandLine []string
+	if topLevelConfig != "" {
+		commandLine = []string{executablePath, "--config", topLevelConfig, "config", "dump")}
+	} else {
+		commandLine = []string{executablePath, "config", "dump"}
+	}
+	return toml.FromCommandLine(chrootIfRequired(hostRoot, commandLine...)...)
 }
 
 func chrootIfRequired(hostRoot string, commandLine ...string) []string {