From dee3def6c121590daee0aeb45623a2b72be97efc Mon Sep 17 00:00:00 2001
From: ihutchin <ianeta.hutchinson@intel.com>
Date: Fri, 17 Mar 2017 15:16:40 -0500
Subject: [PATCH] Moving etcd topic to Concepts.

---
 _data/concepts.yml                            |  4 ++
 docs/admin/etcd.md                            | 44 +----------------
 .../concepts/storage/etcd-store-api-object.md | 47 +++++++++++++++++++
 3 files changed, 53 insertions(+), 42 deletions(-)
 create mode 100644 docs/concepts/storage/etcd-store-api-object.md

diff --git a/_data/concepts.yml b/_data/concepts.yml
index d20fb85265..5336356d1d 100644
--- a/_data/concepts.yml
+++ b/_data/concepts.yml
@@ -75,6 +75,10 @@ toc:
   - docs/concepts/storage/volumes.md
   - docs/concepts/storage/persistent-volumes.md
 
+- title: Storage
+  section:
+  - docs/concepts/storage/etcd-store-api-object.md
+
 - title: Services, Load Balancing, and Networking
   section:
   - docs/concepts/services-networking/service.md
diff --git a/docs/admin/etcd.md b/docs/admin/etcd.md
index 06b0eda07c..d8b1034f40 100644
--- a/docs/admin/etcd.md
+++ b/docs/admin/etcd.md
@@ -4,46 +4,6 @@ assignees:
 title: Configuring Kubernetes Use of etcd
 ---
 
-[etcd](https://coreos.com/etcd/docs/latest/) is a highly-available key value
-store which Kubernetes uses for persistent storage of all of its REST API
-objects.
+{% include user-guide-content-moved.md %}
 
-## Configuration: high-level goals
-
-Access Control: give *only* kube-apiserver read/write access to etcd. You do not
-want apiserver's etcd exposed to every node in your cluster (or worse, to the
-internet at large), because access to etcd is equivalent to root in your
-cluster.
-
-Data Reliability: for reasonable safety, either etcd needs to be run as a
-[cluster](/docs/admin/high-availability/#clustering-etcd) (multiple machines each running
-etcd) or etcd's data directory should be located on durable storage (e.g., GCE's
-persistent disk). In either case, if high availability is required--as it might
-be in a production cluster--the data directory ought to be [backed up
-periodically](https://coreos.com/etcd/docs/latest/op-guide/recovery.html),
-to reduce downtime in case of corruption.
-
-## Default configuration
-
-The default setup scripts use kubelet's file-based static pods feature to run etcd in a
-[pod](http://releases.k8s.io/{{page.githubbranch}}/cluster/saltbase/salt/etcd/etcd.manifest). This manifest should only
-be run on master VMs. The default location that kubelet scans for manifests is
-`/etc/kubernetes/manifests/`.
-
-## Kubernetes's usage of etcd
-
-By default, Kubernetes objects are stored under the `/registry` key in etcd.
-This path can be prefixed by using the [kube-apiserver](/docs/admin/kube-apiserver) flag
-`--etcd-prefix="/foo"`.
-
-`etcd` is the only place that Kubernetes keeps state.
-
-## Troubleshooting
-
-To test whether `etcd` is running correctly, you can try writing a value to a
-test key. On your master VM (or somewhere with firewalls configured such that
-you can talk to your cluster's etcd), try:
-
-```shell
-curl -fs -X PUT "http://${host}:${port}/v2/keys/_test"
-```
+[Configuring Kubernetes Use of etcd](/docs/concepts/storage/etcd-store-api-object/)
diff --git a/docs/concepts/storage/etcd-store-api-object.md b/docs/concepts/storage/etcd-store-api-object.md
new file mode 100644
index 0000000000..4f92f07bd4
--- /dev/null
+++ b/docs/concepts/storage/etcd-store-api-object.md
@@ -0,0 +1,47 @@
+---
+title: Configuring Kubernetes Use of etcd
+---
+
+[etcd](https://coreos.com/etcd/docs/latest/) is a highly-available key value
+store which Kubernetes uses for persistent storage of all of its REST API
+objects.
+
+## Configuration: high-level goals
+
+Access Control: give *only* kube-apiserver read/write access to etcd. You do not
+want apiserver's etcd exposed to every node in your cluster (or worse, to the
+internet at large), because access to etcd is equivalent to root in your
+cluster.
+
+Data Reliability: for reasonable safety, either etcd needs to be run as a
+[cluster](/docs/admin/high-availability/#clustering-etcd) (multiple machines each running
+etcd) or etcd's data directory should be located on durable storage (e.g., GCE's
+persistent disk). In either case, if high availability is required--as it might
+be in a production cluster--the data directory ought to be [backed up
+periodically](https://coreos.com/etcd/docs/latest/op-guide/recovery.html),
+to reduce downtime in case of corruption.
+
+## Default configuration
+
+The default setup scripts use kubelet's file-based static pods feature to run etcd in a
+[pod](http://releases.k8s.io/{{page.githubbranch}}/cluster/saltbase/salt/etcd/etcd.manifest). This manifest should only
+be run on master VMs. The default location that kubelet scans for manifests is
+`/etc/kubernetes/manifests/`.
+
+## Kubernetes's usage of etcd
+
+By default, Kubernetes objects are stored under the `/registry` key in etcd.
+This path can be prefixed by using the [kube-apiserver](/docs/admin/kube-apiserver) flag
+`--etcd-prefix="/foo"`.
+
+`etcd` is the only place that Kubernetes keeps state.
+
+## Troubleshooting
+
+To test whether `etcd` is running correctly, you can try writing a value to a
+test key. On your master VM (or somewhere with firewalls configured such that
+you can talk to your cluster's etcd), try:
+
+```shell
+curl -fs -X PUT "http://${host}:${port}/v2/keys/_test"
+```