Merge pull request #157 from adrianchiris/bump-rdma-cni

chore: bump rdma-cni to v1.5.0

Author: SchSeba

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/containernetworking/cni v1.3.0
 	github.com/containernetworking/plugins v1.8.0
 	github.com/gofrs/flock v0.13.0
-	github.com/k8snetworkplumbingwg/rdma-cni v1.4.0
+	github.com/k8snetworkplumbingwg/rdma-cni v1.5.0
 	github.com/k8snetworkplumbingwg/sriovnet v1.2.0
 	github.com/onsi/ginkgo/v2 v2.27.2
 	github.com/onsi/gomega v1.38.2

go.sum

@@ -32,8 +32,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE=
 github.com/joshdk/go-junit v1.0.0/go.mod h1:TiiV0PqkaNfFXjEiyjWM3XXrhVyCa1K4Zfga6W52ung=
-github.com/k8snetworkplumbingwg/rdma-cni v1.4.0 h1:S4Dt8Oi8ndh6jRMfkhcIb6HXZUPgiqQJ0gmkaTGAZ2Q=
-github.com/k8snetworkplumbingwg/rdma-cni v1.4.0/go.mod h1:3LdblK1KkPEsXVSG4lD6iWTR4FhoJpjlW3u/gsz5Zuo=
+github.com/k8snetworkplumbingwg/rdma-cni v1.5.0 h1:sJm7/Smob34Hhffhz13ID7YPVH+N8flf8M/qFpNQJ8E=
+github.com/k8snetworkplumbingwg/rdma-cni v1.5.0/go.mod h1:om5VpWt5RG014xy48f/IsueLPJ+KWrXnpLSsa2nkWCg=
 github.com/k8snetworkplumbingwg/sriovnet v1.2.0 h1:6ELfAxCB1dvosGUy3DVRmfH+HWTzmPD3W67HKQvMR1M=
 github.com/k8snetworkplumbingwg/sriovnet v1.2.0/go.mod h1:jyWzGe6ZtYiPq6ih6aXCOy6mZ49Y9mNyBOLBBXnli+k=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=

pkg/utils/rdma.go

@@ -33,9 +33,9 @@ func MoveRdmaDevToNs(rdmaDev string, targetNs ns.NetNS) error {
 
 // Move RDMA device to namespace
 func MoveRdmaDevToNsPci(pciDev string, targetNs ns.NetNS) (string, error) { // (hostRdmaDev, error)
-	rdmaDevs, err := rdmaManager.GetRdmaDevsForPciDev(pciDev)
-	if err != nil || len(rdmaDevs) == 0 {
-		return "", fmt.Errorf("failed to get RDMA devices for PCI device: %s. %v", pciDev, err)
+	rdmaDevs := rdmaManager.GetRdmaDevsForPciDev(pciDev)
+	if len(rdmaDevs) == 0 {
+		return "", fmt.Errorf("failed to get RDMA devices for PCI device: %s. No RDMA devices found", pciDev)
 	}
 
 	if len(rdmaDevs) != 1 {
@@ -47,7 +47,7 @@ func MoveRdmaDevToNsPci(pciDev string, targetNs ns.NetNS) (string, error) { // (
 	// Move RDMA device to container namespace
 	rdmaDev := rdmaDevs[0]
 
-	err = MoveRdmaDevToNs(rdmaDev, targetNs)
+	err := MoveRdmaDevToNs(rdmaDev, targetNs)
 	if err != nil {
 		return "", fmt.Errorf("failed to move RDMA device %s to namespace. %v", rdmaDev, err)
 	}