From bc9180b59d064204be76c78aa1435e957a928b35 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 18 Sep 2024 22:20:56 +0200 Subject: [PATCH] Expose opt-in features in toolkit-container This change enables opt-in (off-by-default) features to be opted into. These features can be toggled by name by specifying the (repeated) --opt-in-features command line argument or as a comma-separated list in the NVIDIA_CONTAINER_TOOLKIT_OPT_IN_FEATURES environment variable. Signed-off-by: Evan Lezar --- tools/container/toolkit/toolkit.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/container/toolkit/toolkit.go b/tools/container/toolkit/toolkit.go index 937798e6..43e68ca5 100644 --- a/tools/container/toolkit/toolkit.go +++ b/tools/container/toolkit/toolkit.go @@ -79,6 +79,8 @@ type Options struct { acceptNVIDIAVisibleDevicesAsVolumeMounts bool ignoreErrors bool + + optInFeatures cli.StringSlice } func Flags(opts *Options) []cli.Flag { @@ -202,6 +204,12 @@ func Flags(opts *Options) []cli.Flag { Destination: &opts.createDeviceNodes, EnvVars: []string{"CREATE_DEVICE_NODES"}, }, + &cli.StringSliceFlag{ + Name: "opt-in-features", + Hidden: true, + Destination: &opts.optInFeatures, + EnvVars: []string{"NVIDIA_CONTAINER_TOOLKIT_OPT_IN_FEATURES"}, + }, } return flags @@ -457,6 +465,10 @@ func installToolkitConfig(c *cli.Context, toolkitConfigPath string, nvidiaContai configValues["nvidia-container-runtime.runtimes"] = toolkitRuntimeList } + for _, optInFeature := range opts.optInFeatures.Value() { + configValues["features."+optInFeature] = true + } + for key, value := range configValues { cfg.Set(key, value) } @@ -471,6 +483,7 @@ func installToolkitConfig(c *cli.Context, toolkitConfigPath string, nvidiaContai "nvidia-container-runtime.runtimes": opts.ContainerRuntimeRuntimes, "nvidia-container-cli.debug": opts.ContainerCLIDebug, } + for key, value := range optionalConfigValues { if !c.IsSet(key) { log.Infof("Skipping unset option: %v", key)