Merge branch 'CNT-3895/add-runtime-mode-config' into 'main'

Add nvidia-container-runtime.mode config option

See merge request nvidia/container-toolkit/container-toolkit!299
This commit is contained in:
Evan Lezar 2023-02-20 12:51:18 +00:00
commit f6d3f8d471

View File

@ -41,6 +41,7 @@ const (
type options struct { type options struct {
DriverRoot string DriverRoot string
ContainerRuntimeMode string
ContainerRuntimeDebug string ContainerRuntimeDebug string
ContainerRuntimeLogLevel string ContainerRuntimeLogLevel string
ContainerCLIDebug string ContainerCLIDebug string
@ -108,6 +109,11 @@ func main() {
Destination: &opts.ContainerRuntimeLogLevel, Destination: &opts.ContainerRuntimeLogLevel,
EnvVars: []string{"NVIDIA_CONTAINER_RUNTIME_LOG_LEVEL"}, EnvVars: []string{"NVIDIA_CONTAINER_RUNTIME_LOG_LEVEL"},
}, },
&cli.StringFlag{
Name: "nvidia-container-runtime-mode",
Destination: &opts.ContainerRuntimeMode,
EnvVars: []string{"NVIDIA_CONTAINER_RUNTIME_MODE"},
},
&cli.StringFlag{ &cli.StringFlag{
Name: "nvidia-container-cli-debug", Name: "nvidia-container-cli-debug",
Usage: "Specify the location of the debug log file for the NVIDIA Container CLI", Usage: "Specify the location of the debug log file for the NVIDIA Container CLI",
@ -299,6 +305,7 @@ func installToolkitConfig(toolkitConfigPath string, nvidiaContainerCliExecutable
debugOptions := map[string]string{ debugOptions := map[string]string{
"nvidia-container-runtime.debug": opts.ContainerRuntimeDebug, "nvidia-container-runtime.debug": opts.ContainerRuntimeDebug,
"nvidia-container-runtime.log-level": opts.ContainerRuntimeLogLevel, "nvidia-container-runtime.log-level": opts.ContainerRuntimeLogLevel,
"nvidia-container-runtime.mode": opts.ContainerRuntimeMode,
"nvidia-container-cli.debug": opts.ContainerCLIDebug, "nvidia-container-cli.debug": opts.ContainerCLIDebug,
} }
for key, value := range debugOptions { for key, value := range debugOptions {