fixup! fetch current container runtime config through the command line

Author: elezar

pkg/config/engine/api.go

@@ -30,24 +30,3 @@ type Interface interface {
 type RuntimeConfig interface {
 	GetBinaryPath() string
 }
-
-func GetBinaryPathsForRuntimes(cfg Interface, runtimes ...string) []string {
-	var binaryPaths []string
-
-	seen := make(map[string]bool)
-	for _, runtime := range runtimes {
-		runtimeConfig, err := cfg.GetRuntimeConfig(runtime)
-		if err != nil {
-			// TODO: It will be useful to log the error when GetRuntimeConfig fails for a runtime
-			continue
-		}
-		binaryPath := runtimeConfig.GetBinaryPath()
-		if binaryPath == "" || seen[binaryPath] {
-			continue
-		}
-		seen[binaryPath] = true
-		binaryPaths = append(binaryPaths, binaryPath)
-	}
-
-	return binaryPaths
-}

pkg/config/engine/engine.go

@@ -0,0 +1,63 @@
+/**
+# Copyright 2024 NVIDIA CORPORATION
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+**/
+
+package engine
+
+import "strings"
+
+// GetBinaryPathsForRuntimes returns the list of binary paths for common rutimes.
+// The following list of runtimes is considered:
+//
+//	the default runtime, "runc", and "crun"
+//
+// If an nvidia* runtime is set as the default runtime, this is ignored.
+func GetBinaryPathsForRuntimes(cfg Interface) []string {
+
+	var binaryPaths []string
+	seen := make(map[string]bool)
+	for _, runtime := range GetLowLevelRuntimes(cfg) {
+		runtimeConfig, err := cfg.GetRuntimeConfig(runtime)
+		if err != nil {
+			// TODO: It will be useful to log the error when GetRuntimeConfig fails for a runtime
+			continue
+		}
+		binaryPath := runtimeConfig.GetBinaryPath()
+		if binaryPath == "" || seen[binaryPath] {
+			continue
+		}
+		seen[binaryPath] = true
+		binaryPaths = append(binaryPaths, binaryPath)
+	}
+
+	return binaryPaths
+}
+
+// GetLowLevelRuntimes returns a predefined list low-level runtimes from the specified config.
+// nvidia* runtimes are ignored.
+func GetLowLevelRuntimes(cfg Interface) []string {
+	var runtimes []string
+	isValidDefault := func(s string) bool {
+		if s == "" {
+			return false
+		}
+		// ignore nvidia* runtimes.
+		return !strings.HasPrefix(s, "nvidia")
+	}
+	if defaultRuntime := cfg.DefaultRuntime(); isValidDefault(defaultRuntime) {
+		runtimes = append(runtimes, defaultRuntime)
+	}
+	return append(runtimes, "runc", "crun")
+}

pkg/config/toml/source.go

@@ -35,7 +35,7 @@ func FromFile(path string) Loader {
 }
 
 // FromCommandLine creates a TOML source from the output of a shell command and its corresponding args.
-// If an empty slice is passed an empty toml config is used.
+// If the command is empty, an empty config is returned.
 func FromCommandLine(cmd string, args ...string) Loader {
 	if len(cmd) == 0 {
 		return Empty

tools/container/runtime/containerd/containerd.go

@@ -168,18 +168,14 @@ func (o *Options) runtimeConfigOverride() (map[string]interface{}, error) {
 	return runtimeOptions, nil
 }
 
-func GetLowlevelRuntimePaths(hostRoot string) ([]string, error) {
+func GetLowlevelRuntimePaths(o *container.Options, co *Options) ([]string, error) {
 	cfg, err := containerd.New(
-		containerd.WithConfigSource(containerd.CommandLineSource(hostRoot)),
+		containerd.WithConfigSource(containerd.CommandLineSource(o.HostRootMount)),
+		containerd.WithRuntimeType(co.runtimeType),
+		containerd.WithUseLegacyConfig(co.useLegacyConfig),
 	)
 	if err != nil {
 		return nil, fmt.Errorf("unable to load containerd config: %w", err)
 	}
-	var runtimes []string
-	runtimes = append(runtimes, "runc")
-	if defaultRuntime := cfg.DefaultRuntime(); defaultRuntime != "" {
-		runtimes = append(runtimes, defaultRuntime)
-	}
-
-	return engine.GetBinaryPathsForRuntimes(cfg, runtimes...), nil
+	return engine.GetBinaryPathsForRuntimes(cfg), nil
 }

tools/container/runtime/crio/crio.go

@@ -194,18 +194,12 @@ func RestartCrio(o *container.Options) error {
 	return o.Restart("crio", func(string) error { return fmt.Errorf("supporting crio via signal is unsupported") })
 }
 
-func GetLowlevelRuntimePaths(hostRoot string) ([]string, error) {
+func GetLowlevelRuntimePaths(o *container.Options) ([]string, error) {
 	cfg, err := crio.New(
-		crio.WithConfigSource(crio.CommandLineSource(hostRoot)),
+		crio.WithConfigSource(crio.CommandLineSource(o.HostRootMount)),
 	)
 	if err != nil {
-		return nil, fmt.Errorf("unable to load containerd config: %w", err)
-	}
-	var runtimes []string
-	if defaultRuntime := cfg.DefaultRuntime(); defaultRuntime != "" {
-		runtimes = append(runtimes, defaultRuntime)
+		return nil, fmt.Errorf("unable to load crio config: %w", err)
 	}
-	runtimes = append(runtimes, "runc", "crun")
-
-	return engine.GetBinaryPathsForRuntimes(cfg, runtimes...), nil
+	return engine.GetBinaryPathsForRuntimes(cfg), nil
 }

tools/container/runtime/docker/docker.go

@@ -98,17 +98,12 @@ func RestartDocker(o *container.Options) error {
 	return o.Restart("docker", SignalDocker)
 }
 
-func GetLowlevelRuntimePaths() ([]string, error) {
+func GetLowlevelRuntimePaths(o *container.Options) ([]string, error) {
 	cfg, err := docker.New(
-		docker.WithPath(DefaultConfig),
+		docker.WithPath(o.Config),
 	)
 	if err != nil {
-		return nil, fmt.Errorf("unable to load containerd config: %w", err)
-	}
-	var runtimes []string
-	if defaultRuntime := cfg.DefaultRuntime(); defaultRuntime != "" {
-		runtimes = append(runtimes, defaultRuntime)
+		return nil, fmt.Errorf("unable to load docker config: %w", err)
 	}
-
-	return engine.GetBinaryPathsForRuntimes(cfg, runtimes...), nil
+	return engine.GetBinaryPathsForRuntimes(cfg), nil
 }

tools/container/runtime/runtime.go

@@ -170,11 +170,11 @@ func Cleanup(c *cli.Context, opts *Options, runtime string) error {
 func GetLowlevelRuntimePaths(opts *Options, runtime string) ([]string, error) {
 	switch runtime {
 	case containerd.Name:
-		return containerd.GetLowlevelRuntimePaths(opts.HostRootMount)
+		return containerd.GetLowlevelRuntimePaths(&opts.Options, &opts.containerdOptions)
 	case crio.Name:
-		return crio.GetLowlevelRuntimePaths(opts.HostRootMount)
+		return crio.GetLowlevelRuntimePaths(&opts.Options)
 	case docker.Name:
-		return docker.GetLowlevelRuntimePaths()
+		return docker.GetLowlevelRuntimePaths(&opts.Options)
 	default:
 		return nil, fmt.Errorf("undefined runtime %v", runtime)
 	}