Add NodeFeatureRules to label Nvidia NICs

This patch does the following:
 - Add "Nvidia NICs PCI" NFR to lable the node with `pci-15b3.present": "true"`
   if any of Nvidia NICs is exist
 - Add "Nvidia NICs SRIOV"  NFR to lable the node with `pci-15b3.sriov.capable": "true"`
   if any of Nvidia NICs has SRIOV enabled
 - Add nfd.deployNodeFeatureRules flag and set it true by default to allow creating NFRs above
 - Remove the networking PCI class from the source configuration
 - Enhance READE documentation

Signed-off-by: Waleed Mousa <waleedm@nvidia.com>

README.md

@@ -57,16 +57,15 @@ NFD is used to label nodes with the following labels:
 - RDMA capability
 - GPU features*
 
+>__NOTE__: We use nodeFeatureRules to label PCI vendor and device and it's enabled by default using `nfd.deployNodeFeatureRules` flag
+
 __Example NFD worker configurations:__
 
 ```yaml
     config:
       sources:
         pci:
           deviceClassWhitelist:
-          - "02"
-          - "0200"
-          - "0207"
           - "0300"
           - "0302"
           deviceLabelFields:

deployment/network-operator/README.md

@@ -335,6 +335,7 @@ parameters.
 | Name                                                 | Type   | Default                                  | description                                                                                                                                                 |
 |------------------------------------------------------|--------|------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `nfd.enabled`                                        | bool   | `True`                                   | deploy Node Feature Discovery                                                                                                                               |
+| `nfd.deployNodeFeatureRules`                         | bool   | `True`                                   | deploy Node Feature Rules to label the nodes                                                                                                                |
 | `sriovNetworkOperator.enabled`                       | bool   | `False`                                  | deploy SR-IOV Network Operator                                                                                                                              |
 | `upgradeCRDs`                                        | bool   | `True`                                   | enable CRDs upgrade with helm pre-install and pre-upgrade hooks                                                                                             |
 | `sriovNetworkOperator.configDaemonNodeSelectorExtra` | object | `{"node-role.kubernetes.io/worker": ""}` | Additional nodeSelector for sriov-network-operator config daemon. These values will be added in addition to default values managed by the network-operator. |

deployment/network-operator/templates/nodefeaturerules.yaml

@@ -0,0 +1,25 @@
+{{- if .Values.nfd.deployNodeFeatureRules }}
+apiVersion: nfd.k8s-sigs.io/v1alpha1
+kind: NodeFeatureRule
+metadata:
+  name: nvidia-nics-rules
+spec:
+  rules:
+    - name: "Nvidia NICs PCI"
+      labels:
+        "pci-15b3.present": "true"
+      matchFeatures:
+        - feature: pci.device
+          matchExpressions:
+            vendor: {op: In, value: ["15b3"]}
+            class: {op: In, value: ["0200", "0207"]}
+    - name: "Nvidia NICs SRIOV"
+      labels:
+        "pci-15b3.sriov.capable": "true"
+      matchFeatures:
+        - feature: pci.device
+          matchExpressions:
+            vendor: {op: In, value: ["15b3"]}
+            class: {op: In, value: ["0200", "0207"]}
+            sriov_totalvfs: {op: Exists}
+{{- end }}

deployment/network-operator/values.yaml

@@ -18,6 +18,7 @@
 
 nfd:
   enabled: true
+  deployNodeFeatureRules: true
 
 psp:
   enabled: false
@@ -52,9 +53,6 @@ node-feature-discovery:
       sources:
         pci:
           deviceClassWhitelist:
-          - "02"
-          - "0200"
-          - "0207"
           - "0300"
           - "0302"
           deviceLabelFields:

hack/templates/values/values.template

@@ -18,6 +18,7 @@
 
 nfd:
   enabled: true
+  deployNodeFeatureRules: true
 
 psp:
   enabled: false
@@ -52,9 +53,6 @@ node-feature-discovery:
       sources:
         pci:
           deviceClassWhitelist:
-          - "02"
-          - "0200"
-          - "0207"
           - "0300"
           - "0302"
           deviceLabelFields: