Merge pull request #392 from jmiddleton/patch-1

removed tabs and spaces to fix the text.
This commit is contained in:
johndmulhausen
2016-04-19 14:04:24 -07:00
+16 -16
View File
@@ -73,7 +73,7 @@ variable.
For example, OS X: For example, OS X:
```shell ```shell
wget http://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/darwin/amd64/kubectl curl -O http://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/darwin/amd64/kubectl
chmod 755 kubectl chmod 755 kubectl
PATH=$PATH:`pwd` PATH=$PATH:`pwd`
``` ```
@@ -146,7 +146,7 @@ kubectl get svc nginx --template={{.spec.clusterIP}}
On OS X, since docker is running inside a VM, run the following command instead: On OS X, since docker is running inside a VM, run the following command instead:
```shell ```shell
docker-machine ssh `docker-machine active` curl $ip docker-machine ssh `docker-machine active` curl $ip
``` ```
## Deploy a DNS ## Deploy a DNS
@@ -184,23 +184,23 @@ If you see your node as `NotReady` it's possible that your OS does not have memc
1. Your kernel should support memory accounting. Ensure that the 1. Your kernel should support memory accounting. Ensure that the
following configs are turned on in your linux kernel: following configs are turned on in your linux kernel:
```shell ```shell
CONFIG_RESOURCE_COUNTERS=y CONFIG_RESOURCE_COUNTERS=y
CONFIG_MEMCG=y CONFIG_MEMCG=y
``` ```
2. Enable the memory accounting in the kernel, at boot, as command line 2. Enable the memory accounting in the kernel, at boot, as command line
parameters as follows: parameters as follows:
```shell ```shell
GRUB_CMDLINE_LINUX="cgroup_enable=memory=1" GRUB_CMDLINE_LINUX="cgroup_enable=memory=1"
``` ```
NOTE: The above is specifically for GRUB2. NOTE: The above is specifically for GRUB2.
You can check the command line parameters passed to your kernel by looking at the You can check the command line parameters passed to your kernel by looking at the
output of /proc/cmdline: output of /proc/cmdline:
```shell ```shell
$ cat /proc/cmdline $ cat /proc/cmdline
BOOT_IMAGE=/boot/vmlinuz-3.18.4-aufs root=/dev/sda5 ro cgroup_enable=memory=1 BOOT_IMAGE=/boot/vmlinuz-3.18.4-aufs root=/dev/sda5 ro cgroup_enable=memory=1
``` ```