Merge branch 'master' into release-1.8

2017-08-23 10:10:51 -07:00
parent 6c68762cef 74fe1170cc
commit 9403dc361f
35 changed files with 548 additions and 490 deletions
@@ -276,7 +276,7 @@ Since all of the data needed to validate who you are is in the `id_token`, Kuber
 solution for authentication.  It does offer a few challenges:

 1.  Kubernetes has no "web interface" to trigger the authentication process.  There is no browser or interface to collect credentials which is why you need to authenticate to your identity provider first.
-2.  The `id_token` can't be revoked, its like a certificate so it should be short-lived (only a few minutes) so it can be very annoying to have to get a new token every few minutes
+2.  The `id_token` can't be revoked, it's like a certificate so it should be short-lived (only a few minutes) so it can be very annoying to have to get a new token every few minutes
 3.  There's no easy way to authenticate to the Kubernetes dashboard without using the `kubectl proxy` command or a reverse proxy that injects the `id_token`


@@ -742,7 +742,7 @@ Finally, add the following parameters into API server start parameters:

 #### openssl

-**openssl** can also be use to manually generate certificates for your cluster.
+**openssl** can also be used to manually generate certificates for your cluster.

 1.  Generate a ca.key with 2048bit:

@@ -12,7 +12,7 @@ notitle: true
 The Kubernetes network proxy runs on each node. This
 reflects services as defined in the Kubernetes API on each node and can do simple
 TCP,UDP stream forwarding or round robin TCP,UDP forwarding across a set of backends.
-Service cluster ips and ports are currently found through Docker-links-compatible
+Service cluster IPs and ports are currently found through Docker-links-compatible
 environment variables specifying ports opened by the service proxy. There is an optional
 addon that provides cluster DNS for these cluster IPs. The user must create a service
 with the apiserver API to configure the proxy.