mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2024-11-22 16:29:18 +00:00
4ec9bd751e
This change adds a "required" option to the new toml config that controls whether a default config is returned or not. This is useful from the NVIDIA Container Runtime Hook, where /run/driver/nvidia/etc/nvidia-container-runtime/config.toml is checked before the standard path. This fixes a bug where the default config was always applied when this config was not used. See https://github.com/NVIDIA/nvidia-container-toolkit/issues/106 Signed-off-by: Evan Lezar <elezar@nvidia.com>
115 lines
2.9 KiB
Go
115 lines
2.9 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"log"
|
|
"os"
|
|
"path"
|
|
"reflect"
|
|
"strings"
|
|
|
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/config"
|
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/image"
|
|
)
|
|
|
|
const (
|
|
configPath = "/etc/nvidia-container-runtime/config.toml"
|
|
driverPath = "/run/nvidia/driver"
|
|
)
|
|
|
|
var defaultPaths = [...]string{}
|
|
|
|
// HookConfig : options for the nvidia-container-runtime-hook.
|
|
type HookConfig config.Config
|
|
|
|
func getDefaultHookConfig() (HookConfig, error) {
|
|
defaultCfg, err := config.GetDefault()
|
|
if err != nil {
|
|
return HookConfig{}, err
|
|
}
|
|
|
|
return *(*HookConfig)(defaultCfg), nil
|
|
}
|
|
|
|
// loadConfig loads the required paths for the hook config.
|
|
func loadConfig() (*config.Config, error) {
|
|
var configPaths []string
|
|
var required bool
|
|
if len(*configflag) != 0 {
|
|
configPaths = append(configPaths, *configflag)
|
|
required = true
|
|
} else {
|
|
configPaths = append(configPaths, path.Join(driverPath, configPath), configPath)
|
|
}
|
|
|
|
for _, p := range configPaths {
|
|
cfg, err := config.New(
|
|
config.WithConfigFile(p),
|
|
config.WithRequired(true),
|
|
)
|
|
if err == nil {
|
|
return cfg.Config()
|
|
} else if os.IsNotExist(err) && !required {
|
|
continue
|
|
}
|
|
return nil, fmt.Errorf("couldn't open required configuration file: %v", err)
|
|
}
|
|
|
|
return config.GetDefault()
|
|
}
|
|
|
|
func getHookConfig() (*HookConfig, error) {
|
|
cfg, err := loadConfig()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to load config: %v", err)
|
|
}
|
|
config := (*HookConfig)(cfg)
|
|
|
|
allSupportedDriverCapabilities := image.SupportedDriverCapabilities
|
|
if config.SupportedDriverCapabilities == "all" {
|
|
config.SupportedDriverCapabilities = allSupportedDriverCapabilities.String()
|
|
}
|
|
configuredCapabilities := image.NewDriverCapabilities(config.SupportedDriverCapabilities)
|
|
// We ensure that the configured value is a subset of all supported capabilities
|
|
if !allSupportedDriverCapabilities.IsSuperset(configuredCapabilities) {
|
|
configName := config.getConfigOption("SupportedDriverCapabilities")
|
|
log.Panicf("Invalid value for config option '%v'; %v (supported: %v)\n", configName, config.SupportedDriverCapabilities, allSupportedDriverCapabilities.String())
|
|
}
|
|
|
|
return config, nil
|
|
}
|
|
|
|
// getConfigOption returns the toml config option associated with the
|
|
// specified struct field.
|
|
func (c HookConfig) getConfigOption(fieldName string) string {
|
|
t := reflect.TypeOf(c)
|
|
f, ok := t.FieldByName(fieldName)
|
|
if !ok {
|
|
return fieldName
|
|
}
|
|
v, ok := f.Tag.Lookup("toml")
|
|
if !ok {
|
|
return fieldName
|
|
}
|
|
return v
|
|
}
|
|
|
|
// getSwarmResourceEnvvars returns the swarm resource envvars for the config.
|
|
func (c *HookConfig) getSwarmResourceEnvvars() []string {
|
|
if c.SwarmResource == "" {
|
|
return nil
|
|
}
|
|
|
|
candidates := strings.Split(c.SwarmResource, ",")
|
|
|
|
var envvars []string
|
|
for _, c := range candidates {
|
|
trimmed := strings.TrimSpace(c)
|
|
if len(trimmed) > 0 {
|
|
envvars = append(envvars, trimmed)
|
|
}
|
|
}
|
|
|
|
return envvars
|
|
}
|