@@ -183,14 +183,15 @@ 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.StringSliceVar(&s.EtcdConfig.ServerList,"etcd-servers",s.EtcdConfig.ServerList,"List of etcd servers to watch (http://ip:port), comma separated.")
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.EtcdConfig.Prefix,"etcd-prefix",s.EtcdConfig.Prefix,"The prefix for all resource paths in etcd.")
fs.StringVar(&s.EtcdConfig.KeyFile,"etcd-keyfile",s.EtcdConfig.KeyFile,"SSL key file used to secure etcd communication")
fs.StringVar(&s.EtcdConfig.CertFile,"etcd-certfile",s.EtcdConfig.CertFile,"SSL certification file used to secure etcd communication")
fs.StringVar(&s.EtcdConfig.CAFile,"etcd-cafile",s.EtcdConfig.CAFile,"SSL Certificate Authority file used to secure etcd communication")
fs.BoolVar(&s.EtcdConfig.Quorum,"etcd-quorum-read",s.EtcdConfig.Quorum,"If true, enable quorum read")
fs.IntVar(&s.EtcdConfig.DeserializationCacheSize,"deserialization-cache-size",s.EtcdConfig.DeserializationCacheSize,"Number of deserialized json objects to cache in memory.")
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.")
--etcd-keyfile="": SSL key file used to secure etcd communication
--etcd-prefix="/registry": The prefix for all resource paths in etcd.
--etcd-quorum-read[=false]: If true, enable quorum read
--etcd-servers=[]: List of etcd servers to watch (http://ip:port), comma separated.
--etcd-servers=[]: List of etcd servers to connect with (http://ip:port), comma separated.
--etcd-servers-overrides=[]: Per-resource etcd servers overrides, comma separated. The individual override format: group/resource#servers, where servers are http://ip:port, semicolon separated.
--event-ttl=1h0m0s: Amount of time to retain events. Default 1 hour.
--experimental-keystone-url="": If passed, activates the keystone authentication plugin
...
...
@@ -109,6 +109,7 @@ kube-apiserver
--service-node-port-range=: A port range to reserve for services with NodePort visibility. Example: '30000-32767'. Inclusive at both ends of the range.
--ssh-keyfile="": If non-empty, use secure SSH proxy to the nodes, using this user keyfile
--ssh-user="": If non-empty, use secure SSH proxy to the nodes, using this user name
--storage-backend="": The storage backend for persistence. Options: 'etcd2' (default), 'etcd3'.
--storage-versions="apps/v1alpha1,authorization.k8s.io/v1beta1,autoscaling/v1,batch/v1,componentconfig/v1alpha1,extensions/v1beta1,metrics/v1alpha1,v1": The per-group version to store resources in. Specified in the format "group1/version1,group2/version2,...". 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.
--tls-cert-file="": File containing x509 Certificate for HTTPS. (CA cert, if any, concatenated after server cert). If HTTPS serving is enabled, and --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to /var/run/kubernetes.
--watch-cache-sizes=[]: List of watch cache sizes for every resource (pods, nodes, etc.), comma separated. The individual override format: resource#size, where size is a number. It takes effect when watch-cache is enabled.
```
###### Auto generated by spf13/cobra on 16-Apr-2016
###### Auto generated by spf13/cobra on 28-Apr-2016
@@ -234,13 +234,14 @@ 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.StringSliceVar(&s.EtcdConfig.ServerList,"etcd-servers",s.EtcdConfig.ServerList,"List of etcd servers to watch (http://ip:port), comma separated.")
fs.StringVar(&s.StorageConfig.Type,"storage-backend",s.StorageConfig.Type,"The storage backend for persistence. Options: 'etcd2', 'etcd3'.")
fs.StringSliceVar(&s.StorageConfig.ServerList,"etcd-servers",s.StorageConfig.ServerList,"List of etcd servers to watch (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.EtcdConfig.Prefix,"etcd-prefix",s.EtcdConfig.Prefix,"The prefix for all resource paths in etcd.")
fs.StringVar(&s.EtcdConfig.KeyFile,"etcd-keyfile",s.EtcdConfig.KeyFile,"SSL key file used to secure etcd communication")
fs.StringVar(&s.EtcdConfig.CertFile,"etcd-certfile",s.EtcdConfig.CertFile,"SSL certification file used to secure etcd communication")
fs.StringVar(&s.EtcdConfig.CAFile,"etcd-cafile",s.EtcdConfig.CAFile,"SSL Certificate Authority file used to secure etcd communication")
fs.BoolVar(&s.EtcdConfig.Quorum,"etcd-quorum-read",s.EtcdConfig.Quorum,"If true, enable quorum read")
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.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.IPNetVar(&s.ServiceClusterIPRange,"service-cluster-ip-range",s.ServiceClusterIPRange,"A CIDR notation IP range from which to assign service cluster IPs. This must not overlap with any IP ranges assigned to nodes for pods.")