mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2024-12-14 11:57:51 +00:00
Code Activity

nfd-worker: drop 'custom-' prefix from matchFeatures custom rules

Browse source 
Do not prefix label names from the new matchFeatures/matchAny custom
rules with "custom-". We want to have the same result (set of labels)
from a rule independent of whether it has been specified in worker
config or in a NodeFeatureRule CRs. Legacy matchOn rules (not available
in NodeFeatureRule CRs) are intact, i.e. still prefixed, in order to
retain backwards compatibility.
This commit is contained in:
Markus Lehtonen 2021-12-09 21:25:28 +02:00
parent afe07d6e19
commit bf01875368
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/nfd-client/worker/nfd-worker.go
View file

@ -498,8 +498,8 @@ func getFeatureLabels(source source.LabelSource, labelWhiteList regexp.Regexp) (
// Prefix for labels in the default namespace
prefix := source.Name() + "-"
switch source.Name() {
case "local":
// Do not prefix labels from the hooks
case "local", "custom":
// Do not prefix labels from the custom rules, hooks or feature files
prefix = ""
}

9
source/custom/custom.go
View file

@ -171,11 +171,18 @@ func (r *LegacyRule) execute(features map[string]*feature.DomainFeatures) (map[s
}
}
// Prefix non-namespaced labels with "custom-"
name := r.Name
if !strings.Contains(name, "/") {
name = "custom-" + name
}
value := "true"
if r.Value != nil {
value = *r.Value
}
return map[string]string{r.Name: value}, nil
return map[string]string{name: value}, nil
}
func (m *LegacyMatcher) match() (bool, error) {