From 1bd7db5ab3445ef6fe01ce8a3b0157a985bbe527 Mon Sep 17 00:00:00 2001 From: Marcelo Date: Mon, 26 May 2025 10:20:33 +0200 Subject: [PATCH] Fix error on Del cmd for user space drivers The DPDKMode var in conf is json ignored. The value is always false. This checks if the device is attached to a user space supported driver instead of relaying on this var. Signed-off-by: Marcelo --- pkg/cnicommands/cni.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/cnicommands/cni.go b/pkg/cnicommands/cni.go index 3bc8cd38..f5c67f9d 100644 --- a/pkg/cnicommands/cni.go +++ b/pkg/cnicommands/cni.go @@ -284,7 +284,12 @@ func CmdDel(args *skel.CmdArgs) error { return fmt.Errorf("cmdDel() error reseting VF: %q", err) } - if !netConf.DPDKMode { + hasDpdkDriver, err := utils.HasDpdkDriver(netConf.DeviceID) + if err != nil { + return fmt.Errorf("cmdDel() error checking DPDK driver: %q", err) + } + + if !hasDpdkDriver { netns, err := ns.GetNS(args.Netns) if err != nil { // according to: