Merge branch 'master' into commands-capabilities

docs/user-guide/debugging-services.md

@@ -566,11 +566,11 @@ This mostly happens when `kube-proxy` is running in `iptables` mode and Pods
 are connected with bridge network. The `Kubelet` exposes a `hairpin-mode`
 [flag](http://kubernetes.io/docs/admin/kubelet/) that allows endpoints of a Service to loadbalance back to themselves
 if they try to access their own Service VIP. The `hairpin-mode` flag must either be
-set to `haripin-veth` or `promiscuous-bridge`.
+set to `hairpin-veth` or `promiscuous-bridge`.
 
 The common steps to trouble shoot this are as follows:
 
-* Confirm `hairpin-mode` is set to `haripin-veth` or `promiscuous-bridge`.
+* Confirm `hairpin-mode` is set to `hairpin-veth` or `promiscuous-bridge`.
 You should see something like the below. `hairpin-mode` is set to
 `promiscuous-bridge` in the following example.
 

docs/user-guide/persistent-volumes/index.md

@@ -543,7 +543,7 @@ and need persistent storage, we recommend that you use the following pattern:
 - Do include PersistentVolumeClaim objects in your bundle of config (alongside Deployments, ConfigMaps, etc).
 - Do not include PersistentVolume objects in the config, since the user instantiating the config may not have
   permission to create PersistentVolumes.
-- Give the user the option of providing a storage class name when instantating the template.
+- Give the user the option of providing a storage class name when instantiating the template.
   - If the user provides a storage class name, and the cluster is version 1.4 or newer, put that value into the `volume.beta.kubernetes.io/storage-class` annotation of the PVC.
     This will cause the PVC to match the right storage class if the cluster has StorageClasses enabled by the admin.
   - If the user does not provide a storage class name or the cluster is version 1.3, then instead put a `volume.alpha.kubernetes.io/storage-class: default` annotation on the PVC.

docs/user-guide/prereqs.md

@@ -3,9 +3,24 @@ assignees:
 - bgrant0607
 - mikedanese
 title: Installing and Setting up kubectl
+redirect_from:
+- "/docs/getting-started-guides/kubectl/"
+- "/docs/getting-started-guides/kubectl.html"
 ---
 
-To deploy and manage applications on Kubernetes, you'll use the Kubernetes command-line tool, [kubectl](/docs/user-guide/kubectl/). It lets you inspect your cluster resources, create, delete, and update components, and much more. You will use it to look at your new cluster and bring up example apps.
+To deploy and manage applications on Kubernetes, you'll use the
+Kubernetes command-line tool, [kubectl](/docs/user-guide/kubectl/). It
+lets you inspect your cluster resources, create, delete, and update
+components, and much more. You will use it to look at your new cluster
+and bring up example apps.
+
+You should use a version of kubectl that is at least as new as your
+server.  `kubectl version` will print the server and client versions.
+Using the same version of kubectl as your server naturally works;
+using a newer kubectl than your server also works; but if you use an
+older kubectl with a newer server you may see odd validation errors.
+
+Here are a few methods to install kubectl.
 
 ## Install kubectl Binary Via curl
 
@@ -65,6 +80,31 @@ export PATH=<path/to/kubernetes-directory>/platforms/darwin/amd64:$PATH
 export PATH=<path/to/kubernetes-directory>/platforms/linux/amd64:$PATH
 ```
 
+## Download as part of the Google Cloud SDK
+
+kubectl can be installed as part of the Google Cloud SDK:
+
+First install the [Google Cloud SDK](https://cloud.google.com/sdk/).
+
+After Google Cloud SDK installs, run the following command to install `kubectl`:
+
+```shell
+gcloud components install kubectl
+```
+
+Do check that the version is sufficiently up-to-date using `kubectl version`.
+
+## Install with brew
+
+If you are on MacOS and using brew, you can install with:
+
+```shell
+brew install kubectl
+```
+
+The homebrew project is independent from kubernetes, so do check that the version is
+sufficiently up-to-date using `kubectl version`.
+
 ## Configuring kubectl
 
 In order for kubectl to find and access the Kubernetes cluster, it needs a [kubeconfig file](/docs/user-guide/kubeconfig-file), which is created automatically when creating a cluster using kube-up.sh (see the [getting started guides](/docs/getting-started-guides/) for more about creating clusters). If you need access to a cluster you didn't create, see the [Sharing Cluster Access document](/docs/user-guide/sharing-clusters).
@@ -80,6 +120,49 @@ $ kubectl cluster-info
 
 If you see a url response, you are ready to go.
 
+## Enabling shell autocompletion
+
+kubectl includes autocompletion support, which can save a lot of typing!
+
+The completion script itself is generated by kubectl, so you typically just need to invoke it from your profile.
+
+Common examples are provided here, but for more details please consult `kubectl completion -h`
+
+### On Linux, using bash
+
+To add it to your current shell: `source <(kubectl completion bash)`
+
+To add kubectl autocompletion to your profile (so it is automatically loaded in future shells):
+
+```shell
+echo "source <(kubectl completion bash)" >> ~/.bashrc
+```
+
+### On MacOS, using bash
+
+On MacOS, you will need to install the bash-completion support first:
+
+```shell
+brew install bash-completion
+```
+
+To add it to your current shell:
+
+```shell
+source $(brew --prefix)/etc/bash_completion
+source <(kubectl completion bash)
+```
+
+To add kubectl autocompletion to your profile (so it is automatically loaded in future shells):
+
+```shell
+echo "source $(brew --prefix)/etc/bash_completion" >> ~/.bash_profile
+echo "source <(kubectl completion bash)" >> ~/.bash_profile
+```
+
+Please note that this only appears to work currently if you install using `brew install kubectl`,
+and not if you downloaded kubectl directly.
+
 ## What's next?
 
 [Learn how to launch and expose your application.](/docs/user-guide/quick-start)

docs/user-guide/secrets/index.md

@@ -763,7 +763,7 @@ make that key begin with a dot.  For example, when the following secret is mount
       {
         "name": "dotfile-test-container",
         "image": "gcr.io/google_containers/busybox",
-        "command": "ls -l /etc/secret-volume",
+        "command": [ "ls", "-l", "/etc/secret-volume" ],
         "volumeMounts": [
           {
             "name": "secret-volume",