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

Remove Flagz feature-gate check before populating serverRunOptions.Flagz

Browse Source
This commit is contained in:
Richa Banker 2025-02-20 12:41:54 -08:00
parent 052d7a5310
commit d5c804b14d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kube-apiserver/app/server.go
View File

@ -49,7 +49,6 @@ import (
"k8s.io/component-base/term" "k8s.io/component-base/term"
utilversion "k8s.io/component-base/version" utilversion "k8s.io/component-base/version"
"k8s.io/component-base/version/verflag" "k8s.io/component-base/version/verflag"
zpagesfeatures "k8s.io/component-base/zpages/features"
"k8s.io/component-base/zpages/flagz" "k8s.io/component-base/zpages/flagz"
"k8s.io/klog/v2" "k8s.io/klog/v2"
aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver" aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
@ -126,10 +125,8 @@ cluster's shared state through which all other components interact.`,
fs := cmd.Flags() fs := cmd.Flags()
namedFlagSets := s.Flags() namedFlagSets := s.Flags()
if utilfeature.DefaultFeatureGate.Enabled(zpagesfeatures.ComponentFlagz) { s.Flagz = flagz.NamedFlagSetsReader{
s.Flagz = flagz.NamedFlagSetsReader{ FlagSets: namedFlagSets,
FlagSets: namedFlagSets,
}
} }
verflag.AddFlags(namedFlagSets.FlagSet("global")) verflag.AddFlags(namedFlagSets.FlagSet("global"))
globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name(), logs.SkipLoggingConfigurationFlags()) globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name(), logs.SkipLoggingConfigurationFlags())