@@ -154,8 +146,6 @@ func (s *APIServer) AddFlags(fs *pflag.FlagSet) {
s.ServerRunOptions.AddFlags(fs)
// Note: the weird ""+ in below lines seems to be the only way to get gofmt to
// arrange these text blocks sensibly. Grrr.
fs.StringVar(&s.APIPrefix,"api-prefix",s.APIPrefix,"The prefix for API requests on the server. Default '/api'.")
fs.MarkDeprecated("api-prefix","--api-prefix is deprecated and will be removed when the v1 API is retired.")
fs.StringVar(&s.DeprecatedStorageVersion,"storage-version",s.DeprecatedStorageVersion,"The version to store the legacy v1 resources with. Defaults to server preferred")
fs.MarkDeprecated("storage-version","--storage-version is deprecated and will be removed when the v1 API is retired. See --storage-versions instead.")
fs.StringVar(&s.StorageVersions,"storage-versions",s.StorageVersions,"The per-group version to store resources in. "+
...
...
@@ -163,8 +153,6 @@ func (s *APIServer) AddFlags(fs *pflag.FlagSet) {
"In the case where objects are moved from one group to the other, you may specify the format \"group1=group2/v1beta1,group3/v1beta1,...\". "+
"You only need to pass the groups you wish to change from the defaults. "+
"It defaults to a list of preferred versions of all registered groups, which is derived from the KUBE_API_VERSIONS environment variable.")
fs.StringVar(&s.CloudProvider,"cloud-provider",s.CloudProvider,"The provider for cloud services. Empty string for no provider.")
fs.StringVar(&s.CloudConfigFile,"cloud-config",s.CloudConfigFile,"The path to the cloud provider configuration file. Empty string for no configuration file.")
fs.DurationVar(&s.EventTTL,"event-ttl",s.EventTTL,"Amount of time to retain events. Default 1 hour.")
fs.StringVar(&s.BasicAuthFile,"basic-auth-file",s.BasicAuthFile,"If set, the file that will be used to admit requests to the secure port of the API server via http basic authentication.")
fs.StringVar(&s.TokenAuthFile,"token-auth-file",s.TokenAuthFile,"If set, the file that will be used to secure the secure port of the API server via token authentication.")
...
...
@@ -183,15 +171,7 @@ func (s *APIServer) AddFlags(fs *pflag.FlagSet) {
fs.StringVar(&s.AuthorizationConfig.WebhookConfigFile,"authorization-webhook-config-file",s.AuthorizationConfig.WebhookConfigFile,"File with webhook configuration in kubeconfig format, used with --authorization-mode=Webhook. The API server will query the remote service to determine access on the API server's secure port.")
fs.StringVar(&s.AdmissionControl,"admission-control",s.AdmissionControl,"Ordered list of plug-ins to do admission control of resources into cluster. Comma-delimited list of: "+strings.Join(admission.GetPlugins(),", "))
fs.StringVar(&s.AdmissionControlConfigFile,"admission-control-config-file",s.AdmissionControlConfigFile,"File with admission control configuration.")
fs.StringVar(&s.StorageConfig.Type,"storage-backend",s.StorageConfig.Type,"The storage backend for persistence. Options: 'etcd2' (default), 'etcd3'.")
fs.StringSliceVar(&s.StorageConfig.ServerList,"etcd-servers",s.StorageConfig.ServerList,"List of etcd servers to connect with (http://ip:port), comma separated.")
fs.StringSliceVar(&s.EtcdServersOverrides,"etcd-servers-overrides",s.EtcdServersOverrides,"Per-resource etcd servers overrides, comma separated. The individual override format: group/resource#servers, where servers are http://ip:port, semicolon separated.")
fs.StringVar(&s.StorageConfig.Prefix,"etcd-prefix",s.StorageConfig.Prefix,"The prefix for all resource paths in etcd.")
fs.StringVar(&s.StorageConfig.KeyFile,"etcd-keyfile",s.StorageConfig.KeyFile,"SSL key file used to secure etcd communication")
fs.StringVar(&s.StorageConfig.CertFile,"etcd-certfile",s.StorageConfig.CertFile,"SSL certification file used to secure etcd communication")
fs.StringVar(&s.StorageConfig.CAFile,"etcd-cafile",s.StorageConfig.CAFile,"SSL Certificate Authority file used to secure etcd communication")
fs.BoolVar(&s.StorageConfig.Quorum,"etcd-quorum-read",s.StorageConfig.Quorum,"If true, enable quorum read")
fs.IntVar(&s.StorageConfig.DeserializationCacheSize,"deserialization-cache-size",s.StorageConfig.DeserializationCacheSize,"Number of deserialized json objects to cache in memory.")
fs.StringVar(&s.MasterServiceNamespace,"master-service-namespace",s.MasterServiceNamespace,"The namespace from which the kubernetes master services should be injected into pods")
fs.IntVar(&s.DeleteCollectionWorkers,"delete-collection-workers",s.DeleteCollectionWorkers,"Number of workers spawned for DeleteCollection call. These are used to speed up namespace cleanup.")
@@ -100,8 +108,21 @@ func (s *ServerRunOptions) AddFlags(fs *pflag.FlagSet) {
"If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored.")
fs.StringVar(&s.ClientCAFile,"client-ca-file",s.ClientCAFile,"If set, any request presenting a client certificate signed by one of the authorities in the client-ca-file is authenticated with an identity corresponding to the CommonName of the client certificate.")
fs.StringVar(&s.CloudProvider,"cloud-provider",s.CloudProvider,"The provider for cloud services. Empty string for no provider.")
fs.StringVar(&s.CloudConfigFile,"cloud-config",s.CloudConfigFile,"The path to the cloud provider configuration file. Empty string for no configuration file.")
fs.StringSliceVar(&s.CorsAllowedOriginList,"cors-allowed-origins",s.CorsAllowedOriginList,"List of allowed origins for CORS, comma separated. An allowed origin can be a regular expression to support subdomain matching. If this list is empty CORS will not be enabled.")
fs.StringVar(&s.StorageConfig.Type,"storage-backend",s.StorageConfig.Type,"The storage backend for persistence. Options: 'etcd2' (default), 'etcd3'.")
fs.StringSliceVar(&s.StorageConfig.ServerList,"etcd-servers",s.StorageConfig.ServerList,"List of etcd servers to connect with (http://ip:port), comma separated.")
fs.StringVar(&s.StorageConfig.Prefix,"etcd-prefix",s.StorageConfig.Prefix,"The prefix for all resource paths in etcd.")
fs.StringVar(&s.StorageConfig.KeyFile,"etcd-keyfile",s.StorageConfig.KeyFile,"SSL key file used to secure etcd communication")
fs.StringVar(&s.StorageConfig.CertFile,"etcd-certfile",s.StorageConfig.CertFile,"SSL certification file used to secure etcd communication")
fs.StringVar(&s.StorageConfig.CAFile,"etcd-cafile",s.StorageConfig.CAFile,"SSL Certificate Authority file used to secure etcd communication")
fs.BoolVar(&s.StorageConfig.Quorum,"etcd-quorum-read",s.StorageConfig.Quorum,"If true, enable quorum read")
fs.IntVar(&s.StorageConfig.DeserializationCacheSize,"deserialization-cache-size",s.StorageConfig.DeserializationCacheSize,"Number of deserialized json objects to cache in memory.")
fs.BoolVar(&s.EnableProfiling,"profiling",s.EnableProfiling,"Enable profiling via web interface host:port/debug/pprof/")
fs.BoolVar(&s.EnableSwaggerUI,"enable-swagger-ui",s.EnableSwaggerUI,"Enables swagger ui on the apiserver at /swagger-ui")
