Skip to content

Commit c8804bf

Browse files
committed
fix: flagz endpoint to return parsed flags value
1 parent 2bc82ac commit c8804bf

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

cmd/kube-apiserver/app/options/completion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (s *ServerRunOptions) Complete(ctx context.Context) (CompletedOptions, erro
5757
if err != nil {
5858
return CompletedOptions{}, err
5959
}
60-
controlplane, err := s.Options.Complete(ctx, s.Flags(), []string{"kubernetes.default.svc", "kubernetes.default", "kubernetes"}, []net.IP{apiServerServiceIP})
60+
controlplane, err := s.Options.Complete(ctx, *s.ParsedFlags, []string{"kubernetes.default.svc", "kubernetes.default", "kubernetes"}, []net.IP{apiServerServiceIP})
6161
if err != nil {
6262
return CompletedOptions{}, err
6363
}

cmd/kube-apiserver/app/options/options.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ type ServerRunOptions struct {
4141
CloudProvider *kubeoptions.CloudProviderOptions
4242

4343
Extra
44+
// ParsedFlags hold the parsed CLI flags.
45+
ParsedFlags *cliflag.NamedFlagSets
4446
}
4547

4648
type Extra struct {
@@ -100,6 +102,9 @@ func NewServerRunOptions() *ServerRunOptions {
100102

101103
// Flags returns flags for a specific APIServer by section name
102104
func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
105+
if s.ParsedFlags != nil {
106+
return *s.ParsedFlags
107+
}
103108
s.Options.AddFlags(&fss)
104109
s.CloudProvider.AddFlags(fss.FlagSet("cloud provider"))
105110

@@ -156,5 +161,6 @@ func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
156161
"The number of apiservers running in the cluster, must be a positive number. (In use when --endpoint-reconciler-type=master-count is enabled.)")
157162
fs.MarkDeprecated("apiserver-count", "apiserver-count is deprecated and will be removed in a future version.")
158163

164+
s.ParsedFlags = &fss
159165
return fss
160166
}

cmd/kube-apiserver/app/options/options_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ func TestAddFlags(t *testing.T) {
335335
CloudConfigFile: "/cloud-config",
336336
CloudProvider: "azure",
337337
},
338+
ParsedFlags: s.ParsedFlags,
338339
}
339340

340341
expected.Authentication.OIDC.UsernameClaim = "sub"

cmd/kube-apiserver/app/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ cluster's shared state through which all other components interact.`,
124124

125125
fs := cmd.Flags()
126126
namedFlagSets := s.Flags()
127+
s.ParsedFlags = &namedFlagSets
127128
verflag.AddFlags(namedFlagSets.FlagSet("global"))
128129
globalflag.AddGlobalFlags(namedFlagSets.FlagSet("global"), cmd.Name(), logs.SkipLoggingConfigurationFlags())
129130
options.AddCustomGlobalFlags(namedFlagSets.FlagSet("generic"))

0 commit comments

Comments
 (0)