summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-08-11 14:26:36 +0000
committerGitHub <noreply@github.com>2022-08-11 14:26:36 +0000
commit7af523ea5af8ba8ad61cd4b81a1494a42ac7b479 (patch)
tree583605e1c87f42bd1fbebdb057a2e9debbe26812
parent59ab5cce7d20be703f5528a12a971b2ef1e2a784 (diff)
parent658960c97b0dca06cb81472bc9bd7ff820fc56cf (diff)
downloadpodman-7af523ea5af8ba8ad61cd4b81a1494a42ac7b479.tar.gz
podman-7af523ea5af8ba8ad61cd4b81a1494a42ac7b479.tar.bz2
podman-7af523ea5af8ba8ad61cd4b81a1494a42ac7b479.zip
Merge pull request #15258 from elezar/bump-cdi-0.5.0
build(deps) bump CDI dependency from 0.4.0 to 0.5.0
-rw-r--r--libpod/container_internal_linux.go8
1 files changed, 5 insertions, 3 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index a131ab367..64e0af284 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -872,9 +872,11 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) {
// Warning: CDI may alter g.Config in place.
if len(c.config.CDIDevices) > 0 {
- registry := cdi.GetRegistry()
- if errs := registry.GetErrors(); len(errs) > 0 {
- logrus.Debugf("The following errors were triggered when creating the CDI registry: %v", errs)
+ registry := cdi.GetRegistry(
+ cdi.WithAutoRefresh(false),
+ )
+ 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 {