Skip to content

Commit d6b23a9

Browse files
committed
Update CDI package usage for v0.8.0 update
Signed-off-by: Evan Lezar <[email protected]>
1 parent 7e0a9be commit d6b23a9

File tree

1 file changed

+10
-16
lines changed
  • cmd/dra-example-kubeletplugin

1 file changed

+10
-16
lines changed

cmd/dra-example-kubeletplugin/cdi.go

+10-16
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"os"
2222

2323
cdiapi "tags.cncf.io/container-device-interface/pkg/cdi"
24+
cdiparser "tags.cncf.io/container-device-interface/pkg/parser"
2425
cdispec "tags.cncf.io/container-device-interface/specs-go"
2526
)
2627

@@ -33,30 +34,23 @@ const (
3334
)
3435

3536
type CDIHandler struct {
36-
registry cdiapi.Registry
37+
cache *cdiapi.Cache
3738
}
3839

3940
func NewCDIHandler(config *Config) (*CDIHandler, error) {
40-
registry := cdiapi.GetRegistry(
41+
cache, err := cdiapi.NewCache(
4142
cdiapi.WithSpecDirs(config.flags.cdiRoot),
4243
)
43-
44-
err := registry.Refresh()
4544
if err != nil {
46-
return nil, fmt.Errorf("unable to refresh the CDI registry: %v", err)
45+
return nil, fmt.Errorf("unable to create a new CDI cache: %w", err)
4746
}
48-
4947
handler := &CDIHandler{
50-
registry: registry,
48+
cache: cache,
5149
}
5250

5351
return handler, nil
5452
}
5553

56-
func (cdi *CDIHandler) GetDevice(device string) *cdiapi.Device {
57-
return cdi.registry.DeviceDB().GetDevice(device)
58-
}
59-
6054
func (cdi *CDIHandler) CreateCommonSpecFile() error {
6155
spec := &cdispec.Spec{
6256
Kind: cdiKind,
@@ -84,7 +78,7 @@ func (cdi *CDIHandler) CreateCommonSpecFile() error {
8478
return fmt.Errorf("failed to generate Spec name: %w", err)
8579
}
8680

87-
return cdi.registry.SpecDB().WriteSpec(spec, specName)
81+
return cdi.cache.WriteSpec(spec, specName)
8882
}
8983

9084
func (cdi *CDIHandler) CreateClaimSpecFile(claimUID string, devices PreparedDevices) error {
@@ -115,21 +109,21 @@ func (cdi *CDIHandler) CreateClaimSpecFile(claimUID string, devices PreparedDevi
115109
}
116110
spec.Version = minVersion
117111

118-
return cdi.registry.SpecDB().WriteSpec(spec, specName)
112+
return cdi.cache.WriteSpec(spec, specName)
119113
}
120114

121115
func (cdi *CDIHandler) DeleteClaimSpecFile(claimUID string) error {
122116
specName := cdiapi.GenerateTransientSpecName(cdiVendor, cdiClass, claimUID)
123-
return cdi.registry.SpecDB().RemoveSpec(specName)
117+
return cdi.cache.RemoveSpec(specName)
124118
}
125119

126120
func (cdi *CDIHandler) GetClaimDevices(devices []string) []string {
127121
cdiDevices := []string{
128-
cdiapi.QualifiedName(cdiVendor, cdiClass, cdiCommonDeviceName),
122+
cdiparser.QualifiedName(cdiVendor, cdiClass, cdiCommonDeviceName),
129123
}
130124

131125
for _, device := range devices {
132-
cdiDevice := cdiapi.QualifiedName(cdiVendor, cdiClass, device)
126+
cdiDevice := cdiparser.QualifiedName(cdiVendor, cdiClass, device)
133127
cdiDevices = append(cdiDevices, cdiDevice)
134128
}
135129

0 commit comments

Comments
 (0)