Fix templates for NodeFeatureRule with MatchAny

[stek29]

When MatchAny is matched, template existence is checked with r.labelsTemplate == nil, and if it's nil - templating is skipped.

This is wrong because:

• there are vars templates too, not only labels templates
• labelsTemplate is initialized from LabelsTemplate when executeLabelsTemplate is called first time, so it would always be nil unless Rule has MatchFeatures in addition to MatchAny, and was executed already.

LabelsTemplate should be checked instead of labelsTemplate (same for vars) to see if there's template – but executeLabelsTemplate already does that.

So the check should be removed completely.

I've also added a test case which catches this issue.

Fixes #864.

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: stek29 / name: Viktor Oreshkin (4375e08, 5a30dd0)

[k8s-ci-robot]

Welcome @stek29!

It looks like this is your first PR to kubernetes-sigs/node-feature-discovery 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/node-feature-discovery has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[k8s-ci-robot]

Hi @stek29. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[marquiz]

Wov, thanks for the patch @stek29! This is indeed broken. And great that you updated the unit tests, too 👍

I had one suggestion, though.

/ok-to-test

[marquiz]

It is still useful to check if the templates have been defined. If there would be 10 items under MatchAny and the first matches (and no templates are specified) there is no use to evaluate the 9 remaining items.

My suggestion to change/fix this instead

                                if r.LabelsTemplate == "" && r.VarsTemplate == "" {
                                        // No templating so we stop here (further matches would just
                                        // produce the same labels / vars)
                                        break
                                }

[stek29]

sure, will do

[marquiz]

...and seems that somebody's really using the templating functionality 😊

/cherry-pick release-0.11

[k8s-infra-cherrypick-robot]

@marquiz: once the present PR merges, I will cherry-pick it on top of release-0.11 in a new PR and assign it to you.

In response to this:

...and seems that somebody's really using the templating functionality 😊

/cherry-pick release-0.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[ArangoGutierrez]

PING @stek29

[marquiz]

Looks good to me now 👌

[ArangoGutierrez]

/lgtm

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ArangoGutierrez, marquiz, stek29

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [marquiz]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[k8s-infra-cherrypick-robot]

@marquiz: new pull request created: #872

In response to this:

...and seems that somebody's really using the templating functionality 😊

/cherry-pick release-0.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.