mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 14:37:00 +00:00
Remove Flagz feature-gate check before populating serverRunOptions.Flagz
This commit is contained in:
parent
052d7a5310
commit
d5c804b14d
@ -49,7 +49,6 @@ import (
|
||||
"k8s.io/component-base/term"
|
||||
utilversion "k8s.io/component-base/version"
|
||||
"k8s.io/component-base/version/verflag"
|
||||
zpagesfeatures "k8s.io/component-base/zpages/features"
|
||||
"k8s.io/component-base/zpages/flagz"
|
||||
"k8s.io/klog/v2"
|
||||
aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
|
||||
@ -126,10 +125,8 @@ cluster's shared state through which all other components interact.`,
|
||||
|
||||
fs := cmd.Flags()
|
||||
namedFlagSets := s.Flags()
|
||||
if utilfeature.DefaultFeatureGate.Enabled(zpagesfeatures.ComponentFlagz) {
|
||||
s.Flagz = flagz.NamedFlagSetsReader{
|
||||
FlagSets: namedFlagSets,
|
||||
}
|
||||
s.Flagz = flagz.NamedFlagSetsReader{
|
||||
FlagSets: namedFlagSets,
|
||||
}
|
||||
verflag.AddFlags(namedFlagSets.FlagSet("global"))
|
||||
globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name(), logs.SkipLoggingConfigurationFlags())
|
||||
|
Loading…
Reference in New Issue
Block a user