From dd00031de390d8340209459965cb2da0892ed489 Mon Sep 17 00:00:00 2001
From: Ray Zhou <ray@yunify.com>
Date: Sun, 29 Nov 2020 17:48:15 +0800
Subject: [PATCH] Update multi-cluster mgmt, re-org index, change remove
 cluster file name

Signed-off-by: Ray Zhou <ray@yunify.com>
---
 content/en/docs/multicluster-management/_index.md      |  7 +------
 .../enable-multicluster/_index.md                      |  2 +-
 .../enable-multicluster/agent-connection.md            |  2 +-
 .../enable-multicluster/direct-connection.md           |  2 +-
 .../enable-multicluster/retrieve-kubeconfig.md         |  2 +-
 .../import-cloud-hosted-k8s/_index.md                  |  2 +-
 .../import-cloud-hosted-k8s/import-aliyun-ack.md       |  2 +-
 .../import-cloud-hosted-k8s/import-aws-eks.md          |  2 +-
 .../import-on-prem-k8s/_index.md                       |  2 +-
 .../import-on-prem-k8s/import-kubeadm-k8s.md           |  2 +-
 .../multicluster-management/introduction/_index.md     |  2 +-
 .../introduction/kubefed-in-kubesphere.md              |  2 +-
 .../multicluster-management/introduction/overview.md   |  2 +-
 .../multicluster-management/remove-cluster/_index.md   |  7 -------
 .../remove-cluster/kubefed-in-kubesphere.md            | 10 ----------
 .../en/docs/multicluster-management/unbind-cluster.md  | 10 ++++++++++
 content/zh/docs/multicluster-management/_index.md      |  7 +------
 .../enable-multicluster/_index.md                      |  2 +-
 .../enable-multicluster/agent-connection.md            |  2 +-
 .../enable-multicluster/direct-connection.md           |  2 +-
 .../enable-multicluster/retrieve-kubeconfig.md         |  2 +-
 .../import-cloud-hosted-k8s/_index.md                  |  2 +-
 .../import-cloud-hosted-k8s/import-aliyun-ack.md       |  2 +-
 .../import-cloud-hosted-k8s/import-aws-eks.md          |  2 +-
 .../import-on-prem-k8s/_index.md                       |  2 +-
 .../import-on-prem-k8s/import-kubeadm-k8s.md           |  2 +-
 .../multicluster-management/introduction/_index.md     |  2 +-
 .../introduction/kubefed-in-kubesphere.md              |  2 +-
 .../multicluster-management/introduction/overview.md   |  2 +-
 .../multicluster-management/remove-cluster/_index.md   |  7 -------
 .../remove-cluster/kubefed-in-kubesphere.md            | 10 ----------
 .../zh/docs/multicluster-management/unbind-cluster.md  | 10 ++++++++++
 32 files changed, 46 insertions(+), 70 deletions(-)
 delete mode 100644 content/en/docs/multicluster-management/remove-cluster/_index.md
 delete mode 100644 content/en/docs/multicluster-management/remove-cluster/kubefed-in-kubesphere.md
 create mode 100644 content/en/docs/multicluster-management/unbind-cluster.md
 delete mode 100644 content/zh/docs/multicluster-management/remove-cluster/_index.md
 delete mode 100644 content/zh/docs/multicluster-management/remove-cluster/kubefed-in-kubesphere.md
 create mode 100644 content/zh/docs/multicluster-management/unbind-cluster.md

diff --git a/content/en/docs/multicluster-management/_index.md b/content/en/docs/multicluster-management/_index.md
index 36434b63d..0ff82cbcb 100644
--- a/content/en/docs/multicluster-management/_index.md
+++ b/content/en/docs/multicluster-management/_index.md
@@ -52,11 +52,6 @@ Learn how to import an Amazon Elastic Kubernetes Service cluster.
 
 Learn how to import a Kubernetes cluster created with kubeadm.
 
-## Remove Cluster
-
-### [Remove a Cluster from KubeSphere](../multicluster-management/remove-cluster/kubefed-in-kubesphere/)
+## [Unbind a Cluster](../multicluster-management/unbind-cluster/)
 
 Learn how to unbind a cluster from your cluster pool in KubeSphere.
-
-
-
diff --git a/content/en/docs/multicluster-management/enable-multicluster/_index.md b/content/en/docs/multicluster-management/enable-multicluster/_index.md
index 594cae3de..cfc5902db 100644
--- a/content/en/docs/multicluster-management/enable-multicluster/_index.md
+++ b/content/en/docs/multicluster-management/enable-multicluster/_index.md
@@ -1,6 +1,6 @@
 ---
 linkTitle: "Enable Multi-cluster in KubeSphere"
-weight: 3010
+weight: 6200
 
 _build:
     render: false
diff --git a/content/en/docs/multicluster-management/enable-multicluster/agent-connection.md b/content/en/docs/multicluster-management/enable-multicluster/agent-connection.md
index f969eb8bb..936ec0ad3 100644
--- a/content/en/docs/multicluster-management/enable-multicluster/agent-connection.md
+++ b/content/en/docs/multicluster-management/enable-multicluster/agent-connection.md
@@ -3,7 +3,7 @@ title: "Agent Connection"
 keywords: 'Kubernetes, KubeSphere, multicluster, agent-connection'
 description: 'Overview'
 
-weight: 3013
+weight: 6220
 ---
 
 ## Prerequisites
diff --git a/content/en/docs/multicluster-management/enable-multicluster/direct-connection.md b/content/en/docs/multicluster-management/enable-multicluster/direct-connection.md
index e4292d644..f81ff802c 100644
--- a/content/en/docs/multicluster-management/enable-multicluster/direct-connection.md
+++ b/content/en/docs/multicluster-management/enable-multicluster/direct-connection.md
@@ -3,7 +3,7 @@ title: "Direct Connection"
 keywords: 'Kubernetes, KubeSphere, multicluster, hybrid-cloud, direct-connection'
 description: 'Overview'
 
-weight: 3011
+weight: 6210
 ---
 
 ## Prerequisites
diff --git a/content/en/docs/multicluster-management/enable-multicluster/retrieve-kubeconfig.md b/content/en/docs/multicluster-management/enable-multicluster/retrieve-kubeconfig.md
index f070cffa2..d64876854 100644
--- a/content/en/docs/multicluster-management/enable-multicluster/retrieve-kubeconfig.md
+++ b/content/en/docs/multicluster-management/enable-multicluster/retrieve-kubeconfig.md
@@ -3,7 +3,7 @@ title: "Retrieve KubeConfig"
 keywords: 'Kubernetes, KubeSphere, multicluster, hybrid-cloud, kubeconfig'
 description: 'Describe how to retrieve kubeconfig from a Kuberenetes cluster'
 
-weight: 3014
+weight: 6230
 ---
 
 ## Prerequisites
diff --git a/content/en/docs/multicluster-management/import-cloud-hosted-k8s/_index.md b/content/en/docs/multicluster-management/import-cloud-hosted-k8s/_index.md
index 545c12498..7ca07371a 100644
--- a/content/en/docs/multicluster-management/import-cloud-hosted-k8s/_index.md
+++ b/content/en/docs/multicluster-management/import-cloud-hosted-k8s/_index.md
@@ -1,6 +1,6 @@
 ---
 linkTitle: "Import Cloud-hosted Kubernetes Cluster"
-weight: 3010
+weight: 6300
 
 _build:
     render: false
diff --git a/content/en/docs/multicluster-management/import-cloud-hosted-k8s/import-aliyun-ack.md b/content/en/docs/multicluster-management/import-cloud-hosted-k8s/import-aliyun-ack.md
index 8120c1e67..ad909072c 100644
--- a/content/en/docs/multicluster-management/import-cloud-hosted-k8s/import-aliyun-ack.md
+++ b/content/en/docs/multicluster-management/import-cloud-hosted-k8s/import-aliyun-ack.md
@@ -4,7 +4,7 @@ keywords: 'kubernetes, kubesphere, multicluster, ACK'
 description: 'Import Aliyun ACK Cluster'
 
 
-weight: 2340
+weight: 2610
 ---
 
 TBD
diff --git a/content/en/docs/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md b/content/en/docs/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md
index 00a84b9ef..5d4203119 100644
--- a/content/en/docs/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md
+++ b/content/en/docs/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md
@@ -4,7 +4,7 @@ keywords: 'Kubernetes, KubeSphere, multicluster, Amazon eks'
 description: 'Import AWS EKS Cluster'
 
 
-weight: 2340
+weight: 6320
 ---
 
 In this section, we are going to show you how to import EKS to KubeSphere using [direct connection](../../enable-multicluster/direct-connection) method. 
diff --git a/content/en/docs/multicluster-management/import-on-prem-k8s/_index.md b/content/en/docs/multicluster-management/import-on-prem-k8s/_index.md
index a5583e5da..61aade5af 100644
--- a/content/en/docs/multicluster-management/import-on-prem-k8s/_index.md
+++ b/content/en/docs/multicluster-management/import-on-prem-k8s/_index.md
@@ -1,6 +1,6 @@
 ---
 linkTitle: "Import On-prem Kubernetes Cluster"
-weight: 3010
+weight: 6400
 
 _build:
     render: false
diff --git a/content/en/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md b/content/en/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md
index 2b9ca939a..d09fe44e3 100644
--- a/content/en/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md
+++ b/content/en/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md
@@ -4,7 +4,7 @@ keywords: 'kubernetes, kubesphere, multicluster, kubeadm'
 description: 'Overview'
 
 
-weight: 2340
+weight: 6410
 ---
 
 TBD
diff --git a/content/en/docs/multicluster-management/introduction/_index.md b/content/en/docs/multicluster-management/introduction/_index.md
index 44efc6f9c..4baa66b2d 100644
--- a/content/en/docs/multicluster-management/introduction/_index.md
+++ b/content/en/docs/multicluster-management/introduction/_index.md
@@ -1,6 +1,6 @@
 ---
 linkTitle: "Introduction"
-weight: 3005
+weight: 6100
 
 _build:
     render: false
diff --git a/content/en/docs/multicluster-management/introduction/kubefed-in-kubesphere.md b/content/en/docs/multicluster-management/introduction/kubefed-in-kubesphere.md
index 077e0fa67..2e727d542 100644
--- a/content/en/docs/multicluster-management/introduction/kubefed-in-kubesphere.md
+++ b/content/en/docs/multicluster-management/introduction/kubefed-in-kubesphere.md
@@ -3,7 +3,7 @@ title: "KubeSphere Federation"
 keywords: 'Kubernetes, KubeSphere, federation, multicluster, hybrid-cloud'
 description: 'Overview'
 
-weight: 3007
+weight: 6120
 ---
 
 The multi-cluster feature relates to the network connection among multiple clusters. Therefore, it is important to understand the topological relations of clusters as the workload can be reduced.
diff --git a/content/en/docs/multicluster-management/introduction/overview.md b/content/en/docs/multicluster-management/introduction/overview.md
index 983c90d2e..d1f2ee317 100644
--- a/content/en/docs/multicluster-management/introduction/overview.md
+++ b/content/en/docs/multicluster-management/introduction/overview.md
@@ -3,7 +3,7 @@ title: "Overview"
 keywords: 'Kubernetes, KubeSphere, multicluster, hybrid-cloud'
 description: 'Overview'
 
-weight: 3006
+weight: 6110
 ---
 
 Today, it's very common for organizations to run and manage multiple Kubernetes clusters across different cloud providers or infrastructures. As each Kubernetes cluster is a relatively self-contained unit, the upstream community is struggling to research and develop a multi-cluster management solution. That said, Kubernetes Cluster Federation ([KubeFed](https://github.com/kubernetes-sigs/kubefed) for short) may be a possible approach among others.
diff --git a/content/en/docs/multicluster-management/remove-cluster/_index.md b/content/en/docs/multicluster-management/remove-cluster/_index.md
deleted file mode 100644
index b303ded0a..000000000
--- a/content/en/docs/multicluster-management/remove-cluster/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-linkTitle: "Remove Cluster"
-weight: 3010
-
-_build:
-    render: false
----
diff --git a/content/en/docs/multicluster-management/remove-cluster/kubefed-in-kubesphere.md b/content/en/docs/multicluster-management/remove-cluster/kubefed-in-kubesphere.md
deleted file mode 100644
index f9a72caac..000000000
--- a/content/en/docs/multicluster-management/remove-cluster/kubefed-in-kubesphere.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: "Remove a Cluster from KubeSphere"
-keywords: 'kubernetes, kubesphere, multicluster, hybrid-cloud'
-description: 'Overview'
-
-
-weight: 2340
----
-
-TBD
diff --git a/content/en/docs/multicluster-management/unbind-cluster.md b/content/en/docs/multicluster-management/unbind-cluster.md
new file mode 100644
index 000000000..b561fde58
--- /dev/null
+++ b/content/en/docs/multicluster-management/unbind-cluster.md
@@ -0,0 +1,10 @@
+---
+title: "Unbind a Cluster"
+keywords: 'kubernetes, kubesphere, multicluster, hybrid-cloud'
+description: 'Describe how to unbind a cluster from the KubeSphere multiple cluster management platform'
+
+
+weight: 6500
+---
+
+TBD
diff --git a/content/zh/docs/multicluster-management/_index.md b/content/zh/docs/multicluster-management/_index.md
index e8ef38bb5..61b287406 100644
--- a/content/zh/docs/multicluster-management/_index.md
+++ b/content/zh/docs/multicluster-management/_index.md
@@ -52,11 +52,6 @@ icon: "/images/docs/docs.svg"
 
 了解如何导入通过 kubeadm 创建的 Kubernetes 集群。
 
-## 删除集群
-
-### [从 KubeSphere 删除集群](../multicluster-management/remove-cluster/kubefed-in-kubesphere/)
+## [解绑集群](../multicluster-management/unbind-cluster/)
 
 了解如何从 KubeSphere 的集群池中解除集群的绑定。
-
-
-
diff --git a/content/zh/docs/multicluster-management/enable-multicluster/_index.md b/content/zh/docs/multicluster-management/enable-multicluster/_index.md
index a9c4f9dd1..1a7793df0 100644
--- a/content/zh/docs/multicluster-management/enable-multicluster/_index.md
+++ b/content/zh/docs/multicluster-management/enable-multicluster/_index.md
@@ -1,6 +1,6 @@
 ---
 linkTitle: "启用多集群"
-weight: 3010
+weight: 6200
 
 _build:
     render: false
diff --git a/content/zh/docs/multicluster-management/enable-multicluster/agent-connection.md b/content/zh/docs/multicluster-management/enable-multicluster/agent-connection.md
index 7750af6d1..1b3eb4026 100644
--- a/content/zh/docs/multicluster-management/enable-multicluster/agent-connection.md
+++ b/content/zh/docs/multicluster-management/enable-multicluster/agent-connection.md
@@ -3,7 +3,7 @@ title: "代理连接"
 keywords: 'Kubernetes, KubeSphere, 多集群, 代理连接'
 description: 'Overview'
 
-weight: 3013
+weight: 6220
 ---
 
 ## 前提条件
diff --git a/content/zh/docs/multicluster-management/enable-multicluster/direct-connection.md b/content/zh/docs/multicluster-management/enable-multicluster/direct-connection.md
index 1408206d9..52e151711 100644
--- a/content/zh/docs/multicluster-management/enable-multicluster/direct-connection.md
+++ b/content/zh/docs/multicluster-management/enable-multicluster/direct-connection.md
@@ -3,7 +3,7 @@ title: "直接连接"
 keywords: 'Kubernetes, KubeSphere, 多集群, 混合云, 直接连接'
 description: '介绍如何使用直接连接方式管理多集群'
 
-weight: 3011
+weight: 6210
 ---
 
 ## 前提条件
diff --git a/content/zh/docs/multicluster-management/enable-multicluster/retrieve-kubeconfig.md b/content/zh/docs/multicluster-management/enable-multicluster/retrieve-kubeconfig.md
index 47ea2d436..44bf058c5 100644
--- a/content/zh/docs/multicluster-management/enable-multicluster/retrieve-kubeconfig.md
+++ b/content/zh/docs/multicluster-management/enable-multicluster/retrieve-kubeconfig.md
@@ -3,7 +3,7 @@ title: "获取 KubeConfig"
 keywords: 'Kubernetes, KubeSphere, 多集群, 混合云, kubeconfig'
 description: '介绍如果获取一个 Kuberenetes 集群的 kubeconfig 信息'
 
-weight: 3014
+weight: 6230
 ---
 
 ## 前提条件
diff --git a/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/_index.md b/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/_index.md
index ae670c71a..706d54adc 100644
--- a/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/_index.md
+++ b/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/_index.md
@@ -1,6 +1,6 @@
 ---
 linkTitle: "导入云托管的 Kubernetes 集群"
-weight: 3020
+weight: 6300
 
 _build:
     render: false
diff --git a/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/import-aliyun-ack.md b/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/import-aliyun-ack.md
index 8120c1e67..2354acf02 100644
--- a/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/import-aliyun-ack.md
+++ b/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/import-aliyun-ack.md
@@ -4,7 +4,7 @@ keywords: 'kubernetes, kubesphere, multicluster, ACK'
 description: 'Import Aliyun ACK Cluster'
 
 
-weight: 2340
+weight: 6310
 ---
 
 TBD
diff --git a/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md b/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md
index 40e9070cc..86c31db1e 100644
--- a/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md
+++ b/content/zh/docs/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md
@@ -4,7 +4,7 @@ keywords: 'Kubernetes, KubeSphere, 多集群, Amazon eks'
 description: '导入 AWS EKS 集群'
 
 
-weight: 2340
+weight: 6320
 ---
 
 在本节中，我们将向您展示如何使用[直接连接](../../enable-multicluster/direct-connection)方法将 EKS 导入 KubeSphere。
diff --git a/content/zh/docs/multicluster-management/import-on-prem-k8s/_index.md b/content/zh/docs/multicluster-management/import-on-prem-k8s/_index.md
index 7f935053e..4fab64510 100644
--- a/content/zh/docs/multicluster-management/import-on-prem-k8s/_index.md
+++ b/content/zh/docs/multicluster-management/import-on-prem-k8s/_index.md
@@ -1,6 +1,6 @@
 ---
 linkTitle: "导入本地 Kubernetes 集群"
-weight: 3030
+weight: 6400
 
 _build:
     render: false
diff --git a/content/zh/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md b/content/zh/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md
index 2b9ca939a..d09fe44e3 100644
--- a/content/zh/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md
+++ b/content/zh/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md
@@ -4,7 +4,7 @@ keywords: 'kubernetes, kubesphere, multicluster, kubeadm'
 description: 'Overview'
 
 
-weight: 2340
+weight: 6410
 ---
 
 TBD
diff --git a/content/zh/docs/multicluster-management/introduction/_index.md b/content/zh/docs/multicluster-management/introduction/_index.md
index 9668e8ac4..c70f89d22 100644
--- a/content/zh/docs/multicluster-management/introduction/_index.md
+++ b/content/zh/docs/multicluster-management/introduction/_index.md
@@ -1,6 +1,6 @@
 ---
 linkTitle: "介绍"
-weight: 3005
+weight: 6100
 
 _build:
     render: false
diff --git a/content/zh/docs/multicluster-management/introduction/kubefed-in-kubesphere.md b/content/zh/docs/multicluster-management/introduction/kubefed-in-kubesphere.md
index 0d369f2d3..797b622de 100644
--- a/content/zh/docs/multicluster-management/introduction/kubefed-in-kubesphere.md
+++ b/content/zh/docs/multicluster-management/introduction/kubefed-in-kubesphere.md
@@ -3,7 +3,7 @@ title: "KubeSphere 联邦"
 keywords: 'Kubernetes, KubeSphere, 联邦, 多集群, 混合云'
 description: '概述'
 
-weight: 3007
+weight: 6120
 ---
 
 多集群功能与集群之间的网络连接有关。因此，了解集群的拓扑关系很重要，这样可以避免很多不必要的麻烦。
diff --git a/content/zh/docs/multicluster-management/introduction/overview.md b/content/zh/docs/multicluster-management/introduction/overview.md
index 58bb95ab2..3377f3741 100644
--- a/content/zh/docs/multicluster-management/introduction/overview.md
+++ b/content/zh/docs/multicluster-management/introduction/overview.md
@@ -3,7 +3,7 @@ title: "概述"
 keywords: 'Kubernetes, KubeSphere, 多集群, 混合云'
 description: '概述'
 
-weight: 3006
+weight: 6110
 ---
 
 如今，在不同的云服务提供商或者基础设施上运行和管理多个 Kubernetes 集群已经非常普遍。由于每个 Kubernetes 集群都是一个相对独立的单元，上游社区设计开发多集群管理解决方案非常的艰难，即便如此，Kubernetes 集群联邦（Kubernetes Cluster Federation，简称 [KubeFed](https://github.com/kubernetes-sigs/kubefed)）可能是其中一种可行的方法。
diff --git a/content/zh/docs/multicluster-management/remove-cluster/_index.md b/content/zh/docs/multicluster-management/remove-cluster/_index.md
deleted file mode 100644
index c5c5ebb99..000000000
--- a/content/zh/docs/multicluster-management/remove-cluster/_index.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-linkTitle: "删除集群"
-weight: 3040
-
-_build:
-    render: false
----
diff --git a/content/zh/docs/multicluster-management/remove-cluster/kubefed-in-kubesphere.md b/content/zh/docs/multicluster-management/remove-cluster/kubefed-in-kubesphere.md
deleted file mode 100644
index f9a72caac..000000000
--- a/content/zh/docs/multicluster-management/remove-cluster/kubefed-in-kubesphere.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: "Remove a Cluster from KubeSphere"
-keywords: 'kubernetes, kubesphere, multicluster, hybrid-cloud'
-description: 'Overview'
-
-
-weight: 2340
----
-
-TBD
diff --git a/content/zh/docs/multicluster-management/unbind-cluster.md b/content/zh/docs/multicluster-management/unbind-cluster.md
new file mode 100644
index 000000000..67f0f2da5
--- /dev/null
+++ b/content/zh/docs/multicluster-management/unbind-cluster.md
@@ -0,0 +1,10 @@
+---
+title: "解绑集群"
+keywords: 'kubernetes, kubesphere, multicluster, hybrid-cloud'
+description: '了解如何从 KubeSphere 的多集群池中解除集群的绑定'
+
+
+weight: 6500
+---
+
+TBD