UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-02-19 18:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add to config struct

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2023-03-09 11:14:38 +02:00
parent 936fad1d04
commit 154cd4ecf3
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/config/config.go
View File

@ -45,6 +45,8 @@ var (
// Config represents the contents of the config.toml file for the NVIDIA Container Toolkit // Config represents the contents of the config.toml file for the NVIDIA Container Toolkit
// Note: This is currently duplicated by the HookConfig in cmd/nvidia-container-toolkit/hook_config.go // Note: This is currently duplicated by the HookConfig in cmd/nvidia-container-toolkit/hook_config.go
type Config struct { type Config struct {
AcceptEnvvarUnprivileged bool `toml:"accept-nvidia-visible-devices-envvar-when-unprivileged"`
NVIDIAContainerCLIConfig ContainerCLIConfig `toml:"nvidia-container-cli"` NVIDIAContainerCLIConfig ContainerCLIConfig `toml:"nvidia-container-cli"`
NVIDIACTKConfig CTKConfig `toml:"nvidia-ctk"` NVIDIACTKConfig CTKConfig `toml:"nvidia-ctk"`
NVIDIAContainerRuntimeConfig RuntimeConfig `toml:"nvidia-container-runtime"` NVIDIAContainerRuntimeConfig RuntimeConfig `toml:"nvidia-container-runtime"`
@ -91,6 +93,8 @@ func getConfigFrom(toml *toml.Tree) (*Config, error) {
return cfg, nil return cfg, nil
} }
cfg.AcceptEnvvarUnprivileged = toml.GetDefault("accept-nvidia-visible-devices-envvar-when-unprivileged", cfg.AcceptEnvvarUnprivileged).(bool)
cfg.NVIDIAContainerCLIConfig = *getContainerCLIConfigFrom(toml) cfg.NVIDIAContainerCLIConfig = *getContainerCLIConfigFrom(toml)
cfg.NVIDIACTKConfig = *getCTKConfigFrom(toml) cfg.NVIDIACTKConfig = *getCTKConfigFrom(toml)
runtimeConfig, err := getRuntimeConfigFrom(toml) runtimeConfig, err := getRuntimeConfigFrom(toml)
@ -105,6 +109,7 @@ func getConfigFrom(toml *toml.Tree) (*Config, error) {
// getDefaultConfig defines the default values for the config // getDefaultConfig defines the default values for the config
func getDefaultConfig() *Config { func getDefaultConfig() *Config {
c := Config{ c := Config{
AcceptEnvvarUnprivileged: true,
NVIDIAContainerCLIConfig: *getDefaultContainerCLIConfig(), NVIDIAContainerCLIConfig: *getDefaultContainerCLIConfig(),
NVIDIACTKConfig: *getDefaultCTKConfig(), NVIDIACTKConfig: *getDefaultCTKConfig(),
NVIDIAContainerRuntimeConfig: *GetDefaultRuntimeConfig(), NVIDIAContainerRuntimeConfig: *GetDefaultRuntimeConfig(),

5
internal/config/config_test.go
View File

@ -57,6 +57,7 @@ func TestGetConfig(t *testing.T) {
{ {
description: "empty config is default", description: "empty config is default",
expectedConfig: &Config{ expectedConfig: &Config{
AcceptEnvvarUnprivileged: true,
NVIDIAContainerCLIConfig: ContainerCLIConfig{ NVIDIAContainerCLIConfig: ContainerCLIConfig{
Root: "", Root: "",
}, },
@ -82,6 +83,7 @@ func TestGetConfig(t *testing.T) {
{ {
description: "config options set inline", description: "config options set inline",
contents: []string{ contents: []string{
"accept-nvidia-visible-devices-envvar-when-unprivileged = false",
"nvidia-container-cli.root = \"/bar/baz\"", "nvidia-container-cli.root = \"/bar/baz\"",
"nvidia-container-runtime.debug = \"/foo/bar\"", "nvidia-container-runtime.debug = \"/foo/bar\"",
"nvidia-container-runtime.experimental = true", "nvidia-container-runtime.experimental = true",
@ -94,6 +96,7 @@ func TestGetConfig(t *testing.T) {
"nvidia-ctk.path = \"/foo/bar/nvidia-ctk\"", "nvidia-ctk.path = \"/foo/bar/nvidia-ctk\"",
}, },
expectedConfig: &Config{ expectedConfig: &Config{
AcceptEnvvarUnprivileged: false,
NVIDIAContainerCLIConfig: ContainerCLIConfig{ NVIDIAContainerCLIConfig: ContainerCLIConfig{
Root: "/bar/baz", Root: "/bar/baz",
}, },
@ -119,6 +122,7 @@ func TestGetConfig(t *testing.T) {
{ {
description: "config options set in section", description: "config options set in section",
contents: []string{ contents: []string{
"accept-nvidia-visible-devices-envvar-when-unprivileged = false",
"[nvidia-container-cli]", "[nvidia-container-cli]",
"root = \"/bar/baz\"", "root = \"/bar/baz\"",
"[nvidia-container-runtime]", "[nvidia-container-runtime]",
@ -136,6 +140,7 @@ func TestGetConfig(t *testing.T) {
"path = \"/foo/bar/nvidia-ctk\"", "path = \"/foo/bar/nvidia-ctk\"",
}, },
expectedConfig: &Config{ expectedConfig: &Config{
AcceptEnvvarUnprivileged: false,
NVIDIAContainerCLIConfig: ContainerCLIConfig{ NVIDIAContainerCLIConfig: ContainerCLIConfig{
Root: "/bar/baz", Root: "/bar/baz",
}, },