diff --git a/cmd/nvidia-container-runtime-hook/main.go b/cmd/nvidia-container-runtime-hook/main.go index faaf0b51..1f4bd525 100644 --- a/cmd/nvidia-container-runtime-hook/main.go +++ b/cmd/nvidia-container-runtime-hook/main.go @@ -95,6 +95,9 @@ func doPrestart() { if cli.LoadKmods { args = append(args, "--load-kmods") } + if hook.Features.DisableImexChannelCreation.IsEnabled() { + args = append(args, "--no-create-imex-channels") + } if cli.NoPivot { args = append(args, "--no-pivot") } diff --git a/internal/config/features.go b/internal/config/features.go index f92ca99e..80d3c95a 100644 --- a/internal/config/features.go +++ b/internal/config/features.go @@ -18,6 +18,9 @@ package config // features specifies a set of named features. type features struct { + // DisableImexChannelCreation ensures that the implicit creation of + // requested IMEX channels is skipped when invoking the nvidia-container-cli. + DisableImexChannelCreation *feature `toml:"disable-imex-channel-creation,omitempty"` } //nolint:unused 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)