[no-relnote] Update for modified nvcdi GetSpecs API

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

internal/cdi/api.go

@@ -16,16 +16,10 @@
 
 package cdi
 
-import "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
-
 // Interface provides the API to the 'cdi' package
 //
 //go:generate moq -stub -out api_mock.go . Interface
 type Interface interface {
 	CreateSpecFile() error
 	QualifiedName(string, string) string
 }
-
-type cdiSpecGenerator interface {
-	GetSpec() (spec.Interface, error)
-}

internal/cdi/cdi.go

@@ -62,7 +62,7 @@ type cdiHandler struct {
 
 	imexChannels imex.Channels
 
-	cdilibs map[string]cdiSpecGenerator
+	cdilibs map[string]nvcdi.SpecGenerator
 }
 
 var _ Interface = &cdiHandler{}
@@ -111,7 +111,7 @@ func New(infolib info.Interface, nvmllib nvml.Interface, devicelib device.Interf
 		return nil, err
 	}
 
-	c.cdilibs = make(map[string]cdiSpecGenerator)
+	c.cdilibs = make(map[string]nvcdi.SpecGenerator)
 
 	c.cdilibs["gpu"], err = nvcdi.New(
 		nvcdi.WithInfoLib(c.infolib),

internal/cdi/imex.go

@@ -19,6 +19,7 @@ package cdi
 import (
 	"tags.cncf.io/container-device-interface/specs-go"
 
+	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
 
 	"github.com/NVIDIA/k8s-device-plugin/internal/imex"
@@ -29,7 +30,7 @@ type imexChannelCDILib struct {
 	imexChannels imex.Channels
 }
 
-func (cdi *cdiHandler) newImexChannelSpecGenerator() cdiSpecGenerator {
+func (cdi *cdiHandler) newImexChannelSpecGenerator() nvcdi.SpecGenerator {
 	lib := &imexChannelCDILib{
 		vendor:       cdi.vendor,
 		imexChannels: cdi.imexChannels,
@@ -39,7 +40,7 @@ func (cdi *cdiHandler) newImexChannelSpecGenerator() cdiSpecGenerator {
 }
 
 // GetSpec returns the CDI specs for IMEX channels.
-func (l *imexChannelCDILib) GetSpec() (spec.Interface, error) {
+func (l *imexChannelCDILib) GetSpec(...string) (spec.Interface, error) {
 	var deviceSpecs []specs.Device
 	for _, channel := range l.imexChannels {
 		deviceSpec := specs.Device{