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-master: add validation of label names and values

Browse source 
Validate labels before trying to update the node. Makes us fail early
nad prevent useless retries in case invalid labels are tried.

(backported from commit 2a3c7e4c93)
This commit is contained in:
Markus Lehtonen 2023-05-31 14:39:18 +03:00
parent 2a53941c90
commit 7b53ea1d1d
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/nfd-master/nfd-master-internal_test.go
View file

@ -361,8 +361,10 @@ func TestSetLabels(t *testing.T) {
mockLabels := map[string]string{"feature-1": "val-1",
"valid.ns/feature-2": "val-2",
"invalid.ns/feature-3": "val-3",
vendorFeatureLabel: " val-4",
vendorProfileLabel: " val-5"}
vendorFeatureLabel: "val-4",
vendorProfileLabel: "val-5",
"--invalid-name--": "valid-val",
"valid-name": "--invalid-val--"}
expectedPatches := []apihelper.JsonPatch{
apihelper.NewJsonPatch("add", "/metadata/annotations", instance+"."+nfdv1alpha1.WorkerVersionAnnotation, workerVer),
apihelper.NewJsonPatch("add", "/metadata/annotations",

13
pkg/nfd-master/nfd-master.go
View file

@ -38,6 +38,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"
label "k8s.io/apimachinery/pkg/labels"
k8svalidation "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
"k8s.io/klog/v2"
@ -409,6 +410,12 @@ func filterFeatureLabels(labels Labels, extraLabelNs map[string]struct{}, labelW
// Add possibly missing default ns
label := addNs(label, nfdv1alpha1.FeatureLabelNs)
//Validate label name
if errs := k8svalidation.IsQualifiedName(label); len(errs) > 0 {
klog.Errorf("ignoring label %q, invalid name: %s", label, strings.Join(errs, "; "))
continue
}
ns, name := splitNs(label)
// Check label namespace, filter out if ns is not whitelisted
@ -425,6 +432,12 @@ func filterFeatureLabels(labels Labels, extraLabelNs map[string]struct{}, labelW
klog.Errorf("%s (%s) does not match the whitelist (%s) and will not be published.", name, label, labelWhiteList.String())
continue
}
// Validate the label value
if errs := k8svalidation.IsValidLabelValue(value); len(errs) > 0 {
klog.Errorf("ignoring label %q, invalid value %q: %s", label, value, strings.Join(errs, "; "))
continue
}
outLabels[label] = value
}