Merge pull request #2114 from fmuyassarov/ns-drop

Enable unprefixed label setting via feature gate

Author: k8s-ci-robot

docs/reference/feature-gates.md

@@ -55,8 +55,7 @@ to `false`, a NodeFeatureRule with
     foo: bar
 ```
 
-will turn into `feature.node.kubernetes.io/foo=bar` node label. With
-`DisableAutoPrefix` set to `true`, no prefix is added and the label will be
-filtered out.
-
-Note that taint keys are not affected by this feature gate.
+will be automatically prefixed, resulting in the node label
+`feature.node.kubernetes.io/foo=bar`. However, when `DisableAutoPrefix` is set
+to `true`, no prefix is added, and the label remains as `foo=bar`. Note that
+taint keys are not affected by this feature gate.

pkg/nfd-master/nfd-master-internal_test.go

@@ -134,6 +134,33 @@ func newFakeMaster(opts ...NfdMasterOption) *nfdMaster {
 	return m.(*nfdMaster)
 }
 
+func newFakeMasterWithFeatureGate(opts ...NfdMasterOption) *nfdMaster {
+	nfdCli := fakenfdclient.NewSimpleClientset()
+	defaultOpts := []NfdMasterOption{
+		withNodeName(testNodeName),
+		withConfig(&NFDConfig{Restrictions: Restrictions{AllowOverwrite: true}}),
+		WithKubernetesClient(fakeclient.NewSimpleClientset()),
+		withNFDClient(nfdCli),
+	}
+	m, err := NewNfdMaster(append(defaultOpts, opts...)...)
+	if err != nil {
+		panic(err)
+	}
+	// Add FeatureGates
+	if err := features.NFDMutableFeatureGate.Add(features.DefaultNFDFeatureGates); err != nil {
+		panic(err)
+	}
+	if err := features.NFDMutableFeatureGate.Set("DisableAutoPrefix=true"); err != nil {
+		panic(err)
+	}
+	// Enable DisableAutoPrefix feature gate
+	if !features.NFDFeatureGate.Enabled(features.DisableAutoPrefix) {
+		err = errors.New("DisableAutoPrefix feature gate is not enabled")
+		panic(err)
+	}
+	return m.(*nfdMaster)
+}
+
 func TestUpdateNodeObject(t *testing.T) {
 	Convey("When I update the node using fake client", t, func() {
 		featureLabels := map[string]string{
@@ -432,6 +459,28 @@ func TestFilterLabels(t *testing.T) {
 			}
 		})
 	}
+	// Create a new fake master with the feature gate enabled
+	fakeMaster = newFakeMasterWithFeatureGate()
+	tcs = []TC{
+		{
+			description:   "Unprefixed should be allowed",
+			labelName:     "test-label",
+			labelValue:    "test-value",
+			expectedValue: "test-value",
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.description, func(t *testing.T) {
+			labelValue, err := fakeMaster.filterFeatureLabel(tc.labelName, tc.labelValue, &tc.features)
+
+			Convey("Label should not be filtered out", t, func() {
+				So(err, ShouldBeNil)
+			})
+			Convey("Label value should be correct", t, func() {
+				So(labelValue, ShouldEqual, tc.expectedValue)
+			})
+		})
+	}
 }
 
 func TestCreatePatches(t *testing.T) {

pkg/nfd-master/nfd-master.go

@@ -485,7 +485,6 @@ func (m *nfdMaster) filterFeatureLabels(labels Labels, features *nfdv1alpha1.Fea
 
 	return outLabels
 }
-
 func (m *nfdMaster) filterFeatureLabel(name, value string, features *nfdv1alpha1.Features) (string, error) {
 	// Check if Value is dynamic
 	var filteredValue string
@@ -507,7 +506,9 @@ func (m *nfdMaster) filterFeatureLabel(name, value string, features *nfdv1alpha1
 			return "", fmt.Errorf("namespace %q is not allowed", ns)
 		}
 	} else if err != nil {
-		return "", err
+		if !nfdfeatures.NFDFeatureGate.Enabled(nfdfeatures.DisableAutoPrefix) || err != validate.ErrUnprefixedKeysNotAllowed {
+			return "", err
+		}
 	}
 
 	// Skip if label doesn't match labelWhiteList