Merge pull request #1818 from cdesiniotis/cdi-disable-hooks

Allow CDI hooks to be disabled

Author: cdesiniotis

cmd/nvidia-device-plugin/main.go

@@ -45,6 +45,7 @@ type options struct {
 	configFile      string
 	kubeletSocket   string
 	cdiFeatureFlags cli.StringSlice
+	cdiDisableHooks cli.StringSlice
 }
 
 func main() {
@@ -180,6 +181,12 @@ func main() {
 			EnvVars:     []string{"CDI_FEATURE_FLAGS"},
 			Destination: &o.cdiFeatureFlags,
 		},
+		&cli.StringSliceFlag{
+			Name:        "cdi-disable-hooks",
+			Usage:       "A set of OCI hooks to disable when generating CDI specifications; if the value 'all' is specified, then the CDI specification will exclude all OCI hooks.",
+			EnvVars:     []string{"CDI_DISABLE_HOOKS"},
+			Destination: &o.cdiDisableHooks,
+		},
 	}
 	o.flags = c.Flags
 

cmd/nvidia-device-plugin/plugin-manager.go

@@ -63,6 +63,7 @@ func GetPlugins(ctx context.Context, infolib info.Interface, nvmllib nvml.Interf
 		cdi.WithMofedEnabled(*config.Flags.MOFEDEnabled),
 		cdi.WithImexChannels(imexChannels),
 		cdi.WithFeatureFlags(o.cdiFeatureFlags.Value()...),
+		cdi.WithDisabledHooks(o.cdiDisableHooks.Value()...),
 		cdi.WithDeviceDiscoveryStrategy(resolvedStrategy),
 	)
 	if err != nil {

internal/cdi/cdi.go

@@ -62,6 +62,9 @@ type cdiHandler struct {
 	// nvcdiFeatureFlags allows finer control over CDI spec generation.
 	nvcdiFeatureFlags []string
 
+	// nvcdiDisabledHooks is a list of hooks to omit when generating CDI specs
+	nvcdiDisabledHooks []string
+
 	gdsEnabled     bool
 	mofedEnabled   bool
 	gdrcopyEnabled bool
@@ -126,6 +129,7 @@ func New(infolib info.Interface, nvmllib nvml.Interface, devicelib device.Interf
 		nvcdi.WithDevRoot(c.devRoot),
 		nvcdi.WithDriverRoot(c.driverRoot),
 		nvcdi.WithFeatureFlags(c.nvcdiFeatureFlags...),
+		nvcdi.WithDisabledHooks(c.nvcdiDisabledHooks...),
 		nvcdi.WithInfoLib(c.infolib),
 		nvcdi.WithLogger(c.logger),
 		nvcdi.WithNVIDIACDIHookPath(c.nvidiaCTKPath),

internal/cdi/options.go

@@ -32,6 +32,14 @@ func WithFeatureFlags(featureFlags ...string) Option {
 	}
 }
 
+// WithDisabledHooks provides and option to disable hooks for the nvcdi
+// spec generation instance.
+func WithDisabledHooks(disabledHooks ...string) Option {
+	return func(c *cdiHandler) {
+		c.nvcdiDisabledHooks = disabledHooks
+	}
+}
+
 // WithDeviceListStrategies provides an Option to set the enabled flag used by the 'cdi' interface
 func WithDeviceListStrategies(deviceListStrategies spec.DeviceListStrategies) Option {
 	return func(c *cdiHandler) {