From b03d96fd42c41ca678ca8edf8cc846714c522bd6 Mon Sep 17 00:00:00 2001 From: Bettygogo2021 <91529409+Bettygogo2021@users.noreply.github.com> Date: Wed, 31 Aug 2022 15:07:12 +0800 Subject: [PATCH] update kubeedge docs Signed-off-by: Bettygogo2021 <91529409+Bettygogo2021@users.noreply.github.com> --- .../installing-on-linux/cluster-operation/add-edge-nodes.md | 1 + .../en/docs/v3.3/installing-on-linux/introduction/kubekey.md | 2 +- content/en/docs/v3.3/pluggable-components/kubeedge.md | 4 ++++ .../installing-on-linux/cluster-operation/add-edge-nodes.md | 1 + .../zh/docs/v3.3/installing-on-linux/introduction/kubekey.md | 2 +- content/zh/docs/v3.3/pluggable-components/kubeedge.md | 4 ++++ 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/content/en/docs/v3.3/installing-on-linux/cluster-operation/add-edge-nodes.md b/content/en/docs/v3.3/installing-on-linux/cluster-operation/add-edge-nodes.md index 4b66b65de..9f798a2fe 100644 --- a/content/en/docs/v3.3/installing-on-linux/cluster-operation/add-edge-nodes.md +++ b/content/en/docs/v3.3/installing-on-linux/cluster-operation/add-edge-nodes.md @@ -21,6 +21,7 @@ This tutorial demonstrates how to add an edge node to your cluster. ## Prerequisites - You have enabled [KubeEdge](../../../pluggable-components/kubeedge/). +- To prevent compatability issues, you are advised to install Kubernetes v1.21.x or earlier. - You have an available node to serve as an edge node. The node can run either Ubuntu (recommended) or CentOS. This tutorial uses Ubuntu 18.04 as an example. - Edge nodes, unlike Kubernetes cluster nodes, should work in a separate network. diff --git a/content/en/docs/v3.3/installing-on-linux/introduction/kubekey.md b/content/en/docs/v3.3/installing-on-linux/introduction/kubekey.md index 9910963a1..9a9850d8e 100644 --- a/content/en/docs/v3.3/installing-on-linux/introduction/kubekey.md +++ b/content/en/docs/v3.3/installing-on-linux/introduction/kubekey.md @@ -85,5 +85,5 @@ If you want to use KubeKey to install both Kubernetes and KubeSphere 3.3.0, see - You can also run `./kk version --show-supported-k8s` to see all supported Kubernetes versions that can be installed by KubeKey. - The Kubernetes versions that can be installed using KubeKey are different from the Kubernetes versions supported by KubeSphere v3.3.0. If you want to [install KubeSphere 3.3.0 on an existing Kubernetes cluster](../../../installing-on-kubernetes/introduction/overview/), your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). -- If you want to use KubeEdge, you are advised to install Kubernetes v1.22.x or earlier to prevent compatability issues. +- If you want to use KubeEdge, you are advised to install Kubernetes v1.21.x or earlier to prevent compatability issues. {{}} \ No newline at end of file diff --git a/content/en/docs/v3.3/pluggable-components/kubeedge.md b/content/en/docs/v3.3/pluggable-components/kubeedge.md index 3df754190..265a7273d 100644 --- a/content/en/docs/v3.3/pluggable-components/kubeedge.md +++ b/content/en/docs/v3.3/pluggable-components/kubeedge.md @@ -63,6 +63,10 @@ When you implement multi-node installation of KubeSphere on Linux, you need to c As you [install KubeSphere on Kubernetes](../../installing-on-kubernetes/introduction/overview/), you can enable KubeEdge first in the [cluster-configuration.yaml](https://github.com/kubesphere/ks-installer/releases/download/v3.3.0/cluster-configuration.yaml) file. +{{< notice note >}} +To prevent compatability issues, you are advised to install Kubernetes v1.21.x or earlier. +{{}} + 1. Download the file [cluster-configuration.yaml](https://github.com/kubesphere/ks-installer/releases/download/v3.3.0/cluster-configuration.yaml) and edit it. ```bash diff --git a/content/zh/docs/v3.3/installing-on-linux/cluster-operation/add-edge-nodes.md b/content/zh/docs/v3.3/installing-on-linux/cluster-operation/add-edge-nodes.md index 0939eaf5d..87433d77b 100644 --- a/content/zh/docs/v3.3/installing-on-linux/cluster-operation/add-edge-nodes.md +++ b/content/zh/docs/v3.3/installing-on-linux/cluster-operation/add-edge-nodes.md @@ -21,6 +21,7 @@ KubeSphere 利用 [KubeEdge](https://kubeedge.io/zh/) 将原生容器化应用 ## 准备工作 - 您需要启用 [KubeEdge](../../../pluggable-components/kubeedge/)。 +- 为了避免兼容性问题,建议安装 v1.21.x 及以下版本的 Kubernetes。 - 您有一个可用节点作为边缘节点,该节点可以运行 Ubuntu(建议)或 CentOS。本教程以 Ubuntu 18.04 为例。 - 与 Kubernetes 集群节点不同,边缘节点应部署在单独的网络中。 diff --git a/content/zh/docs/v3.3/installing-on-linux/introduction/kubekey.md b/content/zh/docs/v3.3/installing-on-linux/introduction/kubekey.md index b0d2f046f..272204f8f 100644 --- a/content/zh/docs/v3.3/installing-on-linux/introduction/kubekey.md +++ b/content/zh/docs/v3.3/installing-on-linux/introduction/kubekey.md @@ -86,5 +86,5 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - - 您也可以运行 `./kk version --show-supported-k8s`,查看能使用 KubeKey 安装的所有受支持的 Kubernetes 版本。 - 能使用 KubeKey 安装的 Kubernetes 版本与 KubeSphere v3.3.0 支持的 Kubernetes 版本不同。如需[在现有 Kubernetes 集群上安装 KubeSphere 3.3.0](../../../installing-on-kubernetes/introduction/overview/),您的 Kubernetes 版本必须为 v1.19.x,v1.20.x,v1.21.x,v1.22.x 或 v1.23.x(实验性支持)。 -- 如果您需要使用 KubeEdge,为了避免兼容性问题,建议安装 v1.22.x 及以下版本的 Kubernetes。 +- 如果您需要使用 KubeEdge,为了避免兼容性问题,建议安装 v1.21.x 及以下版本的 Kubernetes。 {{}} \ No newline at end of file diff --git a/content/zh/docs/v3.3/pluggable-components/kubeedge.md b/content/zh/docs/v3.3/pluggable-components/kubeedge.md index 25b65e461..03cfee11e 100644 --- a/content/zh/docs/v3.3/pluggable-components/kubeedge.md +++ b/content/zh/docs/v3.3/pluggable-components/kubeedge.md @@ -64,6 +64,10 @@ KubeEdge 的组件在两个单独的位置运行——云上和边缘节点上 当您[在 Kubernetes 上安装 KubeSphere](../../installing-on-kubernetes/introduction/overview/) 时,需要先在 [cluster-configuration.yaml](https://github.com/kubesphere/ks-installer/releases/download/v3.3.0/cluster-configuration.yaml) 文件中启用 KubeEdge。 +{{< notice note >}} +为了避免兼容性问题,建议安装 Kubernetes v1.21.x 及其以下版本。 +{{}} + 1. 下载 [cluster-configuration.yaml](https://github.com/kubesphere/ks-installer/releases/download/v3.3.0/cluster-configuration.yaml) 文件并进行编辑。 ```bash