Merge pull request #2199 from mfranczy/bugfix-image-compatibility

Bugfix: NFR and NFG rules processing

Author: k8s-ci-robot

pkg/apis/nfd/nodefeaturerule/rule.go

@@ -133,7 +133,7 @@ func Execute(r *nfdv1alpha1.Rule, features *nfdv1alpha1.Features, failFast bool)
 
 	maps.Copy(labels, r.Labels)
 	maps.Copy(vars, r.Vars)
-	matchStatus.IsMatch = true
+	matchStatus.IsMatch = isMatch
 
 	ret := RuleOutput{
 		Labels:            labels,
@@ -204,7 +204,7 @@ func ExecuteGroupRule(r *nfdv1alpha1.GroupRule, features *nfdv1alpha1.Features,
 	}
 
 	maps.Copy(vars, r.Vars)
-	matchStatus.IsMatch = true
+	matchStatus.IsMatch = isMatch
 
 	ret := GroupRuleOutput{
 		Vars:        vars,

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

@@ -334,6 +334,12 @@ func TestNodeValidator(t *testing.T) {
 										"name": &v1alpha1.MatchExpression{Op: v1alpha1.MatchIn, Value: v1alpha1.MatchValue{"instance_unknown"}},
 									},
 								},
+								{
+									Feature: "fake.instance",
+									MatchExpressions: &v1alpha1.MatchExpressionSet{
+										"name": &v1alpha1.MatchExpression{Op: v1alpha1.MatchIn, Value: v1alpha1.MatchValue{"instance_1"}},
+									},
+								},
 							},
 						},
 					},
@@ -366,6 +372,13 @@ func TestNodeValidator(t *testing.T) {
 						},
 						{
 							MatchedExpressions: []MatchedExpression{
+								{
+									Feature:     "fake.instance",
+									Name:        "name",
+									Expression:  &v1alpha1.MatchExpression{Op: v1alpha1.MatchIn, Value: v1alpha1.MatchValue{"instance_1"}},
+									MatcherType: MatchExpressionType,
+									IsMatch:     true,
+								},
 								{
 									Feature:     "fake.instance",
 									Name:        "name",