Merge branch 'master' into patch-1

2016-10-17 20:02:35 -07:00
parent 1480754235 92c443e8c5
commit 8cab01acfa
4 changed files with 10 additions and 7 deletions
@@ -166,12 +166,15 @@ busybox   1/1       Running   0          <some-time>
 ```

 ### Validate DNS works
+
 Once that pod is running, you can exec nslookup in that environment:
+
 ```
 kubectl exec busybox -- nslookup kubernetes.default
 ```

 You should see something like:
+
 ```
 Server:    10.0.0.10
 Address 1: 10.0.0.10
@@ -25,7 +25,8 @@ If you want to use custom binaries or pure open source Kubernetes, please contin
 1. Install `gcloud` as necessary. `gcloud` can be installed as a part of the [Google Cloud SDK](https://cloud.google.com/sdk/).
 1. Enable the [Compute Engine Instance Group Manager API](https://developers.google.com/console/help/new/#activatingapis) in the [Google Cloud developers console](https://console.developers.google.com).
 1. Make sure that gcloud is set to use the Google Cloud Platform project you want. You can check the current project using `gcloud config list project` and change it via `gcloud config set project <project-id>`.
-1. Make sure you have credentials for GCloud by running ` gcloud auth login`.
+1. Make sure you have credentials for GCloud by running `gcloud auth login`.
+1. (Optional)  In order to make API calls against GCE, you must also run `gcloud auth application-default login`.
 1. Make sure you can start up a GCE VM from the command line.  At least make sure you can do the [Create an instance](https://cloud.google.com/compute/docs/instances/#startinstancegcloud) part of the GCE Quickstart.
 1. Make sure you can ssh into the VM without interactive prompts.  See the [Log in to the instance](https://cloud.google.com/compute/docs/instances/#sshing) part of the GCE Quickstart.

@@ -245,5 +246,3 @@ For support level information on all solutions, see the [Table of solutions](/do

 Please see the [Kubernetes docs](/docs/) for more details on administering
 and using a Kubernetes cluster.
- 
-
@@ -150,7 +150,7 @@ In the CLI, the access modes are abbreviated to:
 | HostPath             | x            | -           | -            |
 | iSCSI                | x            | x           | -            |
 | NFS                  | x            | x           | x            |
-| RDB                  | x            | x           | -            |
+| RBD                  | x            | x           | -            |
 | VsphereVolume        | x            | -           | -            |

 ### Class
@@ -126,9 +126,10 @@ Watch out when using this type of volume, because:
  behave differently on different nodes due to different files on the nodes
 * when Kubernetes adds resource-aware scheduling, as is planned, it will not be
  able to account for resources used by a `hostPath`
-* the directories created on the underlying hosts are only writable by root, you either need
-  to run your process as root in a privileged container or modify the file permissions on
-  the host to be able to write to a `hostPath` volume
+* the directories created on the underlying hosts are only writable by root. You
+  either need to run your process as root in a
+  [privileged container](/docs/user-guide/security-context) or modify the file
+  permissions on the host to be able to write to a `hostPath` volume

 #### Example pod