github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 04:27:54 +00:00
Code Issues Projects Releases Wiki Activity

panic in featuregate if a requested feature is unknown

Browse Source
This commit is contained in:
David Eads 2019-11-06 14:47:15 -05:00
parent a89265b441
commit c6d2c37ad2
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/component-base/featuregate/BUILD
View File

@ -7,6 +7,7 @@ go_library(
importpath = "k8s.io/component-base/featuregate", importpath = "k8s.io/component-base/featuregate",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
"//staging/src/k8s.io/apimachinery/pkg/util/naming:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/klog:go_default_library",
], ],

23
staging/src/k8s.io/component-base/featuregate/feature_gate.go
View File

@ -25,6 +25,8 @@ import (
"sync/atomic" "sync/atomic"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"k8s.io/apimachinery/pkg/util/naming"
"k8s.io/klog" "k8s.io/klog"
) )
@ -103,6 +105,8 @@ type MutableFeatureGate interface {
// featureGate implements FeatureGate as well as pflag.Value for flag parsing. // featureGate implements FeatureGate as well as pflag.Value for flag parsing.
type featureGate struct { type featureGate struct {
featureGateName string
special map[Feature]func(map[Feature]FeatureSpec, map[Feature]bool, bool) special map[Feature]func(map[Feature]FeatureSpec, map[Feature]bool, bool)
// lock guards writes to known, enabled, and reads/writes of closed // lock guards writes to known, enabled, and reads/writes of closed
@ -128,6 +132,10 @@ func setUnsetAlphaGates(known map[Feature]FeatureSpec, enabled map[Feature]bool,
// Set, String, and Type implement pflag.Value // Set, String, and Type implement pflag.Value
var _ pflag.Value = &featureGate{} var _ pflag.Value = &featureGate{}
// internalPackages are packages that ignored when creating a name for featureGates. These packages are in the common
// call chains, so they'd be unhelpful as names.
var internalPackages = []string{"k8s.io/component-base/featuregate/feature_gate.go"}
func NewFeatureGate() *featureGate { func NewFeatureGate() *featureGate {
known := map[Feature]FeatureSpec{} known := map[Feature]FeatureSpec{}
for k, v := range defaultFeatures { for k, v := range defaultFeatures {
@ -142,9 +150,10 @@ func NewFeatureGate() *featureGate {
enabledValue.Store(enabled) enabledValue.Store(enabled)
f := &featureGate{ f := &featureGate{
known: knownValue, featureGateName: naming.GetNameFromCallsite(internalPackages...),
special: specialFeatures, known: knownValue,
enabled: enabledValue, special: specialFeatures,
enabled: enabledValue,
} }
return f return f
} }
@ -263,12 +272,16 @@ func (f *featureGate) Add(features map[Feature]FeatureSpec) error {
return nil return nil
} }
// Enabled returns true if the key is enabled. // Enabled returns true if the key is enabled. If the key is not known, this call will panic.
func (f *featureGate) Enabled(key Feature) bool { func (f *featureGate) Enabled(key Feature) bool {
if v, ok := f.enabled.Load().(map[Feature]bool)[key]; ok { if v, ok := f.enabled.Load().(map[Feature]bool)[key]; ok {
return v return v
} }
return f.known.Load().(map[Feature]FeatureSpec)[key].Default if v, ok := f.known.Load().(map[Feature]FeatureSpec)[key]; ok {
return v.Default
}
panic(fmt.Errorf("feature %q is not registered in FeatureGate %q", key, f.featureGateName))
} }
// AddFlag adds a flag for setting global feature gates to the specified FlagSet. // AddFlag adds a flag for setting global feature gates to the specified FlagSet.