github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12745 from eparis/even-less-dash-false-positive

Browse Source 
verify-flags-underscore.py: Even fewer dash false positives
This commit is contained in:
Saad Ali
2015-08-19 17:03:29 -07:00
parent 49a569a457 ca310ffdac
commit 8a43bd621e
9 changed files with 107 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/admin/admission-controllers.md
View File

@@ -79,7 +79,7 @@ support all the features you expect.
## How do I turn on an admission control plug-in?
The Kubernetes API server supports a flag, `admission_control` that takes a comma-delimited,
The Kubernetes API server supports a flag, `admission-control` that takes a comma-delimited,
ordered list of admission control choices to invoke prior to modifying objects in the cluster.
## What does each plug-in do?

4
docs/getting-started-guides/mesos.md
View File

@@ -134,7 +134,7 @@ Update your PATH to more easily run the Kubernetes-Mesos binaries:
export PATH="$(pwd)/_output/local/go/bin:$PATH"
```
Identify your Mesos master: depending on your Mesos installation this is either a `host:port` like `mesos_master:5050` or a ZooKeeper URL like `zk://zookeeper:2181/mesos`.
Identify your Mesos master: depending on your Mesos installation this is either a `host:port` like `mesos-master:5050` or a ZooKeeper URL like `zk://zookeeper:2181/mesos`.
In order to let Kubernetes survive Mesos master changes, the ZooKeeper URL is recommended for production environments.
```bash
@@ -210,7 +210,7 @@ kubernetes component=apiserver,provider=kubernetes <none> 10.10.10.1
```
Lastly, look for Kubernetes in the Mesos web GUI by pointing your browser to
`http://<mesos_master_ip:port>`. Make sure you have an active VPN connection.
`http://<mesos-master-ip:port>`. Make sure you have an active VPN connection.
Go to the Frameworks tab, and look for an active framework named "Kubernetes".
## Spin up a pod