UPSTREAM: <carry>: warn only about unknown feature gates

openshift-rebase(v1.24):source=8d9bda8f24c
openshift · Aug 19, 2022 · f64f7b8 · f64f7b8
1 parent 40eb983
commit f64f7b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/staging/src/k8s.io/component-base/featuregate/feature_gate.go b/staging/src/k8s.io/component-base/featuregate/feature_gate.go
@@ -220,7 +220,8 @@ func (f *featureGate) SetFromMap(m map[string]bool) error {
 		k := Feature(k)
 		featureSpec, ok := known[k]
 		if !ok {
-			return fmt.Errorf("unrecognized feature gate: %s", k)
+			klog.Warningf("unrecognized feature gate: %s", k)
+			continue
 		}
 		if featureSpec.LockToDefault && featureSpec.Default != v {
 			return fmt.Errorf("cannot set feature gate %v to %v, feature is locked to %v", k, v, featureSpec.Default)

diff --git a/staging/src/k8s.io/component-base/featuregate/feature_gate_test.go b/staging/src/k8s.io/component-base/featuregate/feature_gate_test.go
@@ -52,7 +52,7 @@ func TestFeatureGateFlag(t *testing.T) {
 				testAlphaGate: false,
 				testBetaGate:  false,
 			},
-			parseError: "unrecognized feature gate: fooBarBaz",
+			//parseError: "unrecognized feature gate: fooBarBaz",
 		},
 		{
 			arg: "AllAlpha=false",
@@ -356,7 +356,7 @@ func TestFeatureGateSetFromMap(t *testing.T) {
 				testAlphaGate: false,
 				testBetaGate:  false,
 			},
-			setmapError: "unrecognized feature gate:",
+			//setmapError: "unrecognized feature gate:",
 		},
 		{
 			name: "set locked gates",