enable CDI by default for buildkitd

Access should be managed by entitlements checks

Signed-off-by: Tonis Tiigi <[email protected]>

Author: tonistiigi

cmd/buildkitd/config/config.go

@@ -77,7 +77,7 @@ type OTELConfig struct {
 }
 
 type CDIConfig struct {
-	Enabled  *bool    `toml:"enabled"`
+	Disabled *bool    `toml:"disabled"`
 	SpecDirs []string `toml:"specDirs"`
 }
 

cmd/buildkitd/main.go

@@ -633,7 +633,7 @@ func applyMainFlags(c *cli.Context, cfg *config.Config) error {
 
 	if c.IsSet("cdi-enabled") {
 		cdiEnabled := c.Bool("cdi-enabled")
-		cfg.CDI.Enabled = &cdiEnabled
+		cfg.CDI.Disabled = &cdiEnabled
 	}
 	if c.IsSet("cdi-spec-dir") {
 		cfg.CDI.SpecDirs = c.StringSlice("cdi-spec-dir")

cmd/buildkitd/main_oci_worker.go

@@ -324,7 +324,7 @@ func ociWorkerInitializer(c *cli.Context, common workerInitializerOpt) ([]worker
 	opt.BuildkitVersion = getBuildkitVersion()
 	opt.RegistryHosts = hosts
 
-	if common.config.CDI.Enabled != nil && *common.config.CDI.Enabled {
+	if common.config.CDI.Disabled == nil || !*common.config.CDI.Disabled {
 		if len(common.config.CDI.SpecDirs) == 0 {
 			return nil, errors.New("No CDI specification directories specified")
 		}

control/control.go

@@ -687,6 +687,9 @@ func toPBBuildkitVersion(in client.BuildkitVersion) *apitypes.BuildkitVersion {
 }
 
 func toPBCDIDevices(manager *cdi.Cache) []*apitypes.CDIDevice {
+	if manager == nil {
+		return nil
+	}
 	devs := manager.ListDevices()
 	out := make([]*apitypes.CDIDevice, 0, len(devs))
 	for _, dev := range devs {

executor/oci/spec_linux.go

@@ -178,6 +178,7 @@ func generateCDIOpts(ctx context.Context, devices []*pb.CDIDevice) ([]oci.SpecOp
 	withStaticCDIRegistry := func() oci.SpecOpts {
 		return func(ctx context.Context, _ oci.Client, _ *containers.Container, s *oci.Spec) error {
 			_ = cdi.Configure(cdi.WithAutoRefresh(false))
+			// TODO: this should use worker CDIManager
 			if err := cdi.Refresh(); err != nil {
 				// We don't consider registry refresh failure a fatal error.
 				// For instance, a dynamically generated invalid CDI Spec file