From ba7c3005c92fe5935979f8155eed85377329171a Mon Sep 17 00:00:00 2001 From: wackxu Date: Wed, 15 Nov 2017 14:12:11 +0800 Subject: [PATCH 1/2] move some generated file to docs/reference/generated directory --- _data/reference.yml | 12 ++++++------ _redirects | 7 +++++++ .../generated}/cloud-controller-manager.md | 0 .../{admin => reference/generated}/kube-apiserver.md | 0 .../generated}/kube-controller-manager.md | 0 docs/{admin => reference/generated}/kube-proxy.md | 0 .../{admin => reference/generated}/kube-scheduler.md | 0 docs/{admin => reference/generated}/kubelet.md | 0 8 files changed, 13 insertions(+), 6 deletions(-) rename docs/{admin => reference/generated}/cloud-controller-manager.md (100%) rename docs/{admin => reference/generated}/kube-apiserver.md (100%) rename docs/{admin => reference/generated}/kube-controller-manager.md (100%) rename docs/{admin => reference/generated}/kube-proxy.md (100%) rename docs/{admin => reference/generated}/kube-scheduler.md (100%) rename docs/{admin => reference/generated}/kubelet.md (100%) diff --git a/_data/reference.yml b/_data/reference.yml index 0884201608..0db9d6ef0f 100644 --- a/_data/reference.yml +++ b/_data/reference.yml @@ -66,7 +66,7 @@ toc: - title: Cloud Controller Manager section: - - docs/admin/cloud-controller-manager.md + - docs/reference/generated/cloud-controller-manager.md - title: Setup Tools section: @@ -82,12 +82,12 @@ toc: - title: Config Reference section: - - docs/admin/kubelet.md + - docs/reference/generated/kubelet.md - docs/admin/kubelet-authentication-authorization.md - - docs/admin/kube-apiserver.md - - docs/admin/kube-controller-manager.md - - docs/admin/kube-proxy.md - - docs/admin/kube-scheduler.md + - docs/reference/generated/kube-apiserver.md + - docs/reference/generated/kube-controller-manager.md + - docs/reference/generated/kube-proxy.md + - docs/reference/generated/kube-scheduler.md - docs/admin/kubelet-tls-bootstrapping.md - docs/admin/federation-apiserver.md - docs/admin/federation-controller-manager.md diff --git a/_redirects b/_redirects index b7e3bc1af9..081590f6d4 100644 --- a/_redirects +++ b/_redirects @@ -410,3 +410,10 @@ /v1.1/docs/getting-started-guides/ /docs/tutorials/kubernetes-basics/ 301 https://kubernetes-io-v1-7.netlify.com/* https://v1-7.docs.kubernetes.io/"splat 301 + +/docs/admin/cloud-controller-manager/ /docs/reference/generated/cloud-controller-manager/ 301 +/docs/admin/kube-apiserver/ /docs/reference/generated/kube-apiserver/ 301 +/docs/admin/kube-controller-manager/ /docs/reference/generated/kube-controller-manager/ 301 +/docs/admin/kube-proxy/ /docs/reference/generated/kube-proxy/ 301 +/docs/admin/kube-scheduler/ /docs/reference/generated/kube-scheduler/ 301 +/docs/admin/kube-scheduler/ /docs/reference/generated/kube-scheduler/ 301 \ No newline at end of file diff --git a/docs/admin/cloud-controller-manager.md b/docs/reference/generated/cloud-controller-manager.md similarity index 100% rename from docs/admin/cloud-controller-manager.md rename to docs/reference/generated/cloud-controller-manager.md diff --git a/docs/admin/kube-apiserver.md b/docs/reference/generated/kube-apiserver.md similarity index 100% rename from docs/admin/kube-apiserver.md rename to docs/reference/generated/kube-apiserver.md diff --git a/docs/admin/kube-controller-manager.md b/docs/reference/generated/kube-controller-manager.md similarity index 100% rename from docs/admin/kube-controller-manager.md rename to docs/reference/generated/kube-controller-manager.md diff --git a/docs/admin/kube-proxy.md b/docs/reference/generated/kube-proxy.md similarity index 100% rename from docs/admin/kube-proxy.md rename to docs/reference/generated/kube-proxy.md diff --git a/docs/admin/kube-scheduler.md b/docs/reference/generated/kube-scheduler.md similarity index 100% rename from docs/admin/kube-scheduler.md rename to docs/reference/generated/kube-scheduler.md diff --git a/docs/admin/kubelet.md b/docs/reference/generated/kubelet.md similarity index 100% rename from docs/admin/kubelet.md rename to docs/reference/generated/kubelet.md From c531e1af40dc03a96a55c13da6763bee5fef3572 Mon Sep 17 00:00:00 2001 From: XsWack Date: Wed, 15 Nov 2017 17:49:25 +0800 Subject: [PATCH 2/2] Update _redirects --- _redirects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_redirects b/_redirects index fc12a74fc2..48ec59613a 100644 --- a/_redirects +++ b/_redirects @@ -421,7 +421,7 @@ https://kubernetes-io-v1-7.netlify.com/* https://v1-7.docs.kubernetes.io/"spl /docs/admin/federation-apiserver/ /docs/reference/generated/federation-apiserver/ 301 /docs/admin/kubefed/ /docs/reference/generated/kubefed/ 301 /docs/admin/kubefed_init/ /docs/reference/generated/kubefed_init/ 301 -/docs/admin/kubefed_join/ /docs/reference/generated/kubefed_join/ 30 +/docs/admin/kubefed_join/ /docs/reference/generated/kubefed_join/ 301 /docs/admin/kubefed_options/ /docs/reference/generated/kubefed_options/ 301 /docs/admin/kubefed_unjoin/ /docs/reference/generated/kubefed_unjoin/ 301 /docs/admin/kubefed_version/ /docs/reference/generated/kubefed_version/ 301