Merge pull request #2068 from mfranczy/bugfix-compatibility-processing

Bugfix: handle matchAny and matchFeatures when they appear in one spec

Author: k8s-ci-robot

pkg/apis/nfd/nodefeaturerule/rule.go

@@ -108,7 +108,7 @@ func Execute(r *nfdv1alpha1.Rule, features *nfdv1alpha1.Features, failFast bool)
 			matchStatus.MatchAny = append(matchStatus.MatchAny, featureStatus)
 		}
 
-		if !isMatch {
+		if !isMatch && failFast {
 			klog.V(2).InfoS("rule did not match", "ruleName", r.Name)
 			return RuleOutput{MatchStatus: &matchStatus}, nil
 		}

pkg/client-nfd/compat/node-validator/node-validator_test.go

@@ -311,6 +311,86 @@ func TestNodeValidator(t *testing.T) {
 			assertOutput(ctx, spec, expectedOutput)
 		})
 
+		Convey("That contains matchAny and matchFeatures in one spec", func() {
+			spec := buildDefaultSpec([]v1alpha1.Rule{
+				{
+					Name: "fake_6",
+					MatchAny: []v1alpha1.MatchAnyElem{
+						{
+							MatchFeatures: v1alpha1.FeatureMatcher{
+								{
+									Feature: "fake.instance",
+									MatchExpressions: &v1alpha1.MatchExpressionSet{
+										"name": &v1alpha1.MatchExpression{Op: v1alpha1.MatchIn, Value: v1alpha1.MatchValue{"instance_1"}},
+									},
+								},
+							},
+						},
+						{
+							MatchFeatures: v1alpha1.FeatureMatcher{
+								{
+									Feature: "fake.instance",
+									MatchExpressions: &v1alpha1.MatchExpressionSet{
+										"name": &v1alpha1.MatchExpression{Op: v1alpha1.MatchIn, Value: v1alpha1.MatchValue{"instance_unknown"}},
+									},
+								},
+							},
+						},
+					},
+					MatchFeatures: v1alpha1.FeatureMatcher{
+						{
+							Feature: "fake.attribute",
+							MatchExpressions: &v1alpha1.MatchExpressionSet{
+								"attr_1": &v1alpha1.MatchExpression{Op: v1alpha1.MatchIn, Value: v1alpha1.MatchValue{"true"}},
+							},
+						},
+					},
+				},
+			})
+
+			expectedOutput := buildDefaultExpectedOutput([]ProcessedRuleStatus{
+				{
+					Name:    "fake_6",
+					IsMatch: true,
+					MatchedAny: []MatchAnyElem{
+						{
+							MatchedExpressions: []MatchedExpression{
+								{
+									Feature:     "fake.instance",
+									Name:        "name",
+									Expression:  &v1alpha1.MatchExpression{Op: v1alpha1.MatchIn, Value: v1alpha1.MatchValue{"instance_1"}},
+									MatcherType: MatchExpressionType,
+									IsMatch:     true,
+								},
+							},
+						},
+						{
+							MatchedExpressions: []MatchedExpression{
+								{
+									Feature:     "fake.instance",
+									Name:        "name",
+									Expression:  &v1alpha1.MatchExpression{Op: v1alpha1.MatchIn, Value: v1alpha1.MatchValue{"instance_unknown"}},
+									MatcherType: MatchExpressionType,
+									IsMatch:     false,
+								},
+							},
+						},
+					},
+					MatchedExpressions: []MatchedExpression{
+						{
+							Feature:     "fake.attribute",
+							Name:        "attr_1",
+							Expression:  &v1alpha1.MatchExpression{Op: v1alpha1.MatchIn, Value: v1alpha1.MatchValue{"true"}},
+							MatcherType: MatchExpressionType,
+							IsMatch:     true,
+						},
+					},
+				},
+			})
+
+			assertOutput(ctx, spec, expectedOutput)
+		})
+
 	})
 
 	Convey("With multiple compatibility sets", t, func() {