builder-next: fix cdi manager

crazy-max · vvoland · commit 1fde8c46159c · 2025-02-18T21:48:01.000+01:00
Signed-off-by: CrazyMax &lt;1951866+crazy-max@users.noreply.github.com&gt;
Signed-off-by: Paweł Gronowski &lt;pawel.gronowski@docker.com&gt;
diff --git a/builder/builder-next/controller.go b/builder/builder-next/controller.go
@@ -549,10 +549,7 @@ func getCDIManager(specDirs []string) (*cdidevices.Manager, error) {
 		return nil, nil
 	}
 	cdiCache, err := func() (*cdi.Cache, error) {
-		cdiCache, err := cdi.NewCache(
-			cdi.WithSpecDirs(specDirs...),
-			cdi.WithAutoRefresh(false),
-		)
+		cdiCache, err := cdi.NewCache(cdi.WithSpecDirs(specDirs...))
 		if err != nil {
 			return nil, err
 		}
@@ -564,5 +561,6 @@ func getCDIManager(specDirs []string) (*cdidevices.Manager, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "CDI registry initialization failure")
 	}
-	return cdidevices.NewManager(cdiCache), nil
+	// TODO: add support for auto-allowed devices from config
+	return cdidevices.NewManager(cdiCache, nil), nil
 }

Original file line number	Diff line number	Diff line change
`@@ -549,10 +549,7 @@ func getCDIManager(specDirs []string) (*cdidevices.Manager, error) {`
`549`	`549`	`return nil, nil`
`550`	`550`	`}`
`551`	`551`	`cdiCache, err := func() (*cdi.Cache, error) {`
`552`		`- cdiCache, err := cdi.NewCache(`
`553`		`- cdi.WithSpecDirs(specDirs...),`
`554`		`- cdi.WithAutoRefresh(false),`
`555`		`- )`
	`552`	`+ cdiCache, err := cdi.NewCache(cdi.WithSpecDirs(specDirs...))`
`556`	`553`	`if err != nil {`
`557`	`554`	`return nil, err`
`558`	`555`	`}`
`@@ -564,5 +561,6 @@ func getCDIManager(specDirs []string) (*cdidevices.Manager, error) {`
`564`	`561`	`if err != nil {`
`565`	`562`	`return nil, errors.Wrapf(err, "CDI registry initialization failure")`
`566`	`563`	`}`
`567`		`- return cdidevices.NewManager(cdiCache), nil`
	`564`	`+ // TODO: add support for auto-allowed devices from config`
	`565`	`+ return cdidevices.NewManager(cdiCache, nil), nil`
`568`	`566`	`}`