Merge pull request #2119 from ddysher/fix-flag-change

Fix minion_cache_ttl and minion_regexp flag change.
This commit is contained in:
Brendan Burns 2014-11-01 22:47:52 -07:00
commit 808be2d13b
4 changed files with 23 additions and 16 deletions

View File

@ -53,15 +53,9 @@ The the kube-apiserver several options.
**-logtostderr**=
log to standard error instead of files. Default is false.
**-minion_cache_ttl**=30s
Duration of time to cache minion information. Default 30 seconds.
**-kubelet_port**=10250
The port at which kubelet will be listening on the minions. Default is 10250.
**-minion_regexp**=""
If non empty, and -cloud_provider is specified, a regular expression for matching minion VMs.
**-port**=8080
The port to listen on. Default is 8080.
@ -82,7 +76,7 @@ The the kube-apiserver several options.
# EXAMPLES
```
/usr/bin/kube-apiserver --logtostderr=true --v=0 --etcd_servers=http://127.0.0.1:4001 --address=0.0.0.0 --port=8080 --machines=127.0.0.1 --kubelet_port=10250 --allow_privileged=false
/usr/bin/kube-apiserver --logtostderr=true --v=0 --etcd_servers=http://127.0.0.1:4001 --address=0.0.0.0 --port=8080 --kubelet_port=10250 --allow_privileged=false
```
# HISTORY
October 2014, Originally compiled by Scott Collier (scollier at redhat dot com) based

View File

@ -29,6 +29,15 @@ The kube-controller-manager has several options.
**-api_version**=""
The API version to use when talking to the server.
**-cloud_config**=""
The path to the cloud provider configuration file. Empty string for no configuration file.
**-cloud_provider**=""
The provider for cloud services. Empty string for no provider.
**-minion_regexp**=""
If non empty, and -cloud_provider is specified, a regular expression for matching minion VMs.
**-insecure_skip_tls_verify**=false
If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.

View File

@ -69,18 +69,10 @@ The the kube\-apiserver several options.
\fB\-logtostderr\fP=
log to standard error instead of files. Default is false.
.PP
\fB\-minion\_cache\_ttl\fP=30s
Duration of time to cache minion information. Default 30 seconds.
.PP
\fB\-kubelet\_port\fP=10250
The port at which kubelet will be listening on the minions. Default is 10250.
.PP
\fB\-minion\_regexp\fP=""
If non empty, and \-cloud\_provider is specified, a regular expression for matching minion VMs.
.PP
\fB\-port\fP=8080
The port to listen on. Default is 8080.

View File

@ -36,6 +36,18 @@ The kube\-controller\-manager has several options.
\fB\-api\_version\fP=""
The API version to use when talking to the server.
.PP
\fB\-cloud\_config\fP=""
The path to the cloud provider configuration file. Empty string for no configuration file.
.PP
\fB\-cloud\_provider\fP=""
The provider for cloud services. Empty string for no provider.
.PP
\fB\-minion\_regexp\fP=""
If non empty, and \-cloud\_provider is specified, a regular expression for matching minion VMs.
.PP
\fB\-insecure\_skip\_tls\_verify\fP=false
If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.