Skip to content

Commit 7a2f49f

Browse files
elezarelezar
committed
Bump tags.cncf.io/container-device-interface to v0.7.2
This includes migrating from cdi.GetRegistry() to cdi.Configure() and using top-level cdi Refresh and InjectDevices functions as applicable. Signed-off-by: Evan Lezar <[email protected]>
1 parent 6b0cae9 commit 7a2f49f

21 files changed

Lines changed: 280 additions & 153 deletions

File tree

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ require (
8080
k8s.io/cri-api v0.27.1
8181
k8s.io/klog/v2 v2.90.1
8282
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
83-
tags.cncf.io/container-device-interface v0.6.2
83+
tags.cncf.io/container-device-interface v0.7.2
8484
)
8585

8686
require (
@@ -142,7 +142,7 @@ require (
142142
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
143143
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
144144
sigs.k8s.io/yaml v1.3.0 // indirect
145-
tags.cncf.io/container-device-interface/specs-go v0.6.0 // indirect
145+
tags.cncf.io/container-device-interface/specs-go v0.7.0 // indirect
146146
)
147147

148148
// Workaround for indirect dependency no longer being available.

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,7 +1690,7 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
16901690
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
16911691
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
16921692
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
1693-
tags.cncf.io/container-device-interface v0.6.2 h1:dThE6dtp/93ZDGhqaED2Pu374SOeUkBfuvkLuiTdwzg=
1694-
tags.cncf.io/container-device-interface v0.6.2/go.mod h1:Shusyhjs1A5Na/kqPVLL0KqnHQHuunol9LFeUNkuGVE=
1695-
tags.cncf.io/container-device-interface/specs-go v0.6.0 h1:V+tJJN6dqu8Vym6p+Ru+K5mJ49WL6Aoc5SJFSY0RLsQ=
1696-
tags.cncf.io/container-device-interface/specs-go v0.6.0/go.mod h1:hMAwAbMZyBLdmYqWgYcKH0F/yctNpV3P35f+/088A80=
1693+
tags.cncf.io/container-device-interface v0.7.2 h1:MLqGnWfOr1wB7m08ieI4YJ3IoLKKozEnnNYBtacDPQU=
1694+
tags.cncf.io/container-device-interface v0.7.2/go.mod h1:Xb1PvXv2BhfNb3tla4r9JL129ck1Lxv9KuU6eVOfKto=
1695+
tags.cncf.io/container-device-interface/specs-go v0.7.0 h1:w/maMGVeLP6TIQJVYT5pbqTi8SCw/iHZ+n4ignuGHqg=
1696+
tags.cncf.io/container-device-interface/specs-go v0.7.0/go.mod h1:hMAwAbMZyBLdmYqWgYcKH0F/yctNpV3P35f+/088A80=

‎integration/client/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2639,5 +2639,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih
26392639
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
26402640
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
26412641
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
2642-
tags.cncf.io/container-device-interface v0.6.2/go.mod h1:Shusyhjs1A5Na/kqPVLL0KqnHQHuunol9LFeUNkuGVE=
2643-
tags.cncf.io/container-device-interface/specs-go v0.6.0/go.mod h1:hMAwAbMZyBLdmYqWgYcKH0F/yctNpV3P35f+/088A80=
2642+
tags.cncf.io/container-device-interface v0.7.2/go.mod h1:Xb1PvXv2BhfNb3tla4r9JL129ck1Lxv9KuU6eVOfKto=
2643+
tags.cncf.io/container-device-interface/specs-go v0.7.0/go.mod h1:hMAwAbMZyBLdmYqWgYcKH0F/yctNpV3P35f+/088A80=

‎pkg/cri/opts/spec_linux.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,7 @@ func WithCDI(annotations map[string]string, CDIDevices []*runtime.CDIDevice) oci
176176
return nil
177177
}
178178

179-
registry := cdi.GetRegistry()
180-
if err = registry.Refresh(); err != nil {
179+
if err = cdi.Refresh(); err != nil {
181180
// We don't consider registry refresh failure a fatal error.
182181
// For instance, a dynamically generated invalid CDI Spec file for
183182
// any particular vendor shouldn't prevent injection of devices of
@@ -186,7 +185,7 @@ func WithCDI(annotations map[string]string, CDIDevices []*runtime.CDIDevice) oci
186185
log.G(ctx).Warnf("CDI registry refresh failed: %v", err)
187186
}
188187

189-
if _, err := registry.InjectDevices(s, devices...); err != nil {
188+
if _, err := cdi.InjectDevices(s, devices...); err != nil {
190189
return fmt.Errorf("CDI device injection failed: %w", err)
191190
}
192191

‎pkg/cri/sbserver/container_create_linux_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,8 +1929,7 @@ containerEdits:
19291929
}
19301930
require.NoError(t, err)
19311931

1932-
reg := cdi.GetRegistry()
1933-
err = reg.Configure(cdi.WithSpecDirs(cdiDir))
1932+
err = cdi.Configure(cdi.WithSpecDirs(cdiDir))
19341933
require.NoError(t, err)
19351934

19361935
injectFun := customopts.WithCDI(test.annotations, test.cdiDevices)

‎pkg/cri/sbserver/service_linux.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ func (c *criService) initPlatform() (err error) {
8989
}
9090

9191
if c.config.EnableCDI {
92-
reg := cdi.GetRegistry()
93-
err = reg.Configure(cdi.WithSpecDirs(c.config.CDISpecDirs...))
92+
err = cdi.Configure(cdi.WithSpecDirs(c.config.CDISpecDirs...))
9493
if err != nil {
9594
return fmt.Errorf("failed to configure CDI registry")
9695
}

‎pkg/cri/server/container_create_linux_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2108,8 +2108,7 @@ containerEdits:
21082108
}
21092109
require.NoError(t, err)
21102110

2111-
reg := cdi.GetRegistry()
2112-
err = reg.Configure(cdi.WithSpecDirs(cdiDir))
2111+
err = cdi.Configure(cdi.WithSpecDirs(cdiDir))
21132112
require.NoError(t, err)
21142113

21152114
injectFun := customopts.WithCDI(test.annotations, test.cdiDevices)

‎pkg/cri/server/service_linux.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ func (c *criService) initPlatform() (err error) {
8989
}
9090

9191
if c.config.EnableCDI {
92-
reg := cdi.GetRegistry()
93-
err = reg.Configure(cdi.WithSpecDirs(c.config.CDISpecDirs...))
92+
err = cdi.Configure(cdi.WithSpecDirs(c.config.CDISpecDirs...))
9493
if err != nil {
9594
return fmt.Errorf("failed to configure CDI registry: %w", err)
9695
}

‎vendor/modules.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -821,13 +821,12 @@ sigs.k8s.io/structured-merge-diff/v4/value
821821
# sigs.k8s.io/yaml v1.3.0
822822
## explicit; go 1.12
823823
sigs.k8s.io/yaml
824-
# tags.cncf.io/container-device-interface v0.6.2
825-
## explicit; go 1.19
826-
tags.cncf.io/container-device-interface/internal/multierror
824+
# tags.cncf.io/container-device-interface v0.7.2
825+
## explicit; go 1.20
827826
tags.cncf.io/container-device-interface/internal/validation
828827
tags.cncf.io/container-device-interface/internal/validation/k8s
829828
tags.cncf.io/container-device-interface/pkg/cdi
830829
tags.cncf.io/container-device-interface/pkg/parser
831-
# tags.cncf.io/container-device-interface/specs-go v0.6.0
830+
# tags.cncf.io/container-device-interface/specs-go v0.7.0
832831
## explicit; go 1.19
833832
tags.cncf.io/container-device-interface/specs-go

‎vendor/tags.cncf.io/container-device-interface/internal/multierror/multierror.go‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)