From 60c1df4e9c5b5fd5cda1bbb3bb2930c931cacd43 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 23 Nov 2022 16:31:35 +0100 Subject: [PATCH] Remove unneeded workaround for CDI edit generation Signed-off-by: Evan Lezar --- internal/edits/device.go | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/internal/edits/device.go b/internal/edits/device.go index aca095e3..8f5418de 100644 --- a/internal/edits/device.go +++ b/internal/edits/device.go @@ -17,13 +17,9 @@ package edits import ( - "fmt" - "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/container-orchestrated-devices/container-device-interface/specs-go" - - "github.com/opencontainers/runc/libcontainer/devices" ) type device discover.Device @@ -46,21 +42,9 @@ func (d device) toEdits() (*cdi.ContainerEdits, error) { // toSpec converts a discovered Device to a CDI Spec Device. Note // that missing info is filled in when edits are applied by querying the Device node. func (d device) toSpec() (*specs.DeviceNode, error) { - // NOTE: This mirrors what cri-o does. - // https://github.com/cri-o/cri-o/blob/ca3bb80a3dda0440659fcf8da8ed6f23211de94e/internal/config/device/device.go#L93 - // This can be removed once https://github.com/container-orchestrated-devices/container-device-interface/issues/72 is addressed - dev, err := devices.DeviceFromPath(d.HostPath, "rwm") - if err != nil { - return nil, fmt.Errorf("failed to query device node %v: %v", d.HostPath, err) - } s := specs.DeviceNode{ + HostPath: d.HostPath, Path: d.Path, - Type: string(dev.Type), - Major: dev.Major, - Minor: dev.Minor, - FileMode: &dev.FileMode, - UID: &dev.Uid, - GID: &dev.Gid, } return &s, nil