github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130328 from richabanker/flagsz-apiserver

Browse Source 
Remove Flagz feature-gate check before populating serverRunOptions.Flagz
This commit is contained in:
Kubernetes Prow Robot 2025-02-21 11:36:25 -08:00 committed by GitHub
commit f876a7d469
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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"
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())