Add ability to opt-out of containerd drop-in files

Signed-off-by: Christopher Desiniotis <[email protected]>

Author: cdesiniotis

cmd/nvidia-ctk-installer/container/runtime/containerd/containerd.go

@@ -50,6 +50,8 @@ type Options struct {
 	ContainerRuntimeModesCDIAnnotationPrefixes []string
 
 	runtimeConfigOverrideJSON string
+
+	DisableDropInConfig bool
 }
 
 func Flags(opts *Options) []cli.Flag {
@@ -82,6 +84,12 @@ func Flags(opts *Options) []cli.Flag {
 			Value:       "{}",
 			Sources:     cli.EnvVars("RUNTIME_CONFIG_OVERRIDE", "CONTAINERD_RUNTIME_CONFIG_OVERRIDE"),
 		},
+		&cli.BoolFlag{
+			Name:        "disable-drop-in-config",
+			Usage:       "Disable the use of drop-in config files. NVIDIA runtimes will be added to the top-level config file instead.",
+			Destination: &opts.DisableDropInConfig,
+			Sources:     cli.EnvVars("CONTAINERD_DISABLE_DROP_IN_CONFIG"),
+		},
 	}
 
 	return flags
@@ -183,6 +191,7 @@ func getRuntimeConfig(o *container.Options, co *Options) (engine.Interface, erro
 		containerd.WithRuntimeType(co.runtimeType),
 		containerd.WithUseLegacyConfig(co.useLegacyConfig),
 		containerd.WithContainerAnnotations(co.containerAnnotationsFromCDIPrefixes()...),
+		containerd.WithDisableDropInConfig(co.DisableDropInConfig),
 	}
 	if o.DropInConfigHostPath != "" && o.DropInConfig != "" {
 		options = append(options,

cmd/nvidia-ctk-installer/container/runtime/runtime.go

@@ -145,6 +145,9 @@ func (opts *Options) Validate(logger logger.Interface, c *cli.Command, runtime s
 			opts.DropInConfig = ""
 		}
 	case containerd.Name:
+		if opts.containerdOptions.DisableDropInConfig {
+			opts.DropInConfig = ""
+		}
 	case crio.Name:
 		if err := opts.crioOptions.Validate(logger, c); err != nil {
 			return fmt.Errorf("invalid cri-o config: %w", err)

pkg/config/engine/containerd/containerd.go

@@ -50,6 +50,7 @@ type configOptions struct {
 	// for the CRI runtime service. The name of this plugin was changed in v3 of the
 	// containerd configuration file.
 	CRIRuntimePluginName string
+	DisableDropInConfig  bool
 }
 
 var _ engine.Interface = (*Config)(nil)
@@ -122,6 +123,10 @@ func New(opts ...Option) (engine.Interface, error) {
 		// We return the sourceConfig as is.
 		return (*ConfigV1)(sourceConfig), nil
 	default:
+		if b.disableDropInConfig {
+			b.logger.Info("Drop-in config files are disabled. Modifying the source config directly.")
+			return sourceConfig, nil
+		}
 		// For other versions, we create a DropInConfig with a reference to the
 		// top-level config if present.
 		topLevelConfig := &Config{

pkg/config/engine/containerd/option.go

@@ -31,6 +31,8 @@ type builder struct {
 	containerAnnotations []string
 
 	containerToHostPathMap map[string]string
+
+	disableDropInConfig bool
 }
 
 // Option defines a function that can be used to configure the config builder
@@ -97,3 +99,10 @@ func WithContainerAnnotations(containerAnnotations ...string) Option {
 		b.containerAnnotations = containerAnnotations
 	}
 }
+
+// WithDisableDropInConfig disables the use of drop-in config files
+func WithDisableDropInConfig(disable bool) Option {
+	return func(b *builder) {
+		b.disableDropInConfig = disable
+	}
+}