From e20a2cd1d12675721a5bcb415017faea7a091a8f Mon Sep 17 00:00:00 2001 From: Felixnoo Date: Tue, 14 Dec 2021 10:42:37 +0800 Subject: [PATCH] Remove Stale Docs and Update KubeSphere Federation Docs Signed-off-by: Felixnoo --- .../import-on-prem-k8s/_index.md | 7 ------- .../import-on-prem-k8s/import-kubeadm-k8s.md | 10 ---------- .../introduction/kubefed-in-kubesphere.md | 6 ++++-- .../import-on-prem-k8s/_index.md | 7 ------- .../import-on-prem-k8s/import-kubeadm-k8s.md | 10 ---------- .../introduction/kubefed-in-kubesphere.md | 4 ++-- 6 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 content/en/docs/multicluster-management/import-on-prem-k8s/_index.md delete mode 100644 content/en/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md delete mode 100644 content/zh/docs/multicluster-management/import-on-prem-k8s/_index.md delete mode 100644 content/zh/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md 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 deleted file mode 100644 index 8d0aeb228..000000000 --- a/content/en/docs/multicluster-management/import-on-prem-k8s/_index.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -linkTitle: "Import On-premises Kubernetes Clusters" -weight: 5400 - -_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 deleted file mode 100644 index 9370f4355..000000000 --- a/content/en/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Import Kubeadm Kubernetes Cluster" -keywords: 'kubernetes, kubesphere, multicluster, kubeadm' -description: 'Learn how to import a Kubernetes cluster created with kubeadm.' - - -weight: 5410 ---- - -TBD 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 8bcf7fd87..f4dcc4d82 100644 --- a/content/en/docs/multicluster-management/introduction/kubefed-in-kubesphere.md +++ b/content/en/docs/multicluster-management/introduction/kubefed-in-kubesphere.md @@ -10,9 +10,11 @@ The multi-cluster feature relates to the network connection among multiple clust ## How the Multi-cluster Architecture Works -Before you use the central control plane of KubeSphere to management multiple clusters, you need to create a host cluster, also known as **host** cluster. The host cluster, essentially, is a KubeSphere cluster with the multi-cluster feature enabled. It provides you with the control plane for unified management of Member Clusters, also known as **member** cluster. Member clusters are common KubeSphere clusters without the central control plane. Namely, tenants with necessary permissions (usually cluster administrators) can access the control plane from the host cluster to manage all member clusters, such as viewing and editing resources on member clusters. Conversely, if you access the web console of any member cluster separately, you cannot see any resources on other clusters. +Before you use the central control plane of KubeSphere to management multiple clusters, you need to create a host cluster, also known as **host** cluster. The host cluster, essentially, is a KubeSphere cluster with the multi-cluster feature enabled. It provides you with the control plane for unified management of member clusters, also known as **member** cluster. Member clusters are common KubeSphere clusters without the central control plane. Namely, tenants with necessary permissions (usually cluster administrators) can access the control plane from the host cluster to manage all member clusters, such as viewing and editing resources on member clusters. Conversely, if you access the web console of any member cluster separately, you cannot see any resources on other clusters. -There can only be one host cluster while multiple member clusters can exist at the same time. In a multi-cluster architecture, the network between the host cluster and member clusters can be connected directly or through an agent. The network between member clusters can be set in a completely isolated environment. +There can only be one host cluster while multiple member clusters can exist at the same time. In a multi-cluster architecture, the network between the host cluster and member clusters can be [connected directly](../../enable-multicluster/direct-connection/) or [through an agent](../../enable-multicluster/agent-connection/). The network between member clusters can be set in a completely isolated environment. + +If you are using on-premises Kubernetes clusters built through kubeadm, install KubeSphere on your Kubernetes clusters by referring to [Air-gapped Installation on Kubernetes](../../../installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped/), and then enable KubeSphere multi-cluster management through direct connection or agent connection. ![kubesphere-federation](/images/docs/multicluster-management/introduction/kubesphere-federation/kubesphere-federation.png) 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 deleted file mode 100644 index f3c73e7b7..000000000 --- a/content/zh/docs/multicluster-management/import-on-prem-k8s/_index.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -linkTitle: "导入本地 Kubernetes 集群" -weight: 5400 - -_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 deleted file mode 100644 index 2870c6b51..000000000 --- a/content/zh/docs/multicluster-management/import-on-prem-k8s/import-kubeadm-k8s.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: "Import Kubeadm Kubernetes Cluster" -keywords: 'kubernetes, kubesphere, multicluster, kubeadm' -description: '了解如何导入通过 kubeadm 创建的 Kubernetes 集群。' - - -weight: 5410 ---- - -TBD 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 502732558..a5ae68358 100644 --- a/content/zh/docs/multicluster-management/introduction/kubefed-in-kubesphere.md +++ b/content/zh/docs/multicluster-management/introduction/kubefed-in-kubesphere.md @@ -12,9 +12,9 @@ weight: 5120 在使用 KubeSphere 的中央控制平面管理多个集群之前，您需要创建一个主集群。主集群实际上是一个启用了多集群功能的 KubeSphere 集群，您可以使用它提供的控制平面统一管理。成员集群是没有中央控制平面的普通 KubeSphere 集群。也就是说，拥有必要权限的租户（通常是集群管理员）能够通过主集群访问控制平面，管理所有成员集群，例如查看和编辑成员集群上面的资源。反过来，如果您单独访问任意成员集群的 Web 控制台，您将无法查看其他集群的任何资源。 -![中央控制平面](/images/docs/zh-cn/multicluster-management/introduction/kubesphere-federation/central-control-plane.png) +只能有一个主集群存在，而多个成员集群可以同时存在。在多集群架构中，主集群和成员集群之间的网络可以[直接连接](../../enable-multicluster/direct-connection/)，或者通过[代理连接](../../enable-multicluster/agent-connection/)。成员集群之间的网络可以设置在完全隔离的环境中。 -只能有一个主集群存在，而多个成员集群可以同时存在。在多集群架构中，主集群和成员集群之间的网络可以直接连接，或者通过代理连接。成员集群之间的网络可以设置在完全隔离的环境中。 +如果您是使用通过 kubeadm 搭建的自建 Kubernetes 集群，请参阅[离线安装](../../../installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped/)在您的 Kubernetes 集群上安装 KubeSphere，然后通过直接连接或者代理连接来启用 KubeSphere 多集群管理功能。 ![Kubernetes 联邦](/images/docs/zh-cn/multicluster-management/introduction/kubesphere-federation/kubesphere-federation.png)