From ee641f1240ff55d3501bf3a982c2c6f437b76728 Mon Sep 17 00:00:00 2001 From: Sherlock113 Date: Mon, 26 Apr 2021 12:27:47 +0800 Subject: [PATCH] Update KS version Signed-off-by: Sherlock113 --- .../install-kubesphere-on-do.md | 2 +- .../install-kubesphere-on-eks.md | 2 +- .../install-kubesphere-on-gke.md | 2 +- .../install-kubesphere-on-huaweicloud-cce.md | 2 +- .../install-kubesphere-on-oke.md | 2 +- .../introduction/prerequisites.md | 6 +++--- .../ha-configuration.md | 6 +++--- ...et-up-ha-cluster-using-keepalived-haproxy.md | 6 +++--- .../introduction/air-gapped-installation.md | 2 +- .../installing-on-linux/introduction/kubekey.md | 17 ++++++++++++++++- .../introduction/multioverview.md | 4 ++-- .../install-kubesphere-on-bare-metal.md | 6 +++--- .../install-kubesphere-on-vmware-vsphere.md | 6 +++--- .../install-glusterfs.md | 4 ++-- .../install-nfs-client.md | 4 ++-- .../install-qingcloud-csi.md | 4 ++-- .../install-kubesphere-on-azure-vms.md | 6 +++--- .../install-kubesphere-on-qingcloud-vms.md | 6 +++--- .../en/docs/quick-start/all-in-one-on-linux.md | 4 ++-- .../quick-start/minimal-kubesphere-on-k8s.md | 2 +- .../upgrade/Air-Gapped-Upgrade-with-KubeKey.md | 2 +- 21 files changed, 55 insertions(+), 40 deletions(-) diff --git a/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md b/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md index c836fb5ce..649820ed1 100644 --- a/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md +++ b/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md @@ -28,7 +28,7 @@ You need to select: {{< notice note >}} -- Supported Kubernetes versions for KubeSphere 3.0.0: 1.15.x, 1.16.x, 1.17.x, 1.18.x. +- To install KubeSphere v3.1.0 on Kubernetes, your Kubernetes version must be v1.17.x, v1.18.x, v1.19.x or v1.20.x. - 2 nodes are included in this example. You can add more nodes based on your own needs especially in a production environment. - The machine type Standard / 4 GB / 2 vCPUs is for minimal installation. If you plan to enable several pluggable components or use the cluster for production, you can upgrade your nodes to a more powerfull type (such as CPU-Optimized / 8 GB / 4 vCPUs). It seems that DigitalOcean provisions the master nodes based on the type of the worker nodes, and for Standard ones the API server can become unresponsive quite soon. diff --git a/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-eks.md b/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-eks.md index 65b061cad..ad75e9c5b 100644 --- a/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-eks.md +++ b/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-eks.md @@ -79,7 +79,7 @@ Check the installation with `aws --version`. {{< notice note >}} -- Supported Kubernetes versions for KubeSphere 3.0.0: 1.15.x, 1.16.x, 1.17.x, 1.18.x. +- To install KubeSphere v3.1.0 on Kubernetes, your Kubernetes version must be v1.17.x, v1.18.x, v1.19.x or v1.20.x. - 3 nodes are included in this example. You can add more nodes based on your own needs especially in a production environment. - The machine type t3.medium (2 vCPU, 4GB memory) is for minimal installation. If you want to enable pluggable components or use the cluster for production, please select a machine type with more resources. - For other settings, you can change them as well based on your own needs or use the default value. diff --git a/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-gke.md b/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-gke.md index b481cbe40..890c455cc 100644 --- a/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-gke.md +++ b/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-gke.md @@ -30,7 +30,7 @@ This guide walks you through the steps of deploying KubeSphere on [Google Kubern {{< notice note >}} -- Supported Kubernetes versions for KubeSphere 3.0.0: 1.15.x, 1.16.x, 1.17.x, 1.18.x. +- To install KubeSphere v3.1.0 on Kubernetes, your Kubernetes version must be v1.17.x, v1.18.x, v1.19.x or v1.20.x. - 3 nodes are included in this example. You can add more nodes based on your own needs especially in a production environment. - The machine type e2-medium (2 vCPU, 4GB memory) is for minimal installation. If you want to enable pluggable components or use the cluster for production, please select a machine type with more resources. - For other settings, you can change them as well based on your own needs or use the default value. diff --git a/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-huaweicloud-cce.md b/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-huaweicloud-cce.md index 84053786d..a219cdf0d 100644 --- a/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-huaweicloud-cce.md +++ b/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-huaweicloud-cce.md @@ -14,7 +14,7 @@ This guide walks you through the steps of deploying KubeSphere on [Huaiwei CCE]( First, create a Kubernetes cluster based on the requirements below. -- KubeSphere 3.0.0 supports Kubernetes `1.15.x`, `1.16.x`, `1.17.x`, and `1.18.x`. Select a version and create the cluster, e.g. `v1.15.11` or `v1.17.9`. +- To install KubeSphere v3.1.0 on Kubernetes, your Kubernetes version must be v1.17.x, v1.18.x, v1.19.x or v1.20.x. - Ensure the cloud computing network for your Kubernetes cluster works, or use an elastic IP when you use **Auto Create** or **Select Existing**. You can also configure the network after the cluster is created. Refer to [NAT Gateway](https://support.huaweicloud.com/en-us/productdesc-natgateway/en-us_topic_0086739762.html). - Select `s3.xlarge.2` `4-core｜8GB` for nodes and add more if necessary (3 and more nodes are required for a production environment). diff --git a/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-oke.md b/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-oke.md index 7e274d83f..e0ba1bf68 100644 --- a/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-oke.md +++ b/content/en/docs/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-oke.md @@ -30,7 +30,7 @@ This guide walks you through the steps of deploying KubeSphere on [Oracle Kubern {{< notice note >}} - - Supported Kubernetes versions for KubeSphere 3.0.0: 1.15.x, 1.16.x, 1.17.x, 1.18.x. + - To install KubeSphere v3.1.0 on Kubernetes, your Kubernetes version must be v1.17.x, v1.18.x, v1.19.x or v1.20.x. - It is recommended that you should select **Public** for **Visibility Type**, which will assign a public IP address for every node. The IP address can be used later to access the web console of KubeSphere. - In Oracle Cloud, a Shape is a template that determines the number of CPUs, amount of memory, and other resources that are allocated to an instance. `VM.Standard.E2.2 (2 CPUs and 16G Memory)` is used in this example. For more information, see [Standard Shapes](https://docs.cloud.oracle.com/en-us/iaas/Content/Compute/References/computeshapes.htm#vmshapes__vm-standard). - 3 nodes are included in this example. You can add more nodes based on your own needs especially in a production environment. diff --git a/content/en/docs/installing-on-kubernetes/introduction/prerequisites.md b/content/en/docs/installing-on-kubernetes/introduction/prerequisites.md index 2fb5f4b2f..276da2cb9 100644 --- a/content/en/docs/installing-on-kubernetes/introduction/prerequisites.md +++ b/content/en/docs/installing-on-kubernetes/introduction/prerequisites.md @@ -8,7 +8,7 @@ weight: 4120 You can install KubeSphere on virtual machines and bare metal with Kubernetes also provisioned. In addition, KubeSphere can also be deployed on cloud-hosted and on-premises Kubernetes clusters as long as your Kubernetes cluster meets the prerequisites below. -- Kubernetes version: 1.15.x, 1.16.x, 1.17.x, 1.18.x. +- To install KubeSphere v3.1.0 on Kubernetes, your Kubernetes version must be v1.17.x, v1.18.x, v1.19.x or v1.20.x. - Available CPU > 1 Core and Memory > 2 G. - A **default** StorageClass in your Kubernetes cluster is configured; use `kubectl get sc` to verify it. - The CSR signing feature is activated in kube-apiserver when it is started with the `--cluster-signing-cert-file` and `--cluster-signing-key-file` parameters. See [RKE installation issue](https://github.com/kubesphere/kubesphere/issues/1925#issuecomment-591698309). @@ -19,8 +19,8 @@ You can install KubeSphere on virtual machines and bare metal with Kubernetes al ```bash $ kubectl version - Client Version: version.Info{Major:"1", Minor:"15", GitVersion:"v1.15.1", GitCommit:"4485c6f18cee9a5d3c3b4e523bd27972b1b53892", GitTreeState:"clean", BuildDate:"2019-07-18T09:09:21Z", GoVersion:"go1.12.5", Compiler:"gc", Platform:"linux/amd64"} - Server Version: version.Info{Major:"1", Minor:"15", GitVersion:"v1.15.1", GitCommit:"4485c6f18cee9a5d3c3b4e523bd27972b1b53892", GitTreeState:"clean", BuildDate:"2019-07-18T09:09:21Z", GoVersion:"go1.12.5", Compiler:"gc", Platform:"linux/amd64"} + Client Version: version.Info{Major:"1", Minor:"19", GitVersion:"v1.19.8", GitCommit:"fd5d41537aee486160ad9b5356a9d82363273721", GitTreeState:"clean", BuildDate:"2021-02-17T12:41:51Z", GoVersion:"go1.15.8", Compiler:"gc", Platform:"linux/amd64"} + Server Version: version.Info{Major:"1", Minor:"19", GitVersion:"v1.19.8", GitCommit:"fd5d41537aee486160ad9b5356a9d82363273721", GitTreeState:"clean", BuildDate:"2021-02-17T12:33:08Z", GoVersion:"go1.15.8", Compiler:"gc", Platform:"linux/amd64"} ``` {{< notice note >}} diff --git a/content/en/docs/installing-on-linux/high-availability-configurations/ha-configuration.md b/content/en/docs/installing-on-linux/high-availability-configurations/ha-configuration.md index b5a765edb..29159f56d 100644 --- a/content/en/docs/installing-on-linux/high-availability-configurations/ha-configuration.md +++ b/content/en/docs/installing-on-linux/high-availability-configurations/ha-configuration.md @@ -89,15 +89,15 @@ Make `kk` executable: chmod +x kk ``` -Create an example configuration file with default configurations. Here Kubernetes v1.17.9 is used as an example. +Create an example configuration file with default configurations. Here Kubernetes v1.20.4 is used as an example. ```bash -./kk create config --with-kubesphere v3.0.0 --with-kubernetes v1.17.9 +./kk create config --with-kubesphere v3.1.0 --with-kubernetes v1.20.4 ``` {{< notice note >}} -- Kubernetes versions that have been fully tested with KubeSphere: v1.15.12, v1.16.13, v1.17.9 (default), and v1.18.6. +- Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - If you do not add the flag `--with-kubesphere` in the command in this step, KubeSphere will not be deployed unless you install it using the `addons` field in the configuration file or add this flag again when you use `./kk create cluster` later. - If you add the flag `--with-kubesphere` without specifying a KubeSphere version, the latest version of KubeSphere will be installed. diff --git a/content/en/docs/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md b/content/en/docs/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md index e87694d78..07eb39de5 100644 --- a/content/en/docs/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md +++ b/content/en/docs/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md @@ -308,15 +308,15 @@ Make `kk` executable: chmod +x kk ``` -Create an example configuration file with default configurations. Here Kubernetes v1.17.9 is used as an example. +Create an example configuration file with default configurations. Here Kubernetes v1.20.4 is used as an example. ```bash -./kk create config --with-kubesphere v3.0.0 --with-kubernetes v1.17.9 +./kk create config --with-kubesphere v3.1.0 --with-kubernetes v1.20.4 ``` {{< notice note >}} -- Kubernetes versions that have been fully tested with KubeSphere: v1.15.12, v1.16.13, v1.17.9 (default), and v1.18.6. +- Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - If you do not add the flag `--with-kubesphere` in the command in this step, KubeSphere will not be deployed unless you install it using the `addons` field in the configuration file or add this flag again when you use `./kk create cluster` later. - If you add the flag `--with-kubesphere` without specifying a KubeSphere version, the latest version of KubeSphere will be installed. diff --git a/content/en/docs/installing-on-linux/introduction/air-gapped-installation.md b/content/en/docs/installing-on-linux/introduction/air-gapped-installation.md index 5795c16ae..033984518 100644 --- a/content/en/docs/installing-on-linux/introduction/air-gapped-installation.md +++ b/content/en/docs/installing-on-linux/introduction/air-gapped-installation.md @@ -204,7 +204,7 @@ As you install KubeSphere and Kubernetes on Linux, you need to prepare an image {{< notice note >}} - - You can change the Kubernetes version downloaded based on your needs. Supported versions: v1.15.12, v1.16.13, v1.17.9 (default) and v1.18.6. + - You can change the Kubernetes version downloaded based on your needs. Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - After you run the script, a folder `kubekey` is automatically created. Note that this file and `kk` must be placed in the same directory when you create the cluster later. diff --git a/content/en/docs/installing-on-linux/introduction/kubekey.md b/content/en/docs/installing-on-linux/introduction/kubekey.md index 0fbf16712..b48ad637b 100644 --- a/content/en/docs/installing-on-linux/introduction/kubekey.md +++ b/content/en/docs/installing-on-linux/introduction/kubekey.md @@ -71,4 +71,19 @@ After you download KubeKey, if you transfer it to a new machine also with poor n The commands above download the latest release (v1.0.1) of KubeKey. You can change the version number in the command to download a specific version. -{{}} \ No newline at end of file +{{}} + +## Support Matrix + +If you want to use KubeKey to install both Kubernetes and KubeSphere v3.1.0, see the following table of all supported Kubernetes versions. + +| KubeSphere version | Supported Kubernetes versions | +| ------------------ | ------------------------------------------------------------ | +| v3.1.0 | v1.17.0, v1.17.4, v1.17.5, v1.17.6, v1.17.7, v1.17.8, v1.17.9, v1.18.3, v1.18.5, v1.18.6, v1.18.8, v1.19.0, v1.19.8, v1.19.9, v1.20.4 | + +{{< notice note >}} + +- 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.1.0. If you want to [install KubeSphere v3.1.0 on an existing Kubernetes cluster](../../../installing-on-kubernetes/introduction/overview/), your Kubernetes version must be v1.17.x, v1.18.x, v1.19.x or v1.20.x. + +{{}} \ No newline at end of file diff --git a/content/en/docs/installing-on-linux/introduction/multioverview.md b/content/en/docs/installing-on-linux/introduction/multioverview.md index 59a28580b..902d4c718 100644 --- a/content/en/docs/installing-on-linux/introduction/multioverview.md +++ b/content/en/docs/installing-on-linux/introduction/multioverview.md @@ -151,7 +151,7 @@ Command: {{< notice note >}} -- Supported Kubernetes versions: *v1.15.12*, *v1.16.13*, *v1.17.9* (default), *v1.18.6*. +- Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - If you do not add the flag `--with-kubesphere` in the command in this step, KubeSphere will not be deployed unless you install it using the `addons` field in the configuration file or add this flag again when you use `./kk create cluster` later. - If you add the flag `--with-kubesphere` without specifying a KubeSphere version, the latest version of KubeSphere will be installed. @@ -166,7 +166,7 @@ Here are some examples for your reference: ./kk create config [-f ~/myfolder/abc.yaml] ``` -- You can specify a KubeSphere version that you want to install (e.g. `--with-kubesphere v3.0.0`). +- You can specify a KubeSphere version that you want to install (e.g. `--with-kubesphere v3.1.0`). ```bash ./kk create config --with-kubesphere [version] diff --git a/content/en/docs/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md b/content/en/docs/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md index 3310ef087..a51ca704a 100644 --- a/content/en/docs/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md +++ b/content/en/docs/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md @@ -244,15 +244,15 @@ chmod +x kk With KubeKey, you can install Kubernetes and KubeSphere together. You have the option to create a multi-node cluster by customizing parameters in the configuration file. -Create a Kubernetes cluster with KubeSphere installed (e.g. `--with-kubesphere v3.0.0`): +Create a Kubernetes cluster with KubeSphere installed (e.g. `--with-kubesphere v3.1.0`): ```bash -./kk create config --with-kubernetes v1.17.9 --with-kubesphere v3.0.0 +./kk create config --with-kubernetes v1.20.4 --with-kubesphere v3.1.0 ``` {{< notice note >}} -- The following Kubernetes versions have been fully tested with KubeSphere: v1.15.12, v1.16.13, v1.17.9 (default) and v1.18.6. +- Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - If you do not add the flag `--with-kubesphere` in the command above, KubeSphere will not be deployed unless you install it using the `addons` field in the configuration file or add this flag again when you use `./kk create cluster` later. - If you add the flag `--with-kubesphere` without specifying a KubeSphere version, the latest version of KubeSphere will be installed. diff --git a/content/en/docs/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md b/content/en/docs/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md index 6d0e318e1..2048a1c59 100644 --- a/content/en/docs/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md +++ b/content/en/docs/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md @@ -345,15 +345,15 @@ chmod +x kk With KubeKey, you can install Kubernetes and KubeSphere together. You have the option to create a multi-node cluster by customizing parameters in the configuration file. -Create a Kubernetes cluster with KubeSphere installed (e.g. `--with-kubesphere v3.0.0`): +Create a Kubernetes cluster with KubeSphere installed (e.g. `--with-kubesphere v3.1.0`): ```bash -./kk create config --with-kubernetes v1.17.9 --with-kubesphere v3.0.0 +./kk create config --with-kubernetes v1.19.8 --with-kubesphere v3.1.0 ``` {{< notice note >}} -- The following Kubernetes versions have been fully tested with KubeSphere: v1.15.12, v1.16.13, v1.17.9 (default) and v1.18.6. +- Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - If you do not add the flag `--with-kubesphere` in the command in this step, KubeSphere will not be deployed unless you install it using the `addons` field in the configuration file or add this flag again when you use `./kk create cluster` later. - If you add the flag `--with-kubesphere` without specifying a KubeSphere version, the latest version of KubeSphere will be installed. diff --git a/content/en/docs/installing-on-linux/persistent-storage-configurations/install-glusterfs.md b/content/en/docs/installing-on-linux/persistent-storage-configurations/install-glusterfs.md index 51b9f2a1d..555b30892 100644 --- a/content/en/docs/installing-on-linux/persistent-storage-configurations/install-glusterfs.md +++ b/content/en/docs/installing-on-linux/persistent-storage-configurations/install-glusterfs.md @@ -165,12 +165,12 @@ chmod +x kk 1. Specify a Kubernetes version and a KubeSphere version that you want to install. For example: ```bash - ./kk create config --with-kubernetes v1.17.9 --with-kubesphere v3.0.0 + ./kk create config --with-kubernetes v1.20.4 --with-kubesphere v3.1.0 ``` {{< notice note >}} - - Supported Kubernetes versions: v1.15.12, v1.16.13, v1.17.9 (default), v1.18.6. + - Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - If you do not add the flag `--with-kubesphere` in the command in this step, KubeSphere will not be deployed unless you install it using the `addons` field in the configuration file or add this flag again when you use `./kk create cluster` later. - If you add the flag `--with-kubesphere` without specifying a KubeSphere version, the latest version of KubeSphere will be installed. diff --git a/content/en/docs/installing-on-linux/persistent-storage-configurations/install-nfs-client.md b/content/en/docs/installing-on-linux/persistent-storage-configurations/install-nfs-client.md index 0f0ee7f44..11e5e7904 100644 --- a/content/en/docs/installing-on-linux/persistent-storage-configurations/install-nfs-client.md +++ b/content/en/docs/installing-on-linux/persistent-storage-configurations/install-nfs-client.md @@ -116,12 +116,12 @@ chmod +x kk 1. Specify a Kubernetes version and a KubeSphere version that you want to install. For example: ```bash - ./kk create config --with-kubernetes v1.17.9 --with-kubesphere v3.0.0 + ./kk create config --with-kubernetes v1.20.4 --with-kubesphere v3.1.0 ``` {{< notice note >}} - - Supported Kubernetes versions: v1.15.12, v1.16.13, v1.17.9 (default), v1.18.6. + - Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - If you do not add the flag `--with-kubesphere` in the command in this step, KubeSphere will not be deployed unless you install it using the `addons` field in the configuration file or add this flag again when you use `./kk create cluster` later. - If you add the flag `--with-kubesphere` without specifying a KubeSphere version, the latest version of KubeSphere will be installed. diff --git a/content/en/docs/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md b/content/en/docs/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md index 21fd81b3d..1d6bee84b 100644 --- a/content/en/docs/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md +++ b/content/en/docs/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md @@ -119,12 +119,12 @@ chmod +x kk 1. Specify a Kubernetes version and a KubeSphere version that you want to install. For example: ```bash - ./kk create config --with-kubernetes v1.17.9 --with-kubesphere v3.0.0 + ./kk create config --with-kubernetes v1.20.4 --with-kubesphere v3.1.0 ``` {{< notice note >}} - - Supported Kubernetes versions: v1.15.12, v1.16.13, v1.17.9 (default), v1.18.6. + - Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - If you do not add the flag `--with-kubesphere` in the command in this step, KubeSphere will not be deployed unless you install it using the `addons` field in the configuration file or add this flag again when you use `./kk create cluster` later. - If you add the flag `--with-kubesphere` without specifying a KubeSphere version, the latest version of KubeSphere will be installed. diff --git a/content/en/docs/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md b/content/en/docs/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md index 62695d1ef..1341df670 100644 --- a/content/en/docs/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md +++ b/content/en/docs/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md @@ -144,14 +144,14 @@ Make `kk` executable: chmod +x kk ``` -2. Create an example configuration file with default configurations. Here Kubernetes v1.17.9 is used as an example. +2. Create an example configuration file with default configurations. Here Kubernetes v1.20.4 is used as an example. ```bash -./kk create config --with-kubesphere v3.0.0 --with-kubernetes v1.17.9 +./kk create config --with-kubesphere v3.1.0 --with-kubernetes v1.20.4 ``` {{< notice note >}} -- These Kubernetes versions have been fully tested with KubeSphere: v1.15.12, v1.16.13, v1.17.9 (default), and v1.18.6. +- Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - If you do not add the flag `--with-kubesphere` in the command in this step, KubeSphere will not be deployed unless you install it using the `addons` field in the configuration file or add this flag again when you use `./kk create cluster` later. - If you add the flag `--with-kubesphere` without specifying a KubeSphere version, the latest version of KubeSphere will be installed. diff --git a/content/en/docs/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md b/content/en/docs/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md index 7736cb576..10f5ddec7 100644 --- a/content/en/docs/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md +++ b/content/en/docs/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md @@ -167,15 +167,15 @@ Make `kk` executable: chmod +x kk ``` -Create an example configuration file with default configurations. Here Kubernetes v1.17.9 is used as an example. +Create an example configuration file with default configurations. Here Kubernetes v1.20.4 is used as an example. ```bash -./kk create config --with-kubesphere v3.0.0 --with-kubernetes v1.17.9 +./kk create config --with-kubesphere v3.1.0 --with-kubernetes v1.20.4 ``` {{< notice note >}} -- These Kubernetes versions have been fully tested with KubeSphere: v1.15.12, v1.16.13, v1.17.9 (default), and v1.18.6. +- Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - If you do not add the flag `--with-kubesphere` in the command in this step, KubeSphere will not be deployed unless you install it using the `addons` field in the configuration file or add this flag again when you use `./kk create cluster` later. - If you add the flag `--with-kubesphere` without specifying a KubeSphere version, the latest version of KubeSphere will be installed. diff --git a/content/en/docs/quick-start/all-in-one-on-linux.md b/content/en/docs/quick-start/all-in-one-on-linux.md index d8e1f45db..236e2e75d 100644 --- a/content/en/docs/quick-start/all-in-one-on-linux.md +++ b/content/en/docs/quick-start/all-in-one-on-linux.md @@ -136,12 +136,12 @@ In this tutorial, you only need to execute one command for installation, the tem To create a Kubernetes cluster with KubeSphere installed, refer to the following command as an example: ```bash -./kk create cluster --with-kubernetes v1.17.9 --with-kubesphere v3.0.0 +./kk create cluster --with-kubernetes v1.20.4 --with-kubesphere v3.1.0 ``` {{< notice note >}} -- Supported Kubernetes versions: *v1.15.12*, *v1.16.13*, *v1.17.9* (default), *v1.18.6*. +- Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - For all-in-one installation, generally speaking, you do not need to change any configuration. - If you do not add the flag `--with-kubesphere` in the command in this step, KubeSphere will not be deployed. KubeKey will install Kubernetes only. If you add the flag `--with-kubesphere` without specifying a KubeSphere version, the latest version of KubeSphere will be installed. - KubeKey will install [OpenEBS](https://openebs.io/) to provision LocalPV for the development and testing environment by default, which is convenient for new users. For other storage classes, see [Persistent Storage Configurations](../../installing-on-linux/persistent-storage-configurations/understand-persistent-storage/). diff --git a/content/en/docs/quick-start/minimal-kubesphere-on-k8s.md b/content/en/docs/quick-start/minimal-kubesphere-on-k8s.md index 2bd721496..f68337103 100644 --- a/content/en/docs/quick-start/minimal-kubesphere-on-k8s.md +++ b/content/en/docs/quick-start/minimal-kubesphere-on-k8s.md @@ -10,7 +10,7 @@ In addition to installing KubeSphere on a Linux machine, you can also deploy it {{< notice note >}} -- To install KubeSphere on Kubernetes, your Kubernetes version must be `1.15.x, 1.16.x, 1.17.x, or 1.18.x`. +- To install KubeSphere v3.1.0 on Kubernetes, your Kubernetes version must be v1.17.x, v1.18.x, v1.19.x or v1.20.x. - Make sure your machine meets the minimal hardware requirement: CPU > 1 Core, Memory > 2 G. - A **default** Storage Class in your Kubernetes cluster needs to be configured before the installation. - The CSR signing feature is activated in `kube-apiserver` when it is started with the `--cluster-signing-cert-file` and `--cluster-signing-key-file` parameters. See [RKE installation issue](https://github.com/kubesphere/kubesphere/issues/1925#issuecomment-591698309). diff --git a/content/en/docs/upgrade/Air-Gapped-Upgrade-with-KubeKey.md b/content/en/docs/upgrade/Air-Gapped-Upgrade-with-KubeKey.md index 9ed6d4ebd..88bfe63e2 100644 --- a/content/en/docs/upgrade/Air-Gapped-Upgrade-with-KubeKey.md +++ b/content/en/docs/upgrade/Air-Gapped-Upgrade-with-KubeKey.md @@ -121,7 +121,7 @@ As you install KubeSphere and Kubernetes on Linux, you need to prepare an image {{< notice note >}} - - You can change the Kubernetes version downloaded based on your needs. Supported versions: v1.15.12, v1.16.13, v1.17.9 (default) and v1.18.6. + - You can change the Kubernetes version downloaded based on your needs. Recommended Kubernetes versions for KubeSphere v3.1.0: v1.17.9, v1.18.8, v1.19.8 and v1.20.4. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.19.8 by default. For more information about supported Kubernetes versions, see [Support Matrix](/docs/installing-on-linux/introduction/kubekey/#support-matrix). - You can upgrade Kubernetes from v1.16.13 to v1.17.9 by downloading the v1.17.9 Kubernetes binary file, but for cross-version upgrades, all intermediate versions need to be downloaded in advance. For example, if you want to upgrade Kubernetes from v1.15.12 to v1.18.6, you need to download Kubernetes v1.16.13 and v1.17.9, and the v1.18.6 binary file.