Merge pull request #923 from zeeke/us/multipolicies

Avoid setting Drivers selector for `vfio-pci` devices

Author: zeeke

controllers/sriovnetworknodepolicy_controller.go

@@ -584,10 +584,7 @@ func createDevicePluginResource(
 	if len(p.Spec.NicSelector.RootDevices) > 0 {
 		netDeviceSelectors.RootDevices = append(netDeviceSelectors.RootDevices, p.Spec.NicSelector.RootDevices...)
 	}
-	// Removed driver constraint for "netdevice" DeviceType
-	if p.Spec.DeviceType == constants.DeviceTypeVfioPci {
-		netDeviceSelectors.Drivers = append(netDeviceSelectors.Drivers, p.Spec.DeviceType)
-	}
+
 	// Enable the selection of devices using NetFilter
 	if p.Spec.NicSelector.NetFilter != "" {
 		// Loop through interfaces status to find a match for NetworkID or NetworkTag
@@ -657,10 +654,7 @@ func updateDevicePluginResource(
 	if len(p.Spec.NicSelector.RootDevices) > 0 {
 		netDeviceSelectors.RootDevices = sriovnetworkv1.UniqueAppend(netDeviceSelectors.RootDevices, p.Spec.NicSelector.RootDevices...)
 	}
-	// Removed driver constraint for "netdevice" DeviceType
-	if p.Spec.DeviceType == constants.DeviceTypeVfioPci {
-		netDeviceSelectors.Drivers = sriovnetworkv1.UniqueAppend(netDeviceSelectors.Drivers, p.Spec.DeviceType)
-	}
+
 	// Enable the selection of devices using NetFilter
 	if p.Spec.NicSelector.NetFilter != "" {
 		// Loop through interfaces status to find a match for NetworkID or NetworkTag

controllers/sriovnetworknodepolicy_controller_test.go

@@ -19,6 +19,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
@@ -39,6 +40,13 @@ func mustMarshallSelector(t *testing.T, input *dptypes.NetDeviceSelectors) *json
 	return &ret
 }
 
+func mustUnmarshallSelector(input *json.RawMessage) *dptypes.NetDeviceSelectors {
+	ret := dptypes.NetDeviceSelectors{}
+	err := json.Unmarshal(*input, &ret)
+	ExpectWithOffset(1, err).ToNot(HaveOccurred())
+	return &ret
+}
+
 func TestRenderDevicePluginConfigData(t *testing.T) {
 	table := []struct {
 		tname       string
@@ -542,4 +550,129 @@ var _ = Describe("SriovNetworkNodePolicyReconciler", Ordered, func() {
 			Expect(errors.IsNotFound(r.Get(ctx, types.NamespacedName{Name: nodeState.Name}, nodeState))).To(BeTrue())
 		})
 	})
+
+	Context("renderDevicePluginConfigData", func() {
+		It("should render device plugin config data when policies with the same resource name target different devices", func() {
+
+			intelNode := &corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: "intelNode", Labels: map[string]string{"node-role.kubernetes.io/worker": ""}}}
+			mlxNode := &corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: "mlxNode", Labels: map[string]string{"node-role.kubernetes.io/worker": ""}}}
+
+			objs := []client.Object{
+				intelNode,
+				&sriovnetworkv1.SriovNetworkNodeState{ObjectMeta: metav1.ObjectMeta{Name: "intelNode", Namespace: testNamespace}, Status: sriovnetworkv1.SriovNetworkNodeStateStatus{
+					Interfaces: sriovnetworkv1.InterfaceExts{
+						{Driver: "ice", DeviceID: "159b", Vendor: "8086", PciAddress: "0000:31:00.0"},
+					},
+				}},
+				mlxNode,
+				&sriovnetworkv1.SriovNetworkNodeState{ObjectMeta: metav1.ObjectMeta{Name: "mlxNode", Namespace: testNamespace}, Status: sriovnetworkv1.SriovNetworkNodeStateStatus{
+					Interfaces: sriovnetworkv1.InterfaceExts{
+						{Driver: "mlx5_core", DeviceID: "101d", Vendor: "15b3", PciAddress: "0000:ca:00.0"},
+					},
+				}},
+			}
+
+			r := &SriovNetworkNodePolicyReconciler{Client: fake.NewClientBuilder().WithObjects(objs...).Build()}
+
+			pl := &sriovnetworkv1.SriovNetworkNodePolicyList{
+				Items: []sriovnetworkv1.SriovNetworkNodePolicy{
+					{
+						ObjectMeta: metav1.ObjectMeta{Name: "intel-vfio-pci"},
+						Spec: sriovnetworkv1.SriovNetworkNodePolicySpec{
+							ResourceName: "resource1",
+							DeviceType:   "vfio-pci",
+							NicSelector: sriovnetworkv1.SriovNetworkNicSelector{
+								Vendor:      "8086",
+								DeviceID:    "159b",
+								RootDevices: []string{"0000:31:00.0"},
+							},
+							NumVfs:       128,
+							NodeSelector: map[string]string{"node-role.kubernetes.io/worker": ""},
+						},
+					},
+					{
+						ObjectMeta: metav1.ObjectMeta{Name: "mellanox-rdma"},
+						Spec: sriovnetworkv1.SriovNetworkNodePolicySpec{
+							ResourceName: "resource1",
+							DeviceType:   "netdevice",
+							IsRdma:       true,
+							NicSelector: sriovnetworkv1.SriovNetworkNicSelector{
+								Vendor:      "15b3",
+								DeviceID:    "101d",
+								RootDevices: []string{"0000:ca:00.0"},
+							},
+							NumVfs:       128,
+							NodeSelector: map[string]string{"node-role.kubernetes.io/worker": ""},
+						},
+					},
+				},
+			}
+			rcl, err := r.renderDevicePluginConfigData(context.Background(), pl, mlxNode)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(len(rcl.ResourceList)).To(Equal(1))
+			Expect(rcl.ResourceList[0].ResourceName).To(Equal("resource1"))
+			selectors := mustUnmarshallSelector(rcl.ResourceList[0].Selectors)
+			Expect(selectors.Vendors).To(ContainElements("8086", "15b3"))
+			Expect(selectors.RootDevices).To(ContainElements("0000:31:00.0", "0000:ca:00.0"))
+
+			// Having drivers in the selector cause the device plugin to fail to select the mellanox devices in the mlxNode
+			Expect(selectors.Drivers).To(BeEmpty())
+		})
+
+		It("should render device plugin config data when policies configure vfio-pci and netdevice", func() {
+			node1 := &corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: "node1", Labels: map[string]string{"node-role.kubernetes.io/worker": ""}}}
+			objs := []client.Object{
+				node1,
+				&sriovnetworkv1.SriovNetworkNodeState{ObjectMeta: metav1.ObjectMeta{Name: "node1", Namespace: testNamespace}, Status: sriovnetworkv1.SriovNetworkNodeStateStatus{
+					Interfaces: sriovnetworkv1.InterfaceExts{
+						{Driver: "ice", DeviceID: "159b", Vendor: "8086", PciAddress: "0000:31:00.0", Name: "ens0"},
+					},
+				}},
+			}
+
+			r := &SriovNetworkNodePolicyReconciler{Client: fake.NewClientBuilder().WithObjects(objs...).Build()}
+
+			pl := &sriovnetworkv1.SriovNetworkNodePolicyList{
+				Items: []sriovnetworkv1.SriovNetworkNodePolicy{
+					{
+						ObjectMeta: metav1.ObjectMeta{Name: "intel-vfio-pci"},
+						Spec: sriovnetworkv1.SriovNetworkNodePolicySpec{
+							ResourceName: "resvfiopci",
+							DeviceType:   "vfio-pci",
+							NicSelector: sriovnetworkv1.SriovNetworkNicSelector{
+								Vendor:   "8086",
+								DeviceID: "159b",
+								PfNames:  []string{"ens0#0-9"},
+							},
+							NumVfs:       128,
+							NodeSelector: map[string]string{"node-role.kubernetes.io/worker": ""},
+						},
+					},
+					{
+						ObjectMeta: metav1.ObjectMeta{Name: "mellanox-rdma"},
+						Spec: sriovnetworkv1.SriovNetworkNodePolicySpec{
+							ResourceName: "resnetdevice",
+							DeviceType:   "netdevice",
+							NicSelector: sriovnetworkv1.SriovNetworkNicSelector{
+								Vendor:   "8086",
+								DeviceID: "159b",
+								PfNames:  []string{"ens0#10-19"},
+							},
+							NumVfs:       128,
+							NodeSelector: map[string]string{"node-role.kubernetes.io/worker": ""},
+						},
+					},
+				},
+			}
+			rcl, err := r.renderDevicePluginConfigData(context.Background(), pl, node1)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(len(rcl.ResourceList)).To(Equal(2))
+			selectors := map[string]string{
+				rcl.ResourceList[0].ResourceName: string(*rcl.ResourceList[0].Selectors),
+				rcl.ResourceList[1].ResourceName: string(*rcl.ResourceList[1].Selectors),
+			}
+			Expect(selectors).To(HaveKeyWithValue("resvfiopci", `{"vendors":["8086"],"pfNames":["ens0#0-9"],"IsRdma":false,"NeedVhostNet":false}`))
+			Expect(selectors).To(HaveKeyWithValue("resnetdevice", `{"vendors":["8086"],"pfNames":["ens0#10-19"],"IsRdma":false,"NeedVhostNet":false}`))
+		})
+	})
 })