From 61c1605c2764e9e741834413e737d449a949f219 Mon Sep 17 00:00:00 2001 From: Steve Perry Date: Wed, 26 Apr 2017 08:24:44 -0700 Subject: [PATCH] Deprecation complete: etcd ... (#3543) --- docs/admin/dns.md | 10 ---------- docs/admin/etcd.md | 9 --------- docs/admin/multi-cluster.md | 9 --------- docs/admin/networking.md | 9 --------- docs/concepts/cluster-administration/configure-etcd.md | 3 +++ .../cluster-administration/multiple-clusters.md | 3 +++ docs/concepts/cluster-administration/networking.md | 3 +++ docs/concepts/services-networking/dns-pod-service.md | 3 +++ docs/tutorials/clusters/multiple-schedulers.md | 3 +++ 9 files changed, 15 insertions(+), 37 deletions(-) delete mode 100644 docs/admin/dns.md delete mode 100644 docs/admin/etcd.md delete mode 100644 docs/admin/multi-cluster.md delete mode 100644 docs/admin/networking.md diff --git a/docs/admin/dns.md b/docs/admin/dns.md deleted file mode 100644 index 84e97ce2bc..0000000000 --- a/docs/admin/dns.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -assignees: -- davidopp -- thockin -title: Using DNS Pods and Services ---- - -{% include user-guide-content-moved.md %} - -[DNS Pods and Services](/docs/concepts/services-networking/dns-pod-service/) diff --git a/docs/admin/etcd.md b/docs/admin/etcd.md deleted file mode 100644 index d8b1034f40..0000000000 --- a/docs/admin/etcd.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -assignees: -- lavalamp -title: Configuring Kubernetes Use of etcd ---- - -{% include user-guide-content-moved.md %} - -[Configuring Kubernetes Use of etcd](/docs/concepts/storage/etcd-store-api-object/) diff --git a/docs/admin/multi-cluster.md b/docs/admin/multi-cluster.md deleted file mode 100644 index 4fe4e8b6ae..0000000000 --- a/docs/admin/multi-cluster.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -assignees: -- davidopp -title: Using Multiple Clusters ---- - -{% include user-guide-content-moved.md %} - -[Using Multiple Clusters](/docs/concepts/cluster-administration/multiple-clusters/) diff --git a/docs/admin/networking.md b/docs/admin/networking.md deleted file mode 100644 index 7041b1b7e7..0000000000 --- a/docs/admin/networking.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -assignees: -- thockin -title: Networking in Kubernetes ---- - -{% include user-guide-content-moved.md %} - -[Cluster Networking](/docs/concepts/cluster-administration/networking/) diff --git a/docs/concepts/cluster-administration/configure-etcd.md b/docs/concepts/cluster-administration/configure-etcd.md index 9454cf4ec1..7a5db57110 100644 --- a/docs/concepts/cluster-administration/configure-etcd.md +++ b/docs/concepts/cluster-administration/configure-etcd.md @@ -3,6 +3,9 @@ title: Configuring Kubernetes Use of etcd redirect_from: - "/docs/concepts/storage/etcd-store-api-object/" - "/docs/concepts/storage/etcd-store-api-object.html" +redirect_from: +- "/docs/admin/etcd/" +- "/docs/admin/etcd.html" --- [etcd](https://coreos.com/etcd/docs/latest/) is a highly-available key value diff --git a/docs/concepts/cluster-administration/multiple-clusters.md b/docs/concepts/cluster-administration/multiple-clusters.md index 085a9afa9f..5d2a8dfe55 100644 --- a/docs/concepts/cluster-administration/multiple-clusters.md +++ b/docs/concepts/cluster-administration/multiple-clusters.md @@ -2,6 +2,9 @@ assignees: - davidopp title: Using Multiple Clusters +redirect_from: +- "/docs/admin/multi-cluster/" +- "/docs/admin/multi-cluster.html" --- You may want to set up multiple Kubernetes clusters, both to diff --git a/docs/concepts/cluster-administration/networking.md b/docs/concepts/cluster-administration/networking.md index 75f80415b0..b223279176 100644 --- a/docs/concepts/cluster-administration/networking.md +++ b/docs/concepts/cluster-administration/networking.md @@ -2,6 +2,9 @@ assignees: - thockin title: Cluster Networking +redirect_from: +- "/docs/admin/networking/" +- "/docs/admin/networking.html" --- Kubernetes approaches networking somewhat differently than Docker does by diff --git a/docs/concepts/services-networking/dns-pod-service.md b/docs/concepts/services-networking/dns-pod-service.md index 3530ef9d7d..710fa5b473 100644 --- a/docs/concepts/services-networking/dns-pod-service.md +++ b/docs/concepts/services-networking/dns-pod-service.md @@ -3,6 +3,9 @@ assignees: - davidopp - thockin title: DNS Pods and Services +redirect_from: +- "/docs/admin/dns/" +- "/docs/admin/dns.html" --- ## Introduction diff --git a/docs/tutorials/clusters/multiple-schedulers.md b/docs/tutorials/clusters/multiple-schedulers.md index 30ed7672c4..3f930d05e2 100644 --- a/docs/tutorials/clusters/multiple-schedulers.md +++ b/docs/tutorials/clusters/multiple-schedulers.md @@ -3,6 +3,9 @@ assignees: - davidopp - madhusudancs title: Configuring Multiple Schedulers +redirect_from: +- "/docs/admin/multiple-schedulers/" +- "/docs/admin/multiple-schedulers.html" --- Kubernetes ships with a default scheduler that is described [here](/docs/admin/kube-scheduler/).