Merge branch 'master' into release-1.8

docs/tasks/access-application-cluster/access-cluster.md

@@ -174,7 +174,7 @@ From within a pod the recommended ways to connect to API are:
     in any container of the pod can access it.  See this [example of using kubectl proxy
     in a pod](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/kubectl-container/).
   - use the Go client library, and create a client using the `rest.InClusterConfig()` and `kubernetes.NewForConfig()` functions.
-    They handle locating and authenticating to the apiserver. [example](https://git.k8s.io/client-go/examples/in-cluster/main.go)
+    They handle locating and authenticating to the apiserver. [example](https://git.k8s.io/client-go/examples/in-cluster-client-configuration/main.go)
 
 In each case, the credentials of the pod are used to communicate securely with the apiserver.
 

docs/tasks/configure-pod-container/configure-volume-storage.md

@@ -35,50 +35,50 @@ restarts. Here is the configuration file for the Pod:
 
 1. Create the Pod:
 
-        kubectl create -f https://k8s.io/docs/tasks/configure-pod-container/pod-redis.yaml
+       kubectl create -f https://k8s.io/docs/tasks/configure-pod-container/pod-redis.yaml
 
 1. Verify that the Pod's Container is running, and then watch for changes to
 the Pod:
 
-        kubectl get --watch pod redis
+       kubectl get --watch pod redis
 
     The output looks like this:
 
-        NAME      READY     STATUS    RESTARTS   AGE
-        redis     1/1       Running   0          13s
+       NAME      READY     STATUS    RESTARTS   AGE
+       redis     1/1       Running   0          13s
 
 1. In another terminal, get a shell to the running Container:
 
-        kubectl exec -it redis -- /bin/bash
+       kubectl exec -it redis -- /bin/bash
 
 1. In your shell, go to `/data/redis`, and create a file:
 
-        root@redis:/data/redis# echo Hello > test-file
+       root@redis:/data/redis# echo Hello > test-file
 
 1. In your shell, list the running processes:
 
-        root@redis:/data/redis# ps aux
+       root@redis:/data/redis# ps aux
 
     The output is similar to this:
 
-        USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
-        redis        1  0.1  0.1  33308  3828 ?        Ssl  00:46   0:00 redis-server *:6379
-        root        12  0.0  0.0  20228  3020 ?        Ss   00:47   0:00 /bin/bash
-        root        15  0.0  0.0  17500  2072 ?        R+   00:48   0:00 ps aux
+       USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
+       redis        1  0.1  0.1  33308  3828 ?        Ssl  00:46   0:00 redis-server *:6379
+       root        12  0.0  0.0  20228  3020 ?        Ss   00:47   0:00 /bin/bash
+       root        15  0.0  0.0  17500  2072 ?        R+   00:48   0:00 ps aux
 
 1. In your shell, kill the redis process:
 
-        root@redis:/data/redis# kill <pid>
+       root@redis:/data/redis# kill <pid>
 
     where `<pid>` is the redis process ID (PID).
 
 1. In your original terminal, watch for changes to the redis Pod. Eventually,
 you will see something like this:
 
-        NAME      READY     STATUS     RESTARTS   AGE
-        redis     1/1       Running    0          13s
-        redis     0/1       Completed  0         6m
-        redis     1/1       Running    1         6m
+       NAME      READY     STATUS     RESTARTS   AGE
+       redis     1/1       Running    0          13s
+       redis     0/1       Completed  0         6m
+       redis     1/1       Running    1         6m
 
 At this point, the Container has terminated and restarted. This is because the
 redis Pod has a
@@ -87,7 +87,7 @@ of `Always`.
 
 1. Get a shell into the restarted Container:
 
-        kubectl exec -it redis -- /bin/bash
+       kubectl exec -it redis -- /bin/bash
 
 1. In your shell, goto `/data/redis`, and verify that `test-file` is still there.
 

docs/tasks/federation/set-up-cluster-federation-kubefed.md

@@ -61,6 +61,15 @@ sudo cp kubernetes/client/bin/kubectl /usr/local/bin
 sudo chmod +x /usr/local/bin/kubectl
 ```
 
+### Install with snap on Ubuntu
+
+kubefed is available as a [snap](https://snapcraft.io/) application.
+
+1. If you are on Ubuntu or one of other Linux distributions that support [snap](https://snapcraft.io/docs/core/install) package manager, you can install with:
+
+        sudo snap install kubefed --classic
+
+2. Run `kubefed version` to verify that the verison you've installed is sufficiently up-to-date.
 
 ## Choosing a host cluster.
 

docs/tasks/manage-gpus/scheduling-gpus.md

@@ -143,7 +143,7 @@ spec:
 
 ## Future
 
-- Support for hardware accelerators is in it's early stages in Kubernetes.
+- Support for hardware accelerators is in its early stages in Kubernetes.
 - GPUs and other accelerators will soon be a native compute resource across the system.
 - Better APIs will be introduced to provision and consume accelerators in a scalable manner.
 - Kubernetes will automatically ensure that applications consuming GPUs gets the best possible performance.