Skip Huawei labels when NFD patches a default namespace

Signed-off-by: taenzeyang <[email protected]>

Author: taenzeyang

deployment/helm/node-feature-discovery/templates/nodefeaturerules.yaml

@@ -5,13 +5,32 @@ metadata:
   name: npu
 spec:
   rules:
-    - name: "ascend/atlas-800t-a2"
+    - name: "ascend/atlas-800t-a2-arm"
       labels:
+        "node-role.kubernetes.io/worker": "worker"
+        "workerselector": "dls-worker-node"
         "host-arch": "huawei-arm"
         "accelerator": "huawei-Ascend910"
       matchFeatures:
         - feature: pci.device
           matchExpressions:
             vendor: {op: In, value: ["19e5"]}
             device: {op: In, value: ["d802"]}
+        - feature: kernel.config
+          matchExpressions:
+            X86: {op: In, value: ["n"]}
+    - name: "ascend/atlas-800t-a2-x86"
+      labels:
+        "node-role.kubernetes.io/worker": "worker"
+        "workerselector": "dls-worker-node"
+        "host-arch": "huawei-x86"
+        "accelerator": "huawei-Ascend910"
+      matchFeatures:
+        - feature: pci.device
+          matchExpressions:
+            vendor: {op: In, value: ["19e5"]}
+            device: {op: In, value: ["d802"]}
+        - feature: kernel.config
+          matchExpressions:
+            X86: {op: In, value: ["y"]}
 {{- end }}

pkg/nfd-master/nfd-master.go

@@ -1287,8 +1287,11 @@ func addNs(src string, nsToAdd string) string {
 // containsHW returns true if the label contains Huawei's keys
 func containsHW(src string) bool {
 	keys := []string{
-		"accelerator",
+		"workerselector",
 		"host-arch",
+		"accelerator",
+		"accelerator-type",
+		"servertype",
 	}
 	for _, key := range keys {
 		if key == src {