Commit c560f41a authored by Eric Paris's avatar Eric Paris

Update docs which were incorrectly using _ in flag names

Each of these was verified that the actual flag declaration correctly used -
parent 68716c77
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
# Unless given a specific directive, disable registration for the kubelet # Unless given a specific directive, disable registration for the kubelet
# running on the master. # running on the master.
{% if grains.kubelet_api_servers is defined -%} {% if grains.kubelet_api_servers is defined -%}
{% set api_servers_with_port = "--api_servers=https://" + grains.kubelet_api_servers -%} {% set api_servers_with_port = "--api-servers=https://" + grains.kubelet_api_servers -%}
{% else -%} {% else -%}
{% set api_servers_with_port = "" -%} {% set api_servers_with_port = "" -%}
{% endif -%} {% endif -%}
......
...@@ -34,13 +34,13 @@ In this case, if there are problems launching a replacement scheduler process th ...@@ -34,13 +34,13 @@ In this case, if there are problems launching a replacement scheduler process th
##### Command Line Arguments ##### Command Line Arguments
- `--ha` is required to enable scheduler HA and multi-scheduler leader election. - `--ha` is required to enable scheduler HA and multi-scheduler leader election.
- `--km_path` or else (`--executor_path` and `--proxy_path`) should reference non-local-file URI's and must be identical across schedulers. - `--km-path` or else (`--executor-path` and `--proxy-path`) should reference non-local-file URI's and must be identical across schedulers.
If you have HDFS installed on your slaves then you can specify HDFS URI locations for the binaries: If you have HDFS installed on your slaves then you can specify HDFS URI locations for the binaries:
```shell ```shell
$ hdfs dfs -put -f bin/km hdfs:///km $ hdfs dfs -put -f bin/km hdfs:///km
$ ./bin/km scheduler ... --mesos_master=zk://zk1:2181,zk2:2181/mesos --ha --km_path=hdfs:///km $ ./bin/km scheduler ... --mesos-master=zk://zk1:2181,zk2:2181/mesos --ha --km-path=hdfs:///km
``` ```
**IMPORTANT:** some command line parameters specified for the scheduler process are passed to the Kubelet-executor and so are subject to compatibility tests: **IMPORTANT:** some command line parameters specified for the scheduler process are passed to the Kubelet-executor and so are subject to compatibility tests:
...@@ -54,11 +54,11 @@ The command line parameters that affect the hash calculation are listed below. ...@@ -54,11 +54,11 @@ The command line parameters that affect the hash calculation are listed below.
- `--allow-privileged` - `--allow-privileged`
- `--api-servers` - `--api-servers`
- `--auth_path` - `--auth-path`
- `--cluster_*` - `--cluster_*`
- `--executor_*` - `--executor_*`
- `--kubelet_*` - `--kubelet_*`
- `--km_path` - `--km-path`
- `--profiling` - `--profiling`
- `--proxy_path` - `--proxy_path`
......
...@@ -79,7 +79,7 @@ support all the features you expect. ...@@ -79,7 +79,7 @@ support all the features you expect.
## How do I turn on an admission control plug-in? ## 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. ordered list of admission control choices to invoke prior to modifying objects in the cluster.
## What does each plug-in do? ## What does each plug-in do?
......
...@@ -132,7 +132,7 @@ Update your PATH to more easily run the Kubernetes-Mesos binaries: ...@@ -132,7 +132,7 @@ Update your PATH to more easily run the Kubernetes-Mesos binaries:
export PATH="$(pwd)/_output/local/go/bin:$PATH" 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. In order to let Kubernetes survive Mesos master changes, the ZooKeeper URL is recommended for production environments.
```bash ```bash
...@@ -208,7 +208,7 @@ kubernetes component=apiserver,provider=kubernetes <none> 10.10.10.1 ...@@ -208,7 +208,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 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". Go to the Frameworks tab, and look for an active framework named "Kubernetes".
## Spin up a pod ## Spin up a pod
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment