From b1167bfba555c685cf6acb1a69eaceb486024ae8 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 29 Oct 2020 13:55:58 +0100 Subject: [PATCH] UPSTREAM: : warn only about unknown feature gates OpenShift-Rebase-Source: a1370096b39 --- staging/src/k8s.io/component-base/featuregate/feature_gate.go | 3 ++- .../k8s.io/component-base/featuregate/feature_gate_test.go | 4 ++-- 2 files changed, 4 insertions(+), 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 index a826b0e67efb..7ff173ee49a8 100644 --- a/staging/src/k8s.io/component-base/featuregate/feature_gate.go +++ b/staging/src/k8s.io/component-base/featuregate/feature_gate.go @@ -224,7 +224,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 index c8537a6a514d..39b1d093be97 100644 --- a/staging/src/k8s.io/component-base/featuregate/feature_gate_test.go +++ b/staging/src/k8s.io/component-base/featuregate/feature_gate_test.go @@ -56,7 +56,7 @@ func TestFeatureGateFlag(t *testing.T) { testAlphaGate: false, testBetaGate: false, }, - parseError: "unrecognized feature gate: fooBarBaz", + //parseError: "unrecognized feature gate: fooBarBaz", }, { arg: "AllAlpha=false", @@ -360,7 +360,7 @@ func TestFeatureGateSetFromMap(t *testing.T) { testAlphaGate: false, testBetaGate: false, }, - setmapError: "unrecognized feature gate:", + //setmapError: "unrecognized feature gate:", }, { name: "set locked gates",