opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-17 11:14:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump tags.cncf.io/container-device-interface to v0.7.1

Browse Source 
This includes migrating from cdi.GetRegistry() to cdi.Configure() and
cdi.GetDefaultCache() as applicable.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar
2024-04-05 17:27:27 +02:00
parent 19600fa5e3
commit a40cf3195a
18 changed files with 287 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libpod/container_internal_common.go
View File

@ -564,14 +564,16 @@ func (c *Container) generateSpec(ctx context.Context) (s *spec.Spec, cleanupFunc
// Warning: CDI may alter g.Config in place.
if len(c.config.CDIDevices) > 0 {
registry := cdi.GetRegistry(
registry, err := cdi.NewCache(
cdi.WithAutoRefresh(false),
)
if err != nil {
return nil, nil, fmt.Errorf("creating CDI registry: %w", err)
}
if err := registry.Refresh(); err != nil {
logrus.Debugf("The following error was triggered when refreshing the CDI registry: %v", err)
}
_, err := registry.InjectDevices(g.Config, c.config.CDIDevices...)
if err != nil {
if _, err := registry.InjectDevices(g.Config, c.config.CDIDevices...); err != nil {
return nil, nil, fmt.Errorf("setting up CDI devices: %w", err)
}
}