UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 00:08:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #741 from elezar/imex-default

Browse Source 
Add disableIMEXChannelCreation feature flag
This commit is contained in:
Evan Lezar 2024-10-17 15:26:21 +02:00 committed by GitHub
commit b077e2648d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/nvidia-container-runtime-hook/main.go
View File

@ -95,6 +95,9 @@ func doPrestart() {
if cli.LoadKmods { if cli.LoadKmods {
args = append(args, "--load-kmods") args = append(args, "--load-kmods")
} }
if hook.Features.DisableImexChannelCreation.IsEnabled() {
args = append(args, "--no-create-imex-channels")
}
if cli.NoPivot { if cli.NoPivot {
args = append(args, "--no-pivot") args = append(args, "--no-pivot")
} }

3
internal/config/features.go
View File

@ -18,6 +18,9 @@ package config
// features specifies a set of named features. // features specifies a set of named features.
type features struct { 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 //nolint:unused

13
tools/container/toolkit/toolkit.go
View File

@ -79,6 +79,8 @@ type Options struct {
acceptNVIDIAVisibleDevicesAsVolumeMounts bool acceptNVIDIAVisibleDevicesAsVolumeMounts bool
ignoreErrors bool ignoreErrors bool
optInFeatures cli.StringSlice
} }
func Flags(opts *Options) []cli.Flag { func Flags(opts *Options) []cli.Flag {
@ -202,6 +204,12 @@ func Flags(opts *Options) []cli.Flag {
Destination: &opts.createDeviceNodes, Destination: &opts.createDeviceNodes,
EnvVars: []string{"CREATE_DEVICE_NODES"}, 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 return flags
@ -457,6 +465,10 @@ func installToolkitConfig(c *cli.Context, toolkitConfigPath string, nvidiaContai
configValues["nvidia-container-runtime.runtimes"] = toolkitRuntimeList configValues["nvidia-container-runtime.runtimes"] = toolkitRuntimeList
} }
for _, optInFeature := range opts.optInFeatures.Value() {
configValues["features."+optInFeature] = true
}
for key, value := range configValues { for key, value := range configValues {
cfg.Set(key, value) cfg.Set(key, value)
} }
@ -471,6 +483,7 @@ func installToolkitConfig(c *cli.Context, toolkitConfigPath string, nvidiaContai
"nvidia-container-runtime.runtimes": opts.ContainerRuntimeRuntimes, "nvidia-container-runtime.runtimes": opts.ContainerRuntimeRuntimes,
"nvidia-container-cli.debug": opts.ContainerCLIDebug, "nvidia-container-cli.debug": opts.ContainerCLIDebug,
} }
for key, value := range optionalConfigValues { for key, value := range optionalConfigValues {
if !c.IsSet(key) { if !c.IsSet(key) {
log.Infof("Skipping unset option: %v", key) log.Infof("Skipping unset option: %v", key)