From c025e88e3776a667c197b289ba2ddb5d87fcf07e Mon Sep 17 00:00:00 2001
From: Steve Perry <steveperry-53@users.noreply.github.com>
Date: Tue, 13 Feb 2018 17:10:51 -0800
Subject: [PATCH] Move redis config files out of old user-guide directory.
 (#7401)

---
 .../configuration}/configmap/redis/redis-config            | 0
 .../configuration}/configmap/redis/redis-pod.yaml          | 0
 .../configuration/configure-redis-using-configmap.md       | 7 +++----
 test/examples_test.go                                      | 6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename docs/{user-guide => tutorials/configuration}/configmap/redis/redis-config (100%)
 rename docs/{user-guide => tutorials/configuration}/configmap/redis/redis-pod.yaml (100%)

diff --git a/docs/user-guide/configmap/redis/redis-config b/docs/tutorials/configuration/configmap/redis/redis-config
similarity index 100%
rename from docs/user-guide/configmap/redis/redis-config
rename to docs/tutorials/configuration/configmap/redis/redis-config
diff --git a/docs/user-guide/configmap/redis/redis-pod.yaml b/docs/tutorials/configuration/configmap/redis/redis-pod.yaml
similarity index 100%
rename from docs/user-guide/configmap/redis/redis-pod.yaml
rename to docs/tutorials/configuration/configmap/redis/redis-pod.yaml
diff --git a/docs/tutorials/configuration/configure-redis-using-configmap.md b/docs/tutorials/configuration/configure-redis-using-configmap.md
index 53f5911d0a..81a449ebcf 100644
--- a/docs/tutorials/configuration/configure-redis-using-configmap.md
+++ b/docs/tutorials/configuration/configure-redis-using-configmap.md
@@ -34,11 +34,10 @@ This page provides a real world example of how to configure Redis using a Config
 
 You can follow the steps below to configure a Redis cache using data stored in a ConfigMap.
 
-1. Create a ConfigMap from the `docs/user-guide/configmap/redis/redis-config` file:
+1. Create a ConfigMap from the `docs/tutorials/configuration/configmap/redis/redis-config` file:
 
    ```shell
-   kubectl create configmap example-redis-config --from-file=docs/user-guide/configmap/redis/redis-config
-
+   kubectl create configmap example-redis-config --from-file=https://k8s.io/docs/tutorials/configuration/configmap/redis/redis-config
    kubectl get configmap example-redis-config -o yaml
    ```
 
@@ -95,7 +94,7 @@ You can follow the steps below to configure a Redis cache using data stored in a
 1. Create the pod:
 
    ```shell
-   kubectl create -f docs/user-guide/configmap/redis/redis-pod.yaml
+   kubectl create -f https://k8s.io/tutorials/configuration/configmap/redis/redis-pod.yaml
    ```
 
    In the example, the config volume is mounted at `/redis-master`.
diff --git a/test/examples_test.go b/test/examples_test.go
index 2b237749f3..8f43e6e039 100644
--- a/test/examples_test.go
+++ b/test/examples_test.go
@@ -473,6 +473,9 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"hello-apparmor-pod": {&api.Pod{}},
 			"my-scheduler":       {&extensions.Deployment{}},
 		},
+		"../docs/tutorials/configuration/configmap/redis": {
+			"redis-pod": {&api.Pod{}},
+		},
 		"../docs/concepts/overview/object-management-kubectl": {
 			"simple_deployment": {&extensions.Deployment{}},
 			"update_deployment": {&extensions.Deployment{}},
@@ -533,9 +536,6 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"mount-file-pod": {&api.Pod{}},
 			"volume-pod":     {&api.Pod{}},
 		},
-		"../docs/user-guide/configmap/redis": {
-			"redis-pod": {&api.Pod{}},
-		},
 		"../docs/user-guide/downward-api": {
 			"dapi-pod":                 {&api.Pod{}},
 			"dapi-container-resources": {&api.Pod{}},