mirrors/node-feature-discovery
mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-15 04:57:56 +00:00
Code Activity

apis/nfd: fix templates with MatchAny only

Browse source 
Signed-off-by: Viktor Oreshkin <imselfish@stek29.rocks>
This commit is contained in:
Viktor Oreshkin 2022-08-22 02:29:50 +03:00 • committed by k8s-infra-cherrypick-robot
parent 18c314df68
commit 88199edea8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/apis/nfd/v1alpha1/rule.go
View file

@ -50,11 +50,13 @@ func (r *Rule) Execute(features feature.Features) (RuleOutput, error) {
matched = true matched = true
utils.KlogDump(4, "matches for matchAny "+r.Name, " ", matches) utils.KlogDump(4, "matches for matchAny "+r.Name, " ", matches)
if r.labelsTemplate == nil { if r.LabelsTemplate == "" && r.VarsTemplate == "" {
// No templating so we stop here (further matches would just // there's no need to evaluate other matchers in MatchAny
// produce the same labels) // if there are no templates to be executed on them - so
// short-circuit and stop on first match here
break break
} }
if err := r.executeLabelsTemplate(matches, labels); err != nil { if err := r.executeLabelsTemplate(matches, labels); err != nil {
return RuleOutput{}, err return RuleOutput{}, err
} }