Skip to content

Commit 5587465

Browse files
committed
style(quickstart): small fixes
1 parent c4a0b33 commit 5587465

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

src/installing-deis/quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ These steps will help you provision a Deis cluster.
44

55
## Check System Requirements
66

7-
Please refer to the prequisites and [system requirements][] for considerations when planning your Kubernetes environment.
7+
Please refer to the prerequisites and [system requirements][] for considerations when planning your Kubernetes environment.
88

99
## Choose a Provider
1010

src/installing-deis/system-requirements.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,16 @@ Deis workflow has been tested with the Kubernetes v1.1 release line. While Kuber
2222

2323
## Daemon Sets
2424

25-
The logging components require Kubernetes Daemon Sets API. DaemonSets are not enabled by default in the v1.1 release line, to enable these extensions follow the instructions found [here](http://kubernetes.io/v1.1/docs/api.html#enabling-resources-in-the-extensions-group). If you are running Kubernetes v1.2, DaemonSets are enabled by default.
25+
The logging components require Kubernetes Daemon Sets API. Daemon Sets are not enabled by default in the v1.1 release line. To enable these extensions, follow the instructions found [here](http://kubernetes.io/v1.1/docs/api.html#enabling-resources-in-the-extensions-group). If you are running Kubernetes v1.2, Daemon Sets are enabled by default.
2626

27-
Specific steps to enable api extensions may vary based on your Kubernetes configuration. For example, to update a CoreOS Kubernetes cluster edit the API server unit file and add the following line to the `ExecStart` stanza: `--runtime_config=extensions/v1beta1=true,extensions/v1beta1/daemonsets=true`.
27+
Specific steps to enable API extensions may vary based on your Kubernetes configuration. For example, to update a CoreOS Kubernetes cluster edit the API server unit file and add the following line to the `ExecStart` stanza: `--runtime_config=extensions/v1beta1=true,extensions/v1beta1/daemonsets=true`.
2828

2929
Restart your API server and check that the extensions API is enabled by running:
3030

3131
```
3232
$ kubectl api-versions
3333
extensions/v1beta1
3434
v1
35-
$
3635
```
3736

3837
# Docker Requirements
@@ -43,4 +42,4 @@ Any Kubernetes 1.1 cluster should also use a Docker version < 1.10.0 so that `ku
4342

4443
## Docker Insecure Registry
4544

46-
The on-cluster, Deis managed Docker registry is not deployed with TLS by default. As such, all docker daemons on your Kubernetes worker nodes must be configured with an appropriate "insecure-registry". The subnet given to "insecure-registry" should encompase any private networks used by your hosts including the configured overlay networks. Depending on your Kubernetes configuration `10.0.0.0/8` may be sufficient.
45+
The on-cluster, Deis-managed Docker registry is not deployed with TLS by default. As such, all Kubernetes worker nodes must have their Docker daemons configured to use an insecure registry. The subnet should encompase any private networks used by your worker nodes including any overlay networks. Depending on your Kubernetes and Docker configuration, setting `EXTRA_DOCKER_OPTS="--insecure-registry=10.0.0.0/8"` may be sufficient.

0 commit comments

Comments
 (0)