From f02c10b679ed4c047db240b8f221ad47e99d9173 Mon Sep 17 00:00:00 2001
From: Steve Perry <steveperry-53@users.noreply.github.com>
Date: Fri, 7 Apr 2017 13:46:56 -0700
Subject: [PATCH] Make a Setup section. (#3227)

---
 _config.yml                                   |   2 +-
 _data/globals.yml                             |   2 +-
 _data/guides.yml                              |  85 ---------------
 _data/setup.yml                               | 101 ++++++++++++++++++
 _data/tasks.yml                               |   2 +
 _layouts/docwithnav.html                      |   1 +
 .../running-cloud-controller.md               |  27 +----
 docs/setup/index.md                           |  14 +++
 .../index.md => setup/pick-right-solution.md} |   3 +
 .../running-cloud-controller.md               |  32 ++++++
 docs/tasks/test.md                            |   5 +
 11 files changed, 162 insertions(+), 112 deletions(-)
 create mode 100644 _data/setup.yml
 create mode 100644 docs/setup/index.md
 rename docs/{getting-started-guides/index.md => setup/pick-right-solution.md} (99%)
 create mode 100644 docs/tasks/administer-cluster/running-cloud-controller.md
 create mode 100644 docs/tasks/test.md

diff --git a/_config.yml b/_config.yml
index 9c16741822..ea17510b2e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -46,10 +46,10 @@ twitter:
 tocs:
   - docs-home
   - guides
+  - setup
   - tutorials
   - tasks
   - concepts
   - reference
-  - tools
   - samples
   - support
diff --git a/_data/globals.yml b/_data/globals.yml
index f018b1ddcc..797470b0c8 100644
--- a/_data/globals.yml
+++ b/_data/globals.yml
@@ -1,10 +1,10 @@
 tocs:
 - docs-home
 - guides
+- setup
 - tasks
 - tutorials
 - concepts
 - reference
-- tools
 - samples
 - support
diff --git a/_data/guides.yml b/_data/guides.yml
index afbdc04552..3c16ee7835 100644
--- a/_data/guides.yml
+++ b/_data/guides.yml
@@ -54,91 +54,6 @@ toc:
   - title: Using Explorer to Examine the Runtime Environment
     path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/explorer
 
-- title: Creating a Cluster
-  section:
-  - docs/getting-started-guides/index.md
-  - title: Running Kubernetes on Your Local Machine
-    section:
-    - docs/getting-started-guides/minikube.md
-    - docs/getting-started-guides/alternatives.md
-  - title: Running Kubernetes on Turn-key Cloud Solutions
-    section:
-    - title: Running Kubernetes on Google Container Engine
-      path: https://cloud.google.com/container-engine/docs/before-you-begin/
-    - docs/getting-started-guides/gce.md
-    - docs/getting-started-guides/aws.md
-    - title: Running Kubernetes on Azure Container Service
-      path: https://docs.microsoft.com/en-us/azure/container-service/container-service-kubernetes-walkthrough
-    - docs/getting-started-guides/azure.md
-    - docs/getting-started-guides/clc.md
-    - title: Running Kubernetes on IBM SoftLayer
-      path: https://github.com/patrocinio/kubernetes-softlayer
-    - title: Running Kubernetes on Multiple Clouds with Stackpoint.io
-      path: /docs/getting-started-guides/stackpoint/
-  - title: Running Kubernetes on Custom Solutions
-    section:
-    - docs/getting-started-guides/scratch.md
-    - docs/getting-started-guides/kubeadm.md
-    - title: Custom Cloud Solutions
-      section:
-      - docs/getting-started-guides/coreos/index.md
-      - docs/getting-started-guides/ubuntu/index.md
-      - docs/getting-started-guides/rackspace.md
-      - docs/getting-started-guides/kops.md
-      - docs/getting-started-guides/kargo.md
-      - docs/getting-started-guides/running-cloud-controller.md
-    - title: On-Premise VMs
-      section:
-      - docs/getting-started-guides/coreos/index.md
-      - docs/getting-started-guides/cloudstack.md
-      - docs/getting-started-guides/vsphere.md
-      - docs/getting-started-guides/photon-controller.md
-      - docs/getting-started-guides/dcos.md
-      - docs/getting-started-guides/libvirt-coreos.md
-      - docs/getting-started-guides/ovirt.md
-      - docs/getting-started-guides/openstack-heat.md
-      - title: rkt
-        section:
-        - docs/getting-started-guides/rkt/index.md
-        - docs/getting-started-guides/rkt/notes.md
-      - docs/getting-started-guides/mesos/index.md
-      - docs/getting-started-guides/mesos-docker.md
-    - title: Bare Metal
-      section:
-      - docs/getting-started-guides/coreos/bare_metal_offline.md
-      - docs/getting-started-guides/fedora/fedora_ansible_config.md
-      - docs/getting-started-guides/fedora/fedora_manual_config.md
-      - docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
-      - docs/getting-started-guides/centos/centos_manual_config.md
-      - docs/getting-started-guides/coreos/index.md
-      - docs/getting-started-guides/ubuntu/index.md
-      - title: Ubuntu
-        section:
-        - docs/getting-started-guides/ubuntu/index.md
-        - docs/getting-started-guides/ubuntu/validation.md
-        - docs/getting-started-guides/ubuntu/backups.md
-        - docs/getting-started-guides/ubuntu/upgrades.md
-        - docs/getting-started-guides/ubuntu/scaling.mdfnet
-        - docs/getting-started-guides/ubuntu/installation.md
-        - docs/getting-started-guides/ubuntu/monitoring.md
-        - docs/getting-started-guides/ubuntu/networking.md
-        - docs/getting-started-guides/ubuntu/security.md
-        - docs/getting-started-guides/ubuntu/storage.md
-        - docs/getting-started-guides/ubuntu/troubleshooting.md
-        - docs/getting-started-guides/ubuntu/decommissioning.md
-        - docs/getting-started-guides/ubuntu/operational-considerations.md
-        - docs/getting-started-guides/ubuntu/glossary.md
-        - docs/getting-started-guides/ubuntu/local.md
-        - docs/getting-started-guides/ubuntu/logging.md
-        - docs/getting-started-guides/ubuntu/manual.md
-      - docs/getting-started-guides/windows/index.md
-    - docs/admin/node-conformance.md
-  - docs/getting-started-guides/docker-multinode.md
-  - docs/admin/cluster-large.md
-  - docs/admin/multiple-zones.md
-  - docs/admin/high-availability/index.md
-  - docs/getting-started-guides/binary_release.md
-
 - title: Administering Clusters
   section:
   - docs/admin/index.md
diff --git a/_data/setup.yml b/_data/setup.yml
new file mode 100644
index 0000000000..80f87c19fb
--- /dev/null
+++ b/_data/setup.yml
@@ -0,0 +1,101 @@
+bigheader: "Setup"
+abstract: "Instructions for setting up a Kubernetes cluster."
+toc:
+- docs/setup/index.md
+- docs/setup/pick-right-solution.md
+
+- title: Independent Solutions
+  section:
+  - docs/getting-started-guides/minikube.md
+  - docs/getting-started-guides/kubeadm.md
+  - docs/getting-started-guides/scratch.md
+  - docs/getting-started-guides/alternatives.md
+
+- title: Hosted Solutions
+  section:
+  - title: Running Kubernetes on Google Container Engine
+    path: https://cloud.google.com/container-engine/docs/before-you-begin/
+  - title: Running Kubernetes on Azure Container Service
+    path: https://docs.microsoft.com/en-us/azure/container-service/container-service-kubernetes-walkthrough
+
+- title: Turn-key Cloud Solutions
+  section:
+  - docs/getting-started-guides/gce.md
+  - docs/getting-started-guides/aws.md
+  - docs/getting-started-guides/azure.md
+  - docs/getting-started-guides/clc.md
+  - title: Running Kubernetes on IBM SoftLayer
+    path: https://github.com/patrocinio/kubernetes-softlayer
+  - title: Running Kubernetes on Multiple Clouds with Stackpoint.io
+    path: /docs/getting-started-guides/stackpoint/
+
+- title: Custom Solutions
+
+  section:
+  - title: Custom Cloud Solutions
+    section:
+    - docs/getting-started-guides/coreos/index.md
+    - docs/getting-started-guides/ubuntu/index.md
+    - docs/getting-started-guides/rackspace.md
+    - docs/getting-started-guides/kops.md
+    - docs/getting-started-guides/kargo.md
+    - docs/getting-started-guides/running-cloud-controller.md
+
+  - title: On-Premise VMs
+    section:
+    - docs/getting-started-guides/coreos/index.md
+    - docs/getting-started-guides/cloudstack.md
+    - docs/getting-started-guides/vsphere.md
+    - docs/getting-started-guides/photon-controller.md
+    - docs/getting-started-guides/dcos.md
+    - docs/getting-started-guides/libvirt-coreos.md
+    - docs/getting-started-guides/ovirt.md
+    - docs/getting-started-guides/openstack-heat.md
+
+    - title: rkt
+      section:
+      - docs/getting-started-guides/rkt/index.md
+      - docs/getting-started-guides/rkt/notes.md
+
+    - docs/getting-started-guides/mesos/index.md
+    - docs/getting-started-guides/mesos-docker.md
+
+    - title: Bare Metal
+      section:
+      - docs/getting-started-guides/coreos/bare_metal_offline.md
+      - docs/getting-started-guides/fedora/fedora_ansible_config.md
+      - docs/getting-started-guides/fedora/fedora_manual_config.md
+      - docs/getting-started-guides/fedora/flannel_multi_node_cluster.md
+      - docs/getting-started-guides/centos/centos_manual_config.md
+      - docs/getting-started-guides/coreos/index.md
+      - docs/getting-started-guides/ubuntu/index.md
+
+      - title: Ubuntu
+        section:
+        - docs/getting-started-guides/ubuntu/index.md
+        - docs/getting-started-guides/ubuntu/validation.md
+        - docs/getting-started-guides/ubuntu/backups.md
+        - docs/getting-started-guides/ubuntu/upgrades.md
+        - docs/getting-started-guides/ubuntu/scaling.mdfnet
+        - docs/getting-started-guides/ubuntu/installation.md
+        - docs/getting-started-guides/ubuntu/monitoring.md
+        - docs/getting-started-guides/ubuntu/networking.md
+        - docs/getting-started-guides/ubuntu/security.md
+        - docs/getting-started-guides/ubuntu/storage.md
+        - docs/getting-started-guides/ubuntu/troubleshooting.md
+        - docs/getting-started-guides/ubuntu/decommissioning.md
+        - docs/getting-started-guides/ubuntu/operational-considerations.md
+        - docs/getting-started-guides/ubuntu/glossary.md
+        - docs/getting-started-guides/ubuntu/local.md
+        - docs/getting-started-guides/ubuntu/logging.md
+        - docs/getting-started-guides/ubuntu/manual.md
+
+    - docs/getting-started-guides/windows/index.md
+
+  - docs/admin/node-conformance.md
+
+- docs/getting-started-guides/docker-multinode.md
+- docs/admin/cluster-large.md
+- docs/admin/multiple-zones.md
+- docs/admin/high-availability/index.md
+- docs/getting-started-guides/binary_release.md
diff --git a/_data/tasks.yml b/_data/tasks.yml
index ab485ed9c3..2a695038c6 100644
--- a/_data/tasks.yml
+++ b/_data/tasks.yml
@@ -5,6 +5,7 @@ toc:
 
 - title: Using the kubectl Command-Line
   section:
+  - docs/tasks/test.md
   - docs/tasks/kubectl/install.md
   - docs/tasks/kubectl/list-all-running-container-images.md
   - docs/tasks/kubectl/get-shell-running-container.md
@@ -80,6 +81,7 @@ toc:
   - docs/tasks/administer-cluster/limit-storage-consumption.md
   - docs/tasks/administer-cluster/change-default-storage-class.md
   - docs/tasks/administer-cluster/share-configuration.md
+  - docs/tasks/administer-cluster/running-cloud-controller.md
 
 - title: Administering Federation
   section:
diff --git a/_layouts/docwithnav.html b/_layouts/docwithnav.html
index e5fba078ef..498568f6ee 100755
--- a/_layouts/docwithnav.html
+++ b/_layouts/docwithnav.html
@@ -24,6 +24,7 @@
     <ul>
       <li><a href="/docs/home/" {% if toc.bigheader == "Kubernetes Documentation" %}class="YAH"{% endif %}>HOME</a></li>
       <li><a href="/docs/user-guide/" {% if toc.bigheader == "Guides" %}class="YAH"{% endif %}>GUIDES</a></li>
+      <li><a href="/docs/setup/" {% if toc.bigheader == "Setup" %}class="YAH"{% endif %}>SETUP</a></li>
       <li><a href="/docs/tasks/" {% if toc.bigheader == "Tasks" %}class="YAH"{% endif %}>TASKS</a></li>
       <li><a href="/docs/tutorials/" {% if toc.bigheader == "Tutorials" %}class="YAH"{% endif %}>TUTORIALS</a></li>
       <li><a href="/docs/concepts/" {% if toc.bigheader == "Concepts" %}class="YAH"{% endif %}>CONCEPTS</a></li>
diff --git a/docs/getting-started-guides/running-cloud-controller.md b/docs/getting-started-guides/running-cloud-controller.md
index 3f3b94dd7c..08787bf0ba 100644
--- a/docs/getting-started-guides/running-cloud-controller.md
+++ b/docs/getting-started-guides/running-cloud-controller.md
@@ -4,29 +4,6 @@ assignees:
 title: Building and Running cloud-controller-manager
 ---
 
-Kubernetes version 1.6 contains a new binary called as `cloud-controller-manager`. `cloud-controller-manager` is a daemon that embeds cloud-specific control loops in Kubernetes. These cloud-specific control loops were originally in the kube-controller-manager. However, cloud providers move at a different pace and schedule compared to the Kubernetes project, and abstracting the provider-specific code to the `cloud-controller-manager` binary allows cloud provider vendors to evolve independently from the core Kubernetes code.
+{% include user-guide-content-moved.md %}
 
-The `cloud-controller-manager` can be linked to any cloud provider that satisifies the [cloudprovider.Interface](https://github.com/kubernetes/kubernetes/blob/master/pkg/cloudprovider/cloud.go). 
-In future Kubernetes releases, cloud vendors should link code that satisfies the above interface to the `cloud-controller-manager` project and compile `cloud-controller-manager` for their own clouds. Cloud providers would also be responsible for maintaining and evolving their code.
-
-* TOC
-{:toc}
-
-### Building cloud-controller-manager for your cloud
-
-To build cloud-controller-manager for your cloud, follow these steps:
-
-* Write a cloudprovider that satisfies the [cloudprovider.Interface](https://github.com/kubernetes/kubernetes/blob/master/pkg/cloudprovider/cloud.go).
-* Link the cloudprovider to cloud-controller-manager
-
-The methods in [cloudprovider.Interface](https://github.com/kubernetes/kubernetes/blob/master/pkg/cloudprovider/cloud.go) are self-explanatory. All of the
-[existing providers](https://github.com/kubernetes/kubernetes/tree/master/pkg/cloudprovider/providers) satisfy this interface. If your cloud is already a part
-of the existing providers, you do not need to write a new provider; you can proceed directly with linking your cloud provider to the `cloud-controller-manager`.
-
-Once your code is ready, you must import that code into `cloud-controller-manager`. See the [rancher cloud sample](https://github.com/rancher/rancher-cloud-controller-manager) for a reference example. The import step in the sample is the only step required to link your cloud provider to the `cloud-controller-manager`.
-
-### Running cloud-controller-manager
-
-To run `cloud-controller-manager`, add it to your existing Kubernetes cluster as a Master component. All other master components except `kube-controller-manager` can be run without any changes.
-
-The `kube-controller-manager` should not run any cloud-specific controllers, since the `cloud-controller-manager` takes over this responsibility. To prevent the `kube-controller-manager` from running cloud-specific controllers, you must set the `--cloud-provider` flag in `kube-controller-manager` to `external`.
+[Building and Running cloud-controller-manager](/docs/tasks/administer-cluster/running-cloud-controller/)
diff --git a/docs/setup/index.md b/docs/setup/index.md
new file mode 100644
index 0000000000..60097a61bf
--- /dev/null
+++ b/docs/setup/index.md
@@ -0,0 +1,14 @@
+---
+assignees:
+- brendandburns
+- erictune
+- mikedanese
+title: Setup
+redirect_from:
+- "/docs/getting-started-guides/index/"
+- "/docs/getting-started-guides/index.html"
+---
+
+This section provides instructions for installing Kubernetes and setting
+up a Kubernetes cluster. For an overview of the different options, see
+[Picking the Right Solution](/docs/setup/pick-right-solution/).
diff --git a/docs/getting-started-guides/index.md b/docs/setup/pick-right-solution.md
similarity index 99%
rename from docs/getting-started-guides/index.md
rename to docs/setup/pick-right-solution.md
index ce19a8df30..d340a9462c 100644
--- a/docs/getting-started-guides/index.md
+++ b/docs/setup/pick-right-solution.md
@@ -4,6 +4,9 @@ assignees:
 - erictune
 - mikedanese
 title: Picking the Right Solution
+redirect_from:
+- "/docs/getting-started-guides/index/"
+- "/docs/getting-started-guides/index.html"
 ---
 
 Kubernetes can run on a range of platforms, from your laptop, to VMs on a cloud provider, to rack of
diff --git a/docs/tasks/administer-cluster/running-cloud-controller.md b/docs/tasks/administer-cluster/running-cloud-controller.md
new file mode 100644
index 0000000000..3f3b94dd7c
--- /dev/null
+++ b/docs/tasks/administer-cluster/running-cloud-controller.md
@@ -0,0 +1,32 @@
+---
+assignees:
+- thockin 
+title: Building and Running cloud-controller-manager
+---
+
+Kubernetes version 1.6 contains a new binary called as `cloud-controller-manager`. `cloud-controller-manager` is a daemon that embeds cloud-specific control loops in Kubernetes. These cloud-specific control loops were originally in the kube-controller-manager. However, cloud providers move at a different pace and schedule compared to the Kubernetes project, and abstracting the provider-specific code to the `cloud-controller-manager` binary allows cloud provider vendors to evolve independently from the core Kubernetes code.
+
+The `cloud-controller-manager` can be linked to any cloud provider that satisifies the [cloudprovider.Interface](https://github.com/kubernetes/kubernetes/blob/master/pkg/cloudprovider/cloud.go). 
+In future Kubernetes releases, cloud vendors should link code that satisfies the above interface to the `cloud-controller-manager` project and compile `cloud-controller-manager` for their own clouds. Cloud providers would also be responsible for maintaining and evolving their code.
+
+* TOC
+{:toc}
+
+### Building cloud-controller-manager for your cloud
+
+To build cloud-controller-manager for your cloud, follow these steps:
+
+* Write a cloudprovider that satisfies the [cloudprovider.Interface](https://github.com/kubernetes/kubernetes/blob/master/pkg/cloudprovider/cloud.go).
+* Link the cloudprovider to cloud-controller-manager
+
+The methods in [cloudprovider.Interface](https://github.com/kubernetes/kubernetes/blob/master/pkg/cloudprovider/cloud.go) are self-explanatory. All of the
+[existing providers](https://github.com/kubernetes/kubernetes/tree/master/pkg/cloudprovider/providers) satisfy this interface. If your cloud is already a part
+of the existing providers, you do not need to write a new provider; you can proceed directly with linking your cloud provider to the `cloud-controller-manager`.
+
+Once your code is ready, you must import that code into `cloud-controller-manager`. See the [rancher cloud sample](https://github.com/rancher/rancher-cloud-controller-manager) for a reference example. The import step in the sample is the only step required to link your cloud provider to the `cloud-controller-manager`.
+
+### Running cloud-controller-manager
+
+To run `cloud-controller-manager`, add it to your existing Kubernetes cluster as a Master component. All other master components except `kube-controller-manager` can be run without any changes.
+
+The `kube-controller-manager` should not run any cloud-specific controllers, since the `cloud-controller-manager` takes over this responsibility. To prevent the `kube-controller-manager` from running cloud-specific controllers, you must set the `--cloud-provider` flag in `kube-controller-manager` to `external`.
diff --git a/docs/tasks/test.md b/docs/tasks/test.md
new file mode 100644
index 0000000000..85d1e3de1e
--- /dev/null
+++ b/docs/tasks/test.md
@@ -0,0 +1,5 @@
+---
+title: Task test
+---
+
+This is a test: Tasks.