Skip to content

Commit b56b36e

Browse files
authored
Merge pull request kubernetes-sigs#1656 from slashpai/fix-wire-flags
chore: remove feature flags unsupported
2 parents 2112ed6 + f7b51dd commit b56b36e

File tree

2 files changed

+4
-29
lines changed

2 files changed

+4
-29
lines changed

cmd/metrics-server/app/options/options.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"k8s.io/client-go/rest"
2828
"k8s.io/client-go/tools/clientcmd"
2929
"k8s.io/component-base/cli/flag"
30+
"k8s.io/component-base/compatibility"
3031
"k8s.io/component-base/logs"
3132
logsapi "k8s.io/component-base/logs/api/v1"
3233
_ "k8s.io/component-base/logs/json/register"
@@ -100,7 +101,7 @@ func (o *Options) Flags() (fs flag.NamedFlagSets) {
100101
// NewOptions constructs a new set of default options for metrics-server.
101102
func NewOptions() *Options {
102103
return &Options{
103-
GenericServerRunOptions: genericoptions.NewServerRunOptions(),
104+
GenericServerRunOptions: genericoptions.NewServerRunOptionsForComponent("metrics server", compatibility.NewComponentGlobalsRegistry()),
104105
SecureServing: genericoptions.NewSecureServingOptions().WithLoopback(),
105106
Authentication: genericoptions.NewDelegatingAuthenticationOptions(),
106107
Authorization: genericoptions.NewDelegatingAuthorizationOptions(),

docs/command-line-flags.txt

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,13 @@ Generic flags:
1616
--emulated-version strings The versions different components emulate their capabilities (APIs, features, ...) of.
1717
If set, the component will emulate the behavior of this version instead of the underlying binary version.
1818
Version format could only be major.minor, for example: '--emulated-version=wardle=1.2,kube=1.31'.
19-
Options are: kube=1.31..1.33(default:1.33)
19+
Options are:
2020
If the component is not specified, defaults to "kube"
2121
--emulation-forward-compatible If true, for any beta+ APIs enabled by default or by --runtime-config at the emulation version, their future versions with higher priority/stability will be auto enabled even if they introduced after the emulation version. Can only be set to true if the emulation version is lower than the binary version.
2222
--external-hostname string The hostname to use when generating externalized URLs for this master (e.g. Swagger API Docs or OpenID Discovery).
2323
--feature-gates colonSeparatedMultimapStringString Comma-separated list of component:key=value pairs that describe feature gates for alpha/experimental features of different components.
2424
If the component is not specified, defaults to "kube". This flag can be repeatedly invoked. For example: --feature-gates 'wardle:featureA=true,wardle:featureB=false' --feature-gates 'kube:featureC=true'Options are:
25-
kube:APIResponseCompression=true|false (BETA - default=true)
26-
kube:APIServerIdentity=true|false (BETA - default=true)
27-
kube:APIServerTracing=true|false (BETA - default=true)
28-
kube:APIServingWithRoutine=true|false (ALPHA - default=false)
29-
kube:AllAlpha=true|false (ALPHA - default=false)
30-
kube:AllBeta=true|false (BETA - default=false)
31-
kube:AllowParsingUserUIDFromCertAuth=true|false (BETA - default=true)
32-
kube:AllowUnsafeMalformedObjectDeletion=true|false (ALPHA - default=false)
33-
kube:AnonymousAuthConfigurableEndpoints=true|false (BETA - default=true)
34-
kube:AuthorizeWithSelectors=true|false (BETA - default=true)
35-
kube:CBORServingAndStorage=true|false (ALPHA - default=false)
36-
kube:ConcurrentWatchObjectDecode=true|false (BETA - default=false)
37-
kube:ConsistentListFromCache=true|false (BETA - default=true)
38-
kube:CoordinatedLeaderElection=true|false (BETA - default=false)
39-
kube:ListFromCacheSnapshot=true|false (ALPHA - default=false)
40-
kube:MutatingAdmissionPolicy=true|false (ALPHA - default=false)
41-
kube:OpenAPIEnums=true|false (BETA - default=true)
42-
kube:RemoteRequestHeaderUID=true|false (BETA - default=true)
43-
kube:ResilientWatchCacheInitialization=true|false (BETA - default=true)
44-
kube:StorageVersionAPI=true|false (ALPHA - default=false)
45-
kube:StorageVersionHash=true|false (BETA - default=true)
46-
kube:StreamingCollectionEncodingToJSON=true|false (BETA - default=true)
47-
kube:StreamingCollectionEncodingToProtobuf=true|false (BETA - default=true)
48-
kube:StructuredAuthenticationConfiguration=true|false (BETA - default=true)
49-
kube:UnauthenticatedHTTP2DOSMitigation=true|false (BETA - default=true)
50-
kube:WatchCacheInitializationPostStartHook=true|false (BETA - default=false)
51-
kube:WatchList=true|false (BETA - default=false)
25+
5226
--goaway-chance float To prevent HTTP/2 clients from getting stuck on a single apiserver, randomly close a connection (GOAWAY). The client's other in-flight requests won't be affected, and the client will reconnect, likely landing on a different apiserver after going through the load balancer again. This argument sets the fraction of requests that will be sent a GOAWAY. Clusters with single apiservers, or which don't use a load balancer, should NOT enable this. Min is 0 (off), Max is .02 (1/50 requests); .001 (1/1000) is a recommended starting point.
5327
--livez-grace-period duration This option represents the maximum amount of time it should take for apiserver to complete its startup sequence and become live. From apiserver's start time to when this amount of time has elapsed, /livez will assume that unfinished post-start hooks will complete successfully and therefore return true.
5428
--max-mutating-requests-inflight int This and --max-requests-inflight are summed to determine the server's total concurrency limit (which must be positive) if --enable-priority-and-fairness is true. Otherwise, this flag limits the maximum number of mutating requests in flight, or a zero value disables the limit completely. (default 200)

0 commit comments

Comments
 (0)