Merge branch 'master' into patch-1

2016-12-15 12:03:35 -08:00
parent 01bfb7925f 7d3a56cbca
commit b7a9a4bd4f
5 changed files with 89 additions and 15 deletions
@@ -3,6 +3,10 @@ assignees:
 - madhusudancs

 ---
+
+* TOC
+{:toc}
+
 Kubernetes version 1.5 includes a new command line tool called
 `kubefed` to help you administrate your federated clusters.
 `kubefed` helps you to deploy a new Kubernetes cluster federation
@@ -14,11 +18,6 @@ using `kubefed`.

 > Note: `kubefed` is an alpha feature in Kubernetes 1.5.

-
-* TOC
-{:toc}
-
-
 ## Prerequisites

 This guide assumes that you have a running Kubernetes cluster. Please
@@ -61,8 +60,8 @@ The output should contain an entry corresponding to your host cluster,
 similar to the following:

 ```
-CURRENT   NAME                                                               CLUSTER                                                            AUTHINFO                                                           NAMESPACE
-          gke_myproject_asia-east1-b_gce-asia-east1              gke_myproject_asia-east1-b_gce-asia-east1              gke_myproject_asia-east1-b_gce-asia-east1
+CURRENT   NAME                                          CLUSTER                                       AUTHINFO                                      NAMESPACE
+          gke_myproject_asia-east1-b_gce-asia-east1     gke_myproject_asia-east1-b_gce-asia-east1     gke_myproject_asia-east1-b_gce-asia-east1
 ```