Set config file path when running containerd config dump

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

Author: cdesiniotis

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/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,11 @@ 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")...)
+	return toml.FromCommandLine(chrootIfRequired(hostRoot, executablePath, "--config", topLevelConfig, "config", "dump")...)
 }
 
 func chrootIfRequired(hostRoot string, commandLine ...string) []string {