55f802b72a
Automatic merge from submit-queue Delete "hard-coded" default value in flags usage. **What this PR does / why we need it**: Some flags of kubernetes components have "hard-coded" default values in their usage info. In fact, [pflag pkg](https://github.com/kubernetes/kubernetes/blob/master/vendor/github.com/spf13/pflag/flag.go#L602-L608) has already added a string `(default value)` automatically in the usage info if the flag is initialized. Then we don't need to hard-code the default value in usage info. After this PR, if we want to update the default value of a flag, we only need to update the flag where it is initialized. `pflag` will update the usage info for us. This will avoid inconsistency. For example: Before ``` kubelet -h ... --node-status-update-frequency duration Specifies how often kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller. Default: 10s (default 10s) ... ``` After ``` kubelet -h ... --node-status-update-frequency duration Specifies how often kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller. (default 10s) ... ``` **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: This PR doesn't delete some "hard-coded" default values because they are not explicitly initialized. We still need to hard-code them to give users friendly info. ``` --allow-privileged If true, allow containers to request privileged mode. [default=false] ``` **Release note**: ```release-note None ```
95 lines
3.6 KiB
Go
95 lines
3.6 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
// Package options contains flags and options for initializing federation-apiserver.
|
|
package options
|
|
|
|
import (
|
|
"time"
|
|
|
|
genericoptions "k8s.io/apiserver/pkg/server/options"
|
|
"k8s.io/apiserver/pkg/storage/storagebackend"
|
|
"k8s.io/kubernetes/pkg/api"
|
|
kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
|
|
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
|
|
|
|
// add the kubernetes feature gates
|
|
_ "k8s.io/kubernetes/pkg/features"
|
|
|
|
"github.com/spf13/pflag"
|
|
)
|
|
|
|
// Runtime options for the federation-apiserver.
|
|
type ServerRunOptions struct {
|
|
GenericServerRunOptions *genericoptions.ServerRunOptions
|
|
Etcd *genericoptions.EtcdOptions
|
|
SecureServing *genericoptions.SecureServingOptions
|
|
InsecureServing *kubeoptions.InsecureServingOptions
|
|
Audit *genericoptions.AuditLogOptions
|
|
Features *genericoptions.FeatureOptions
|
|
Admission *genericoptions.AdmissionOptions
|
|
Authentication *kubeoptions.BuiltInAuthenticationOptions
|
|
Authorization *kubeoptions.BuiltInAuthorizationOptions
|
|
CloudProvider *kubeoptions.CloudProviderOptions
|
|
StorageSerialization *kubeoptions.StorageSerializationOptions
|
|
APIEnablement *kubeoptions.APIEnablementOptions
|
|
|
|
EventTTL time.Duration
|
|
}
|
|
|
|
// NewServerRunOptions creates a new ServerRunOptions object with default values.
|
|
func NewServerRunOptions() *ServerRunOptions {
|
|
s := ServerRunOptions{
|
|
GenericServerRunOptions: genericoptions.NewServerRunOptions(),
|
|
Etcd: genericoptions.NewEtcdOptions(storagebackend.NewDefaultConfig(kubeoptions.DefaultEtcdPathPrefix, api.Scheme, nil)),
|
|
SecureServing: kubeoptions.NewSecureServingOptions(),
|
|
InsecureServing: kubeoptions.NewInsecureServingOptions(),
|
|
Audit: genericoptions.NewAuditLogOptions(),
|
|
Features: genericoptions.NewFeatureOptions(),
|
|
Admission: genericoptions.NewAdmissionOptions(&kubeapiserveradmission.Plugins),
|
|
Authentication: kubeoptions.NewBuiltInAuthenticationOptions().WithAll(),
|
|
Authorization: kubeoptions.NewBuiltInAuthorizationOptions(),
|
|
CloudProvider: kubeoptions.NewCloudProviderOptions(),
|
|
StorageSerialization: kubeoptions.NewStorageSerializationOptions(),
|
|
APIEnablement: kubeoptions.NewAPIEnablementOptions(),
|
|
|
|
EventTTL: 1 * time.Hour,
|
|
}
|
|
// Overwrite the default for storage data format.
|
|
s.Etcd.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf"
|
|
return &s
|
|
}
|
|
|
|
// AddFlags adds flags for ServerRunOptions fields to be specified via FlagSet.
|
|
func (s *ServerRunOptions) AddFlags(fs *pflag.FlagSet) {
|
|
// Add the generic flags.
|
|
s.GenericServerRunOptions.AddUniversalFlags(fs)
|
|
s.Etcd.AddFlags(fs)
|
|
s.SecureServing.AddFlags(fs)
|
|
s.InsecureServing.AddFlags(fs)
|
|
s.Audit.AddFlags(fs)
|
|
s.Features.AddFlags(fs)
|
|
s.Authentication.AddFlags(fs)
|
|
s.Authorization.AddFlags(fs)
|
|
s.CloudProvider.AddFlags(fs)
|
|
s.StorageSerialization.AddFlags(fs)
|
|
s.APIEnablement.AddFlags(fs)
|
|
s.Admission.AddFlags(fs)
|
|
|
|
fs.DurationVar(&s.EventTTL, "event-ttl", s.EventTTL,
|
|
"Amount of time to retain events.")
|
|
}
|