worker: cdi manager

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

cmd/buildkitd/main.go

@@ -74,7 +74,6 @@ import (
 	"google.golang.org/grpc/health"
 	healthv1 "google.golang.org/grpc/health/grpc_health_v1"
 	"google.golang.org/grpc/reflection"
-	"tags.cncf.io/container-device-interface/pkg/cdi"
 )
 
 func init() {
@@ -290,12 +289,6 @@ func main() {
 		}
 		closers = append(closers, mp.Shutdown)
 
-		if cfg.CDI.Enabled != nil && *cfg.CDI.Enabled {
-			if err := cdi.Configure(cdi.WithSpecDirs(cfg.CDI.SpecDirs...)); err != nil {
-				return errors.Wrap(err, "failed to configure CDI registry")
-			}
-		}
-
 		statsHandler := tracing.ServerStatsHandler(
 			otelgrpc.WithTracerProvider(tp),
 			otelgrpc.WithMeterProvider(mp),

cmd/buildkitd/main_oci_worker.go

@@ -48,6 +48,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials/insecure"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 )
 
 func init() {
@@ -323,6 +324,17 @@ 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 len(common.config.CDI.SpecDirs) == 0 {
+			return nil, errors.New("No CDI specification directories specified")
+		}
+		cdiCache, err := cdi.NewCache(cdi.WithSpecDirs(common.config.CDI.SpecDirs...))
+		if err != nil {
+			return nil, errors.Wrapf(err, "CDI registry initialization failure")
+		}
+		opt.CDIManager = cdiCache
+	}
+
 	if platformsStr := cfg.Platforms; len(platformsStr) != 0 {
 		platforms, err := parsePlatforms(platformsStr)
 		if err != nil {

worker/base/worker.go

@@ -52,6 +52,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/sync/semaphore"
+	"tags.cncf.io/container-device-interface/pkg/cdi"
 )
 
 const labelCreatedAt = "buildkit/createdat"
@@ -82,6 +83,7 @@ type WorkerOpt struct {
 	MetadataStore    *metadata.Store
 	MountPoolRoot    string
 	ResourceMonitor  *resources.Monitor
+	CDIManager       *cdi.Cache
 }
 
 // Worker is a local worker instance with dedicated snapshotter, cache, and so on.
@@ -245,6 +247,10 @@ func (w *Worker) LeaseManager() *leaseutil.Manager {
 	return w.WorkerOpt.LeaseManager
 }
 
+func (w *Worker) CDIManager() *cdi.Cache {
+	return w.WorkerOpt.CDIManager
+}
+
 func (w *Worker) ID() string {
 	return w.WorkerOpt.ID
 }