kubernetes · k8s-ci-robot · Oct 25, 2019 · Sep 13, 2019 · Sep 13, 2019 · Sep 14, 2019
diff --git a/Makefile b/Makefile
@@ -847,14 +847,20 @@ prow-postsubmit: bazel-version-dist
 
 .PHONY: live-docs
 live-docs:
-	@docker build --pull -t kops/mkdocs images/mkdocs
+	@docker build -t kops/mkdocs images/mkdocs
 	@docker run --rm -it -p 3000:3000 -v ${PWD}:/docs kops/mkdocs
 
 .PHONY: build-docs
 build-docs:
 	@docker build --pull -t kops/mkdocs images/mkdocs
 	@docker run --rm -v ${PWD}:/docs kops/mkdocs build
 
+# TODO: Remove before merging
+.PHONY: build-docs-netlify
+build-docs-netlify:
+	@pip install -r ${MAKEDIR}/images/mkdocs/requirements.txt
+	@mkdocs build
+
 # Update machine_types.go
 .PHONY: update-machine-types
 update-machine-types:

diff --git a/README-ES.md b/README-ES.md
@@ -30,15 +30,15 @@ en alpha, y otras plataformas planeadas.
 
 ## Lanzando un anfitrión de Kubernetes cluster en AWS o GCE
 
-Para reproducir exactamente el demo anterior, visualizalo en el [tutorial](/docs/aws.md) para
+Para reproducir exactamente el demo anterior, visualizalo en el [tutorial](/docs/getting_started/aws.md) para
 lanzar un anfitrión de Kubernetes cluster en AWS.
 
-Para instalar un Kubernetes cluster en GCE por fabor siga esta [guide](/docs/tutorial/gce.md).
+Para instalar un Kubernetes cluster en GCE por fabor siga esta [guide](/docs/getting_started/gce.md).
 
 
 ## Caracteristicas
 
-* Automatiza el aprovisionamiento de Kubernetes clusters en [AWS](/docs/aws.md) y [GCE](/docs/tutorial/gce.md)
+* Automatiza el aprovisionamiento de Kubernetes clusters en [AWS](/docs/getting_started/aws.md) y [GCE](/docs/getting_started/gce.md)
 * Un Despliegue Altamente Disponible (HA) Kubernetes Masters
 * Construye en un modelo de estado sincronizado para **dry-runs** y **idempotency** automático
 * Capacidad de generar [Terraform](/docs/terraform.md)

diff --git a/README.md b/README.md
@@ -32,10 +32,10 @@ in alpha, and other platforms planned.
 
 ## Launching a Kubernetes cluster hosted on AWS, GCE, DigitalOcean or OpenStack
 
-To replicate the above demo, check out our [tutorial](/docs/aws.md) for
+To replicate the above demo, check out our [tutorial](/docs/getting_started/aws.md) for
 launching a Kubernetes cluster hosted on AWS.
 
-To install a Kubernetes cluster on GCE please follow this [guide](/docs/tutorial/gce.md).
+To install a Kubernetes cluster on GCE please follow this [guide](/docs/getting_started/gce.md).
 
 To install a Kubernetes cluster on DigitalOcean, follow this [guide](/docs/tutorial/digitalocean.md).
 
@@ -45,7 +45,7 @@ To install a Kubernetes cluster on OpenStack, follow this [guide](/docs/tutorial
 
 ## Features
 
-* Automates the provisioning of Kubernetes clusters in [AWS](/docs/aws.md), [OpenStack](/docs/tutorial/openstack.md) and [GCE](/docs/tutorial/gce.md)
+* Automates the provisioning of Kubernetes clusters in [AWS](/docs/getting_started/aws.md), [OpenStack](/docs/getting_started/openstack.md) and [GCE](/docs/getting_started/gce.md)
 * Deploys Highly Available (HA) Kubernetes Masters
 * Built on a state-sync model for **dry-runs** and automatic **idempotency**
 * Ability to generate [Terraform](/docs/terraform.md)

diff --git a/docs/.pages b/docs/.pages
@@ -7,4 +7,4 @@ arrange:
 - examples
 - tutorial
 - releases
-- aws.md
+- getting_started/aws.md
diff --git a/docs/README.md b/docs/README.md
@@ -1,27 +1,33 @@
 # Documentation Index
 
 ## Quick start
-* [Getting started on AWS](aws.md)
-* [Getting started on GCE](tutorial/gce.md)
+* [Getting started on AWS](getting_started/aws.md)
+* [Getting started on GCE](getting_started/gce.md)
 * [CLI reference](cli/kops.md)
 
 
 ## Overview
 
-* [Command-line interface](#command-line-interface)
-* [Inspection](#inspection)
-* [`kops` design documents](#kops-design-documents)
-* [Networking](#networking)
-* [Operations](#operations)
-* [Security](#security)
-* [Development](#development)
+- [Documentation Index](#documentation-index)
+  - [Quick start](#quick-start)
+  - [Overview](#overview)
+  - [Command-line interface](#command-line-interface)
+  - [Advanced / Detailed List of Configurations](#advanced--detailed-list-of-configurations)
+    - [API / Configuration References](#api--configuration-references)
+    - [API Usage Guides](#api-usage-guides)
+  - [Operations](#operations)
+  - [Networking](#networking)
+  - [`kops` design documents](#kops-design-documents)
+  - [Security](#security)
+  - [Inspection](#inspection)
+  - [Development](#development)
 
 
 ## Command-line interface
 
 * [CLI argument explanations](arguments.md)
 * [CLI reference](cli/kops.md)
-* [Commands](commands.md)
+* [Commands](usage/commands.md)
     * miscellaneous CLI-related remarks
 * [Experimental features](experimental.md)
     * list of and how to enable experimental flags in the CLI
@@ -46,7 +52,7 @@
 * [Cluster addons](addons.md)
 * [Cluster configuration management](changing_configuration.md)
 * [Cluster desired configuration creation from template](cluster_template.md)
-* [Cluster upgrades and migrations](cluster_upgrades_and_migrations.md)
+* [Cluster upgrades and migrations](operations/cluster_upgrades_and_migrations.md)
 * [`etcd` volume encryption setup](etcd_volume_encryption.md)
 * [`etcd` backup/restore](etcd/backup-restore.md)
 * [GPU setup](gpu.md)

diff --git a/docs/addons.md b/docs/addons.md
diff --git a/docs/download_config.md → docs/advanced/download_config.md b/docs/download_config.md → docs/advanced/download_config.md
@@ -37,9 +37,9 @@ kops create cluster $NAME              \
 
 You can simply use the kops command `kops get --name $NAME -o yaml > a_fun_name_you_will_remember.yml`
 
-Note: for the above command to work the cluster NAME and the KOPS_STATE_STORE will have to be exported in your environment.  
+Note: for the above command to work the cluster NAME and the KOPS_STATE_STORE will have to be exported in your environment.
 
-For more information on how to use and modify the configurations see [here](manifests_and_customizing_via_api.md).
+For more information on how to use and modify the configurations see [here](../manifests_and_customizing_via_api.md).
 
 ## Managing instance groups
 

diff --git a/docs/experimental.md → docs/advanced/experimental.md b/docs/experimental.md → docs/advanced/experimental.md
@@ -14,4 +14,4 @@ The following experimental features are currently available:
 * `+EnableSeparateConfigBase` - Allow a config-base that is different from the state store.
 * `+SpecOverrideFlag` - Allow setting spec values on `kops create`.
 * `+ExperimentalClusterDNS` - Turns off validation of the kubelet cluster dns flag.
-* `+EnableNodeAuthorization` - Enable support of Node Authorization, see [node_authorization.md](node_authorization.md).
+* `+EnableNodeAuthorization` - Enable support of Node Authorization, see [node_authorization.md](../node_authorization.md).
diff --git a/docs/ns.md → docs/advanced/ns.md b/docs/ns.md → docs/advanced/ns.md
diff --git a/docs/authentication.md b/docs/authentication.md
@@ -119,7 +119,7 @@ data:
 
 ### Creating a new cluster with IAM Authenticator on.
 
-* Create a cluster following the [AWS getting started guide](https://github.com/kubernetes/kops/blob/master/docs/aws.md)
+* Create a cluster following the [AWS getting started guide](https://github.com/kubernetes/kops/blob/master/docs/getting_started/aws.md)
 * When you reach the "Customize Cluster Configuration" section of the guide modify the cluster spec and add the Authentication and Authorization configs to the YAML config.
 * Continue following the cluster creation guide to build the cluster.
     * :warning: When the cluster first comes up the aws-iam-authenticator PODs will be in a bad state.