UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 08:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #756 from NVIDIA/cli-source-fallback

Browse Source 
[TOML ConfigSource] add support for executing fallback CLI commands
This commit is contained in:
Tariq 2024-10-23 14:31:45 -07:00 committed by GitHub
commit 771ac6b88a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/config/engine/containerd/containerd.go
View File

@ -128,8 +128,7 @@ func (c *Config) GetRuntimeConfig(name string) (engine.RuntimeConfig, error) {
// CommandLineSource returns the CLI-based containerd config loader
func CommandLineSource(hostRoot string) toml.Loader {
commandLine := chrootIfRequired(hostRoot, "containerd", "config", "dump")
return toml.FromCommandLine(commandLine[0], commandLine[1:]...)
return toml.FromCommandLine(chrootIfRequired(hostRoot, "containerd", "config", "dump")...)
}
func chrootIfRequired(hostRoot string, commandLine ...string) []string {

6
pkg/config/engine/crio/crio.go
View File

@ -155,8 +155,10 @@ func (c *Config) GetRuntimeConfig(name string) (engine.RuntimeConfig, error) {
// CommandLineSource returns the CLI-based crio config loader
func CommandLineSource(hostRoot string) toml.Loader {
commandLine := chrootIfRequired(hostRoot, "crio", "status", "config")
return toml.FromCommandLine(commandLine[0], commandLine[1:]...)
return toml.LoadFirst(
toml.FromCommandLine(chrootIfRequired(hostRoot, "crio", "status", "config")...),
toml.FromCommandLine(chrootIfRequired(hostRoot, "crio-status", "config")...),
)
}
func chrootIfRequired(hostRoot string, commandLine ...string) []string {

41
pkg/config/toml/list.go Normal file
View File

@ -0,0 +1,41 @@
/**
# 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 toml
import "errors"
type firstOf []Loader
func LoadFirst(loaders ...Loader) Loader {
return firstOf(loaders)
}
func (loaders firstOf) Load() (*Tree, error) {
var errs error
for _, loader := range loaders {
if loader == nil {
continue
}
tree, err := loader.Load()
if err != nil {
errs = errors.Join(errs, err)
continue
}
return tree, nil
}
return nil, errs
}

8
pkg/config/toml/source.go
View File

@ -36,12 +36,12 @@ func FromFile(path string) Loader {
// FromCommandLine creates a TOML source from the output of a shell command and its corresponding args.
// If the command is empty, an empty config is returned.
func FromCommandLine(cmd string, args ...string) Loader {
if len(cmd) == 0 {
func FromCommandLine(cmds ...string) Loader {
if len(cmds) == 0 {
return Empty
}
return &tomlCliSource{
command: cmd,
args: args,
command: cmds[0],
args: cmds[1:],
}
}