diff --git a/content/en/docs/installing-on-linux/cluster-operation/add-new-nodes.md b/content/en/docs/installing-on-linux/cluster-operation/add-new-nodes.md index 30bdf0ad8..ca974fa05 100644 --- a/content/en/docs/installing-on-linux/cluster-operation/add-new-nodes.md +++ b/content/en/docs/installing-on-linux/cluster-operation/add-new-nodes.md @@ -43,7 +43,7 @@ You can skip this step if you already have the configuration file on your machin roleGroups: etcd: - master1 - master: + control-plane: - master1 worker: - node1 @@ -105,7 +105,7 @@ The steps of adding master nodes are generally the same as adding worker nodes w - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 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 04d9c4b7a..2a8cdaebb 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 @@ -48,7 +48,7 @@ You must create a load balancer in your environment to listen (also known as lis Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -64,7 +64,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -79,7 +79,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} @@ -97,7 +97,7 @@ Create an example configuration file with default configurations. Here Kubernete {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../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. @@ -130,7 +130,7 @@ spec: - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 diff --git a/content/en/docs/installing-on-linux/high-availability-configurations/internal-ha-configuration.md b/content/en/docs/installing-on-linux/high-availability-configurations/internal-ha-configuration.md index b6cf6c97b..ed8fbf666 100644 --- a/content/en/docs/installing-on-linux/high-availability-configurations/internal-ha-configuration.md +++ b/content/en/docs/installing-on-linux/high-availability-configurations/internal-ha-configuration.md @@ -33,7 +33,7 @@ Refer to the following steps to download KubeKey. Download KubeKey from [its GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or run the following command. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -49,7 +49,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -64,7 +64,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The preceding commands download the latest release of KubeKey (v2.1.0). You can modify the version number in the command to download a specific version. +The preceding commands download the latest release of KubeKey (v2.2.1). You can modify the version number in the command to download a specific version. {{}} @@ -82,7 +82,7 @@ Create an example configuration file with default configurations. Here Kubernete {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../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. @@ -114,7 +114,7 @@ spec: - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 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 45e62d9d2..a42d80b1b 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 @@ -268,7 +268,7 @@ Before you start to create your Kubernetes cluster, make sure you have tested th Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -284,7 +284,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -299,7 +299,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} @@ -317,7 +317,7 @@ Create an example configuration file with default configurations. Here Kubernete {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../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. @@ -351,7 +351,7 @@ spec: - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 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 d06669dea..874db1c46 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 @@ -20,7 +20,7 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides |192.168.0.4 | node3 | Image registry node of the air-gapped environment | ## Preparations -1. Run the following commands to download KubeKey v2.1.0. +1. Run the following commands to download KubeKey v2.2.1. {{< tabs >}} {{< tab "Good network connections to GitHub/Googleapis" >}} @@ -28,7 +28,7 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash - curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - + curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -44,7 +44,7 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides Run the following command to download KubeKey: ```bash - curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - + curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -83,7 +83,7 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides repository: iso: localPath: "" - url: "https://github.com/kubesphere/kubekey/releases/download/v2.1.0/centos-7-amd64-rpms.iso" + url: "https://github.com/kubesphere/kubekey/releases/download/v2.2.1/centos-7-amd64-rpms.iso" kubernetesDistributions: - type: kubernetes version: v1.21.5 @@ -94,13 +94,11 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides version: v0.9.1 etcd: version: v3.4.13 - ## For now, if your cluster container runtime is containerd, KubeKey will add a docker 20.10.8 container runtime in the below list. - ## The reason is KubeKey creates a cluster with containerd by installing a docker first and making kubelet connect the socket file of containerd which docker contained. containerRuntimes: - type: docker version: 20.10.8 crictl: - version: v1.22.0 + version: v1.24.0 ## # docker-registry: # version: "2" @@ -247,7 +245,7 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides - You can customize the **manifest-sample.yaml** file to export the desired artifact file. - - You can download the ISO files at https://github.com/kubesphere/kubekey/releases/tag/v2.1.0. + - You can download the ISO files at https://github.com/kubesphere/kubekey/releases/tag/v2.2.1. {{}} @@ -283,8 +281,6 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides - Make sure the network connection is working. - - When exporting artifacts, KubeKey pulls images in the image list of the manifest file one by one. Make sure that the worker nodes have a minimum version of 1.4.9 containerd or that of 18.09 docker installed. - - KubeKey will resolve image names in the image list. If the image registry requires authentication, you can configure it in **.registry.auths** in the manifest file. {{}} ## Install Clusters in the Air-gapped Environment @@ -357,7 +353,6 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides # "dockerhub.kubekey.local": # username: admin # password: Harbor12345 - plainHTTP: false # Set the private registry to use during cluster deployment. privateRegistry: "" namespaceOverride: "" @@ -511,7 +506,6 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides "dockerhub.kubekey.local": username: admin password: Harbor12345 - plainHTTP: false privateRegistry: "dockerhub.kubekey.local" namespaceOverride: "kubesphereio" registryMirrors: [] diff --git a/content/en/docs/installing-on-linux/introduction/kubekey.md b/content/en/docs/installing-on-linux/introduction/kubekey.md index ed63684cb..bbb947b5a 100644 --- a/content/en/docs/installing-on-linux/introduction/kubekey.md +++ b/content/en/docs/installing-on-linux/introduction/kubekey.md @@ -38,7 +38,7 @@ With the configuration file in place, you execute the `./kk` command with varied Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -54,7 +54,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -69,7 +69,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} diff --git a/content/en/docs/installing-on-linux/introduction/multioverview.md b/content/en/docs/installing-on-linux/introduction/multioverview.md index 650abb5ac..194e6e417 100644 --- a/content/en/docs/installing-on-linux/introduction/multioverview.md +++ b/content/en/docs/installing-on-linux/introduction/multioverview.md @@ -30,7 +30,7 @@ Please see the requirements for hardware and operating system shown below. To ge | Systems | Minimum Requirements (Each node) | | ------------------------------------------------------ | ------------------------------------------- | -| **Ubuntu** *16.04, 18.04* | CPU: 2 Cores, Memory: 4 G, Disk Space: 40 G | +| **Ubuntu** *16.04, 18.04, 20.04* | CPU: 2 Cores, Memory: 4 G, Disk Space: 40 G | | **Debian** *Buster, Stretch* | CPU: 2 Cores, Memory: 4 G, Disk Space: 40 G | | **CentOS** *7*.x | CPU: 2 Cores, Memory: 4 G, Disk Space: 40 G | | **Red Hat Enterprise Linux** *7* | CPU: 2 Cores, Memory: 4 G, Disk Space: 40 G | @@ -110,7 +110,7 @@ Follow the step below to download [KubeKey](../kubekey). Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -126,7 +126,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -141,7 +141,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} @@ -165,7 +165,7 @@ Command: {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../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. @@ -205,7 +205,7 @@ spec: roleGroups: etcd: - master - master: + control-plane: - master worker: - node1 @@ -272,7 +272,7 @@ At the same time, you must provide the login information used to connect to each #### roleGroups - `etcd`: etcd node names -- `master`: Master node names +- `control-plane`: Control plane node names - `worker`: Worker node names #### controlPlaneEndpoint (for HA installation only) diff --git a/content/en/docs/installing-on-linux/introduction/vars.md b/content/en/docs/installing-on-linux/introduction/vars.md index 990f8a5e4..61de02825 100644 --- a/content/en/docs/installing-on-linux/introduction/vars.md +++ b/content/en/docs/installing-on-linux/introduction/vars.md @@ -45,7 +45,7 @@ The below table describes the above parameters in detail. version - The Kubernetes version to be installed. If you do not specify a Kubernetes version, {{< contentLink "docs/installing-on-linux/introduction/kubekey" "KubeKey" >}} v2.1.0 will install Kubernetes v1.21.5 by default. For more information, see {{< contentLink "docs/installing-on-linux/introduction/kubekey/#support-matrix" "Support Matrix" >}}. + The Kubernetes version to be installed. If you do not specify a Kubernetes version, {{< contentLink "docs/installing-on-linux/introduction/kubekey" "KubeKey" >}} v2.2.1 will install Kubernetes v1.21.5 by default. For more information, see {{< contentLink "docs/installing-on-linux/introduction/kubekey/#support-matrix" "Support Matrix" >}}. imageRepo diff --git a/content/en/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md b/content/en/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md index bdc23174a..4be6e0fb0 100644 --- a/content/en/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md +++ b/content/en/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md @@ -32,7 +32,7 @@ Follow the step below to download [KubeKey](../../../installing-on-linux/introdu Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -48,7 +48,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -63,7 +63,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. Note that an earlier version of KubeKey cannot be used to install K3s. +The commands above download the latest release (v2.2.1) of KubeKey. Note that an earlier version of KubeKey cannot be used to install K3s. {{}} @@ -83,7 +83,7 @@ chmod +x kk {{< notice note >}} - KubeKey v2.1.0 supports the installation of K3s v1.21.4. + KubeKey v2.2.1 supports the installation of K3s v1.21.4. {{}} @@ -105,7 +105,7 @@ chmod +x kk roleGroups: etcd: - master - master: + control-plane: - master worker: - node1 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 9f9110a91..e845d31b8 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 @@ -199,7 +199,7 @@ Follow the step below to download KubeKey. Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -215,7 +215,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -230,7 +230,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} @@ -252,7 +252,7 @@ Create a Kubernetes cluster with KubeSphere installed (for example, `--with-kube {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../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. @@ -278,7 +278,7 @@ spec: roleGroups: etcd: - master1 - master: + control-plane: - master1 worker: - worker1 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 e7376f6bd..c24724d2c 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 @@ -300,7 +300,7 @@ Follow the step below to download KubeKey. Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -316,7 +316,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -331,7 +331,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} @@ -353,7 +353,7 @@ Create a Kubernetes cluster with KubeSphere installed (for example, `--with-kube {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../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. @@ -384,7 +384,7 @@ spec: - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 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 69433a953..ff859c0a6 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 @@ -119,7 +119,7 @@ Follow the steps below to download [KubeKey](../../../installing-on-linux/introd Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -135,7 +135,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -150,7 +150,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} @@ -170,7 +170,7 @@ chmod +x kk {{< notice note >}} - - Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). + - Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../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. @@ -195,7 +195,7 @@ chmod +x kk roleGroups: etcd: - client1 - master: + control-plane: - client1 worker: - client2 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 da64a88f8..a816885a6 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 @@ -71,7 +71,7 @@ Follow the steps below to download [KubeKey](../../../installing-on-linux/introd Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -87,7 +87,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -102,7 +102,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} @@ -122,7 +122,7 @@ chmod +x kk {{< notice note >}} - - Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). + - Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../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. @@ -147,7 +147,7 @@ chmod +x kk roleGroups: etcd: - client1 - master: + control-plane: - client1 worker: - client2 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 b0d971efc..fb2e7a28b 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 @@ -73,7 +73,7 @@ Follow the steps below to download [KubeKey](../../../installing-on-linux/introd Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -89,7 +89,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -104,7 +104,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} @@ -124,7 +124,7 @@ chmod +x kk {{< notice note >}} - - Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). + - Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../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. @@ -149,7 +149,7 @@ chmod +x kk roleGroups: etcd: - master - master: + control-plane: - master worker: - node1 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 84b1b1c95..5923ee6df 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 @@ -101,7 +101,7 @@ ssh -i .ssh/id_rsa2 -p50200 kubesphere@40.81.5.xx Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -117,7 +117,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -132,7 +132,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} @@ -150,7 +150,7 @@ The commands above download the latest release (v2.1.0) of KubeKey. You can chan {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../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. @@ -173,7 +173,7 @@ spec: - master-0 - master-1 - master-2 - master: + control-plane: - master-0 - master-1 - master-2 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 c905f01a6..659cbbe57 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 @@ -126,7 +126,7 @@ Follow the step below to download KubeKey. Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -142,7 +142,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -157,7 +157,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} @@ -175,7 +175,7 @@ Create an example configuration file with default configurations. Here Kubernete {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../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. @@ -211,7 +211,7 @@ spec: - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 diff --git a/content/en/docs/introduction/what's-new-in-3.3.0.md b/content/en/docs/introduction/what's-new-in-3.3.0.md index fb915f613..50c5f5f53 100644 --- a/content/en/docs/introduction/what's-new-in-3.3.0.md +++ b/content/en/docs/introduction/what's-new-in-3.3.0.md @@ -6,8 +6,8 @@ linkTitle: "What's New in 3.3.0" weight: 1400 --- -On Nov 2, 2021, GPU resource scheduling and management and GPU usage monitoring further improve user experience in cloud-native AI scenarios. Moreover, enhanced features such as multi-cluster management, multi-tenant management, observability, DevOps, app store, and service mesh further perfect the interactive design for better user experience. +In June 2022, KubeSphere 3.3.0 has been released with more exciting features. This release introduces GitOps-based continuous deployment and supports Git-based code repository management to further optimize the DevOps feature. Moreover, it also provides enhanced features of storage, multi-tenancy, multi-cluster, observability, app store, service mesh, and edge computing, to further perfect the interactive design for better user experience. -In addition to the above highlights, KubeSphere 3.3.0 also features other functionality upgrades and fixed the known bugs. There were some deprecated or removed features in 3.3.0. For more and detailed information, see the [3.3.0 GA announcement](../../../blogs/kubesphere-3.2.0-ga-announcement/). +If you want to know details about new feature of KubeSphere 3.3.0, you can read the article [KubeSphere 3.2.0 发布：带来面向 AI 场景的 GPU 调度与更灵活的网关](../../../blogs/kubesphere-3.2.0-ga-announcement/). -On Dec 20, 2021, KubeSphere 3.3.0 was released. It introduced some enhancements, fixed some bugs, and brought better user experience, see the [Release Notes for 3.3.0](../../release/release-v320/) for details. +In addition to the above highlights, this release also features other functionality upgrades and fixes the known bugs. There were some deprecated or removed features in 3.3.0. For more and detailed information, see the [KubeSphere 3.3.0 Release Notes](../../release/release-v320/). \ No newline at end of file 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 10ccc2630..789708b5b 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 @@ -83,12 +83,6 @@ Your cluster must have an available container runtime. If you use KubeKey to set -{{< notice note >}} - -To deploy KubeSphere in an offline environment, you must install a container runtime in advance. - -{{}} - ### Dependency requirements KubeKey can install Kubernetes and KubeSphere together. The dependency that needs to be installed may be different based on the Kubernetes version to be installed. You can refer to the following list to see if you need to install relevant dependencies on your node in advance. @@ -151,7 +145,7 @@ Perform the following steps to download KubeKey. Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or run the following command: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -167,7 +161,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -182,7 +176,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} @@ -219,10 +213,6 @@ After you run the command, you will see a table for environment check. For detai ## Step 4: Verify the Installation -If the following information is displayed, Kubernetes and KubeSphere is successfully installed. - -![Installation-complete](/images/docs/quickstart/all-in-one-installation/Installation-complete.png) - Run the following command to check the result. ```bash 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 466f7b35c..5b512c153 100644 --- a/content/en/docs/upgrade/air-gapped-upgrade-with-kubekey.md +++ b/content/en/docs/upgrade/air-gapped-upgrade-with-kubekey.md @@ -32,7 +32,7 @@ KubeKey upgrades Kubernetes from one MINOR version to the next MINOR version unt | Systems | Minimum Requirements (Each node) | | --------------------------------------------------------------- | ------------------------------------------- | -| **Ubuntu** *16.04, 18.04* | CPU: 2 Cores, Memory: 4 G, Disk Space: 40 G | +| **Ubuntu** *16.04, 18.04, 20.04* | CPU: 2 Cores, Memory: 4 G, Disk Space: 40 G | | **Debian** *Buster, Stretch* | CPU: 2 Cores, Memory: 4 G, Disk Space: 40 G | | **CentOS** *7.x* | CPU: 2 Cores, Memory: 4 G, Disk Space: 40 G | | **Red Hat Enterprise Linux** *7* | CPU: 2 Cores, Memory: 4 G, Disk Space: 40 G | @@ -47,7 +47,7 @@ KubeKey upgrades Kubernetes from one MINOR version to the next MINOR version unt ### Step 1: Download KubeKey -Similar to installing KubeSphere on Linux in an online environment, you need to [download KubeKey v2.1.0](https://github.com/kubesphere/kubekey/releases) first. Download the `tar.gz` file, and transfer it to your local machine which serves as the taskbox for installation. After you uncompress the file, execute the following command to make `kk` executable: +Similar to installing KubeSphere on Linux in an online environment, you need to [download KubeKey v2.2.1](https://github.com/kubesphere/kubekey/releases) first. Download the `tar.gz` file, and transfer it to your local machine which serves as the taskbox for installation. After you uncompress the file, execute the following command to make `kk` executable: ```bash chmod +x kk @@ -113,7 +113,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. Recommended Kubernetes versions for KubeSphere 3.3.0 are v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../installing-on-linux/introduction/kubekey/#support-matrix). + - You can change the Kubernetes version downloaded based on your needs. Recommended Kubernetes versions for KubeSphere 3.3.0 are v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../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. @@ -204,7 +204,7 @@ For air-gapped installation, you must specify `privateRegistry`, which is `docke roleGroups: etcd: - ks.master - master: + control-plane: - ks.master worker: - ks.master @@ -288,7 +288,7 @@ Set `hosts` of your `config-sample.yaml` file: roleGroups: etcd: - ks.master - master: + control-plane: - ks.master worker: - ks.slave1 diff --git a/content/en/docs/upgrade/upgrade-with-kubekey.md b/content/en/docs/upgrade/upgrade-with-kubekey.md index d23fc235a..ca556af54 100644 --- a/content/en/docs/upgrade/upgrade-with-kubekey.md +++ b/content/en/docs/upgrade/upgrade-with-kubekey.md @@ -27,7 +27,7 @@ Follow the steps below to download KubeKey before you upgrade your cluster. Download KubeKey from its [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) or use the following command directly. ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -43,7 +43,7 @@ export KKZONE=cn Run the following command to download KubeKey: ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -58,7 +58,7 @@ After you download KubeKey, if you transfer it to a new machine also with poor n {{< notice note >}} -The commands above download the latest release (v2.1.0) of KubeKey. You can change the version number in the command to download a specific version. +The commands above download the latest release (v2.2.1) of KubeKey. You can change the version number in the command to download a specific version. {{}} diff --git a/content/zh/common/system-requirements.md b/content/zh/common/system-requirements.md index 842080efb..a23d6bcd8 100644 --- a/content/zh/common/system-requirements.md +++ b/content/zh/common/system-requirements.md @@ -5,7 +5,7 @@ _build: | 系统 | 最低要求（每个节点） | | ------------------------------------------------------------ | ---------------------------------- | -| **Ubuntu** *16.04，18.04* | CPU：2 核，内存：4 GB，硬盘：40 GB | +| **Ubuntu** *16.04，18.04，20.04* | CPU：2 核，内存：4 GB，硬盘：40 GB | | **Debian** *Buster，Stretch* | CPU：2 核，内存：4 GB，硬盘：40 GB | | **CentOS** *7*.x | CPU：2 核，内存：4 GB，硬盘：40 GB | | **Red Hat Enterprise Linux** *7* | CPU：2 核，内存：4 GB，硬盘：40 GB | diff --git a/content/zh/docs/installing-on-linux/cluster-operation/add-new-nodes.md b/content/zh/docs/installing-on-linux/cluster-operation/add-new-nodes.md index 150979b79..bbd131dc1 100644 --- a/content/zh/docs/installing-on-linux/cluster-operation/add-new-nodes.md +++ b/content/zh/docs/installing-on-linux/cluster-operation/add-new-nodes.md @@ -42,7 +42,7 @@ KubeSphere 使用一段时间之后，由于工作负载不断增加，您可能 roleGroups: etcd: - master1 - master: + control-plane: - master1 worker: - node1 @@ -107,7 +107,7 @@ KubeSphere 使用一段时间之后，由于工作负载不断增加，您可能 - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 diff --git a/content/zh/docs/installing-on-linux/high-availability-configurations/ha-configuration.md b/content/zh/docs/installing-on-linux/high-availability-configurations/ha-configuration.md index 655656f2d..dc7bc9a1b 100644 --- a/content/zh/docs/installing-on-linux/high-availability-configurations/ha-configuration.md +++ b/content/zh/docs/installing-on-linux/high-availability-configurations/ha-configuration.md @@ -48,7 +48,7 @@ weight: 3150 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或直接使用以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -64,7 +64,7 @@ export KKZONE=cn 执行以下命令下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -79,7 +79,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -执行以上命令会下载最新版 KubeKey (v2.1.0)，您可以修改命令中的版本号下载指定版本。 +执行以上命令会下载最新版 KubeKey (v2.2.1)，您可以修改命令中的版本号下载指定版本。 {{}} @@ -97,7 +97,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 @@ -131,7 +131,7 @@ spec: - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 diff --git a/content/zh/docs/installing-on-linux/high-availability-configurations/internal-ha-configuration.md b/content/zh/docs/installing-on-linux/high-availability-configurations/internal-ha-configuration.md index d66ce6ccd..f5118e9f3 100644 --- a/content/zh/docs/installing-on-linux/high-availability-configurations/internal-ha-configuration.md +++ b/content/zh/docs/installing-on-linux/high-availability-configurations/internal-ha-configuration.md @@ -33,7 +33,7 @@ weight: 3150 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或直接使用以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -49,7 +49,7 @@ export KKZONE=cn 执行以下命令下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -64,7 +64,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -执行以上命令会下载最新版 KubeKey (v2.1.0)，您可以修改命令中的版本号下载指定版本。 +执行以上命令会下载最新版 KubeKey (v2.2.1)，您可以修改命令中的版本号下载指定版本。 {{}} @@ -82,7 +82,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 @@ -116,7 +116,7 @@ spec: - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 diff --git a/content/zh/docs/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md b/content/zh/docs/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md index fcd9502b6..e41c3415d 100644 --- a/content/zh/docs/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md +++ b/content/zh/docs/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md @@ -267,7 +267,7 @@ yum install keepalived haproxy psmisc -y 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或者直接使用以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -283,7 +283,7 @@ export KKZONE=cn 运行以下命令来下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -298,7 +298,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -通过以上命令，可以下载 KubeKey 的最新版本 (v2.1.0)。您可以更改命令中的版本号来下载特定的版本。 +通过以上命令，可以下载 KubeKey 的最新版本 (v2.2.1)。您可以更改命令中的版本号来下载特定的版本。 {{}} @@ -316,7 +316,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您没有在本步骤的命令中添加标志 `--with-kubesphere`，那么除非您使用配置文件中的 `addons` 字段进行安装，或者稍后使用 `./kk create cluster` 时再添加该标志，否则 KubeSphere 将不会被部署。 - 如果您添加标志 `--with-kubesphere` 时未指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 @@ -350,7 +350,7 @@ spec: - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 diff --git a/content/zh/docs/installing-on-linux/introduction/air-gapped-installation.md b/content/zh/docs/installing-on-linux/introduction/air-gapped-installation.md index 93b9bd275..c591911b5 100644 --- a/content/zh/docs/installing-on-linux/introduction/air-gapped-installation.md +++ b/content/zh/docs/installing-on-linux/introduction/air-gapped-installation.md @@ -23,7 +23,7 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 ## 部署准备 -1. 执行以下命令下载 KubeKey v2.1.0 并解压： +1. 执行以下命令下载 KubeKey v2.2.1 并解压： {{< tabs >}} @@ -32,7 +32,7 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或者直接运行以下命令。 ```bash - curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - + curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -48,7 +48,7 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 运行以下命令来下载 KubeKey： ```bash - curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - + curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -87,7 +87,7 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 repository: iso: localPath: "" - url: "https://github.com/kubesphere/kubekey/releases/download/v2.1.0/centos-7-amd64-rpms.iso" + url: "https://github.com/kubesphere/kubekey/releases/download/v2.2.1/centos-7-amd64-rpms.iso" kubernetesDistributions: - type: kubernetes version: v1.21.5 @@ -98,13 +98,11 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 version: v0.9.1 etcd: version: v3.4.13 - ## For now, if your cluster container runtime is containerd, KubeKey will add a docker 20.10.8 container runtime in the below list. - ## The reason is KubeKey creates a cluster with containerd by installing a docker first and making kubelet connect the socket file of containerd which docker contained. containerRuntimes: - type: docker version: 20.10.8 crictl: - version: v1.22.0 + version: v1.24.0 ## # docker-registry: # version: "2" @@ -254,7 +252,7 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 - 可根据实际情况修改 **manifest-sample.yaml** 文件的内容，用于之后导出期望的 artifact 文件。 - - 您可以访问 https://github.com/kubesphere/kubekey/releases/tag/v2.1.0 下载 ISO 文件。 + - 您可以访问 https://github.com/kubesphere/kubekey/releases/tag/v2.2.1 下载 ISO 文件。 {{}} @@ -292,8 +290,6 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 - 导出时请确保网络连接正常。 - - 导出 artifact 时会根据 manifest 文件中的镜像列表逐个拉取镜像，请确保 KubeKey 的工作节点已安装最低版本为 1.4.9 的 containerd 或最低版本为 18.09 的 docker。 - - KubeKey 会解析镜像列表中的镜像名，若镜像名中的镜像仓库需要鉴权信息，可在 manifest 文件中的 **.registry.auths** 字段中进行配置。 {{}} @@ -368,7 +364,6 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 # "dockerhub.kubekey.local": # username: admin # password: Harbor12345 - plainHTTP: false # 设置集群部署时使用的私有仓库 privateRegistry: "" namespaceOverride: "" @@ -512,7 +507,6 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 "dockerhub.kubekey.local": username: admin password: Harbor12345 - plainHTTP: false privateRegistry: "dockerhub.kubekey.local" namespaceOverride: "kubesphereio" registryMirrors: [] diff --git a/content/zh/docs/installing-on-linux/introduction/kubekey.md b/content/zh/docs/installing-on-linux/introduction/kubekey.md index b0549c9be..5714b71e0 100644 --- a/content/zh/docs/installing-on-linux/introduction/kubekey.md +++ b/content/zh/docs/installing-on-linux/introduction/kubekey.md @@ -39,7 +39,7 @@ KubeKey 的几种使用场景： 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或者直接运行以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -55,7 +55,7 @@ export KKZONE=cn 运行以下命令来下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -70,7 +70,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -通过以上的命令，可以下载 KubeKey 的最新版本 (v2.1.0)。您可以更改命令中的版本号来下载特定的版本。 +通过以上的命令，可以下载 KubeKey 的最新版本 (v2.2.1)。您可以更改命令中的版本号来下载特定的版本。 {{}} diff --git a/content/zh/docs/installing-on-linux/introduction/multioverview.md b/content/zh/docs/installing-on-linux/introduction/multioverview.md index ed0af5480..a84b3d92e 100644 --- a/content/zh/docs/installing-on-linux/introduction/multioverview.md +++ b/content/zh/docs/installing-on-linux/introduction/multioverview.md @@ -32,7 +32,7 @@ weight: 3120 | 系统 | 最低要求（每个节点） | | ------------------------------------------------------------ | -------------------------------- | -| **Ubuntu** *16.04，18.04* | CPU：2 核，内存：4 G，硬盘：40 G | +| **Ubuntu** *16.04，18.04，20.04* | CPU：2 核，内存：4 G，硬盘：40 G | | **Debian** *Buster，Stretch* | CPU：2 核，内存：4 G，硬盘：40 G | | **CentOS** *7*.x | CPU：2 核，内存：4 G，硬盘：40 G | | **Red Hat Enterprise Linux** *7* | CPU：2 核，内存：4 G，硬盘：40 G | @@ -59,11 +59,6 @@ weight: 3120 {{< content "common/container-runtime-requirements.md" >}} -{{< notice note >}} - -如果您想在离线环境中部署 KubeSphere，请务必提前安装一个容器运行时。 - -{{}} ### 依赖项要求 @@ -106,7 +101,7 @@ KubeKey 可以一同安装 Kubernetes 和 KubeSphere。根据要安装的 Kubern 从 [GitHub 发布页面](https://github.com/kubesphere/kubekey/releases)下载 KubeKey 或直接使用以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -122,7 +117,7 @@ export KKZONE=cn 执行以下命令下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -137,7 +132,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -执行以上命令会下载最新版 KubeKey (v2.1.0)，您可以修改命令中的版本号下载指定版本。 +执行以上命令会下载最新版 KubeKey (v2.2.1)，您可以修改命令中的版本号下载指定版本。 {{}} @@ -161,7 +156,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在此步骤的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 @@ -202,7 +197,7 @@ spec: roleGroups: etcd: - master - master: + control-plane: - master worker: - node1 @@ -269,7 +264,7 @@ spec: #### roleGroups - `etcd`：etcd 节点名称 -- `master`：主节点名称 +- `control-plane`：主节点名称 - `worker`：工作节点名称 #### controlPlaneEndpoint（仅适用于高可用安装） diff --git a/content/zh/docs/installing-on-linux/introduction/vars.md b/content/zh/docs/installing-on-linux/introduction/vars.md index fe0efa4d7..62df1efac 100644 --- a/content/zh/docs/installing-on-linux/introduction/vars.md +++ b/content/zh/docs/installing-on-linux/introduction/vars.md @@ -45,7 +45,7 @@ weight: 3160 version - Kubernetes 安装版本。如未指定 Kubernetes 版本，{{< contentLink "docs/installing-on-linux/introduction/kubekey" "KubeKey" >}} v2.1.0 默认安装 Kubernetes v1.21.5。有关更多信息，请参阅{{< contentLink "docs/installing-on-linux/introduction/kubekey/#support-matrix" "支持矩阵" >}}。 + Kubernetes 安装版本。如未指定 Kubernetes 版本，{{< contentLink "docs/installing-on-linux/introduction/kubekey" "KubeKey" >}} v2.2.1 默认安装 Kubernetes v1.21.5。有关更多信息，请参阅{{< contentLink "docs/installing-on-linux/introduction/kubekey/#support-matrix" "支持矩阵" >}}。 imageRepo diff --git a/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md b/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md index 926cd490c..5bc099612 100644 --- a/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md +++ b/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-and-k3s.md @@ -32,7 +32,7 @@ weight: 3530 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或直接运行以下命令： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -48,7 +48,7 @@ export KKZONE=cn 运行以下命令来下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -63,7 +63,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -通过以上的命令可以下载 KubeKey 的最新版本 (v2.1.0)。请注意，更早版本的 KubeKey 无法下载 K3s。 +通过以上的命令可以下载 KubeKey 的最新版本 (v2.2.1)。请注意，更早版本的 KubeKey 无法下载 K3s。 {{}} @@ -83,7 +83,7 @@ chmod +x kk {{< notice note >}} - - KubeKey v2.1.0 支持安装 K3s v1.21.4。 + - KubeKey v2.2.1 支持安装 K3s v1.21.4。 - 您可以在以上命令中使用 `-f` 或 `--file` 参数指定配置文件的路径和名称。如未指定路径和名称，KubeKey 将默认在当前目录下创建 `config-sample.yaml` 配置文件。 @@ -107,7 +107,7 @@ chmod +x kk roleGroups: etcd: - master - master: + control-plane: - master worker: - node1 diff --git a/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md b/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md index d39716cc9..f1f938bf0 100644 --- a/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md +++ b/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md @@ -200,7 +200,7 @@ yum install conntrack-tools 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或使用以下命令： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -216,7 +216,7 @@ export KKZONE=cn 执行以下命令下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -231,7 +231,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -执行以上命令会下载最新版 KubeKey (v2.1.0)，您可以修改命令中的版本号下载指定版本。 +执行以上命令会下载最新版 KubeKey (v2.2.1)，您可以修改命令中的版本号下载指定版本。 {{}} @@ -253,7 +253,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装 KubeSphere，或者在您后续使用 `./kk create cluster` 命令时再次添加该标志。 - 如果您添加标志 `--with-kubesphere` 时不指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 @@ -279,7 +279,7 @@ spec: roleGroups: etcd: - master1 - master: + control-plane: - master1 worker: - worker1 diff --git a/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md b/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md index 6befac4b4..af5a945df 100644 --- a/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md +++ b/content/zh/docs/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md @@ -288,7 +288,7 @@ systemctl status -l keepalived 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或直接使用以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -304,7 +304,7 @@ export KKZONE=cn 执行以下命令下载 KubeKey。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -319,7 +319,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -执行以上命令会下载最新版 KubeKey (v2.1.0)，您可以修改命令中的版本号下载指定版本。 +执行以上命令会下载最新版 KubeKey (v2.2.1)，您可以修改命令中的版本号下载指定版本。 {{}} @@ -343,7 +343,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 @@ -375,7 +375,7 @@ spec: - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 diff --git a/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-glusterfs.md b/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-glusterfs.md index 90784dad5..173a4053b 100644 --- a/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-glusterfs.md +++ b/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-glusterfs.md @@ -119,7 +119,7 @@ weight: 3340 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或者直接运行以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -135,7 +135,7 @@ export KKZONE=cn 运行以下命令来下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -150,7 +150,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -通过以上的命令，可以下载 KubeKey 的最新版本 (v2.1.0)。您可以更改命令中的版本号来下载特定的版本。 +通过以上的命令，可以下载 KubeKey 的最新版本 (v2.2.1)。您可以更改命令中的版本号来下载特定的版本。 {{}} @@ -170,7 +170,7 @@ chmod +x kk {{< notice note >}} - - 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 + - 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在此步骤的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 - 如果您添加标志 `--with-kubesphere` 时不指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 @@ -195,7 +195,7 @@ chmod +x kk roleGroups: etcd: - client1 - master: + control-plane: - client1 worker: - client2 diff --git a/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-nfs-client.md b/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-nfs-client.md index 044edd5c6..e86ace3aa 100644 --- a/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-nfs-client.md +++ b/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-nfs-client.md @@ -71,7 +71,7 @@ weight: 3330 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或者直接运行以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -87,7 +87,7 @@ export KKZONE=cn 运行以下命令来下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -102,7 +102,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -通过以上命令，可以下载 KubeKey 的最新版本 (v2.1.0)。您可以更改命令中的版本号来下载特定的版本。 +通过以上命令，可以下载 KubeKey 的最新版本 (v2.2.1)。您可以更改命令中的版本号来下载特定的版本。 {{}} @@ -122,7 +122,7 @@ chmod +x kk {{< notice note >}} - - 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 + - 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在此步骤的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 - 如果您添加标志 `--with-kubesphere` 时不指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 @@ -147,7 +147,7 @@ chmod +x kk roleGroups: etcd: - client1 - master: + control-plane: - client1 worker: - client2 diff --git a/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md b/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md index d07108fb7..5268d16fe 100644 --- a/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md +++ b/content/zh/docs/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md @@ -73,7 +73,7 @@ weight: 3320 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或者直接运行以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -89,7 +89,7 @@ export KKZONE=cn 运行以下命令下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -104,7 +104,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -通过以上的命令，可以下载 KubeKey 的最新版本 (v2.1.0)。您可以更改命令中的版本号来下载特定的版本。 +通过以上的命令，可以下载 KubeKey 的最新版本 (v2.2.1)。您可以更改命令中的版本号来下载特定的版本。 {{}} @@ -124,7 +124,7 @@ chmod +x kk {{< notice note >}} - - 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 + - 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在此步骤的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 - 如果您添加标志 `--with-kubesphere` 时不指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 @@ -149,7 +149,7 @@ chmod +x kk roleGroups: etcd: - master - master: + control-plane: - master worker: - node1 diff --git a/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-ali-ecs.md b/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-ali-ecs.md index 7e650db8b..d17bd7042 100644 --- a/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-ali-ecs.md +++ b/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-ali-ecs.md @@ -91,7 +91,7 @@ controlPlaneEndpoint: 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或直接使用以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -107,7 +107,7 @@ export KKZONE=cn 执行以下命令下载 KubeKey。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -122,7 +122,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -执行以上命令会下载最新版 KubeKey (v2.1.0)，您可以修改命令中的版本号下载指定版本。 +执行以上命令会下载最新版 KubeKey (v2.2.1)，您可以修改命令中的版本号下载指定版本。 {{}} @@ -175,7 +175,7 @@ metadata: - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 diff --git a/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md b/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md index a12936a93..a3ca73b2d 100644 --- a/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md +++ b/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md @@ -102,7 +102,7 @@ ssh -i .ssh/id_rsa2 -p50200 kubesphere@40.81.5.xx 从 KubeKey 的 [Github 发布页面](https://github.com/kubesphere/kubekey/releases)下载，或执行以下命令： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -118,7 +118,7 @@ export KKZONE=cn 运行以下命令下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -133,7 +133,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -上面的命令会下载 KubeKey 最新版本 (v2.1.0)。您可以在命令中更改版本号以下载特定版本。 +上面的命令会下载 KubeKey 最新版本 (v2.2.1)。您可以在命令中更改版本号以下载特定版本。 {{}} @@ -176,7 +176,7 @@ spec: - master-0 - master-1 - master-2 - master: + control-plane: - master-0 - master-1 - master-2 diff --git a/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-huaweicloud-ecs.md b/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-huaweicloud-ecs.md index 71f3e000e..d3ba929a1 100644 --- a/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-huaweicloud-ecs.md +++ b/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-huaweicloud-ecs.md @@ -85,7 +85,7 @@ Kubernetes 服务需要做到高可用，需要保证 kube-apiserver 的 HA ， 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或直接使用以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -101,7 +101,7 @@ export KKZONE=cn 执行以下命令下载 KubeKey。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -116,7 +116,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -执行以上命令会下载最新版 KubeKey (v2.1.0)，您可以修改命令中的版本号下载指定版本。 +执行以上命令会下载最新版 KubeKey (v2.2.1)，您可以修改命令中的版本号下载指定版本。 {{}} @@ -162,7 +162,7 @@ spec: roleGroups: etcd: - master[1:3] - master: + control-plane: - master[1:3] worker: - node[1:3] diff --git a/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md b/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md index 994d1e294..38382193a 100644 --- a/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md +++ b/content/zh/docs/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md @@ -126,7 +126,7 @@ Weight: 3420 从 [GitHub 发布页面](https://github.com/kubesphere/kubekey/releases)下载 KubeKey 或直接使用以下命令： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -142,7 +142,7 @@ export KKZONE=cn 执行以下命令下载 KubeKey： ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -157,7 +157,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -执行以上命令会下载最新版 KubeKey (v2.1.0)，您可以修改命令中的版本号下载指定版本。 +执行以上命令会下载最新版 KubeKey (v2.2.1)，您可以修改命令中的版本号下载指定版本。 {{}} @@ -175,7 +175,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 @@ -212,7 +212,7 @@ spec: - master1 - master2 - master3 - master: + control-plane: - master1 - master2 - master3 diff --git a/content/zh/docs/introduction/what's-new-in-3.3.0.md b/content/zh/docs/introduction/what's-new-in-3.3.0.md index 0baa51a15..454507eda 100644 --- a/content/zh/docs/introduction/what's-new-in-3.3.0.md +++ b/content/zh/docs/introduction/what's-new-in-3.3.0.md @@ -6,10 +6,8 @@ linkTitle: "3.3.0 重要更新" weight: 1400 --- -2021 年 6 月，KubeSphere 3.3.0 正式发布，带来面向 AI 场景的 GPU 调度与更灵活的网关，新增了对 GPU 资源调度管理与 GPU 使用监控的支持，进一步增强了在云原生 AI 场景的使用体验。同时还增强了 “多集群管理、多租户管理、可观测性、DevOps、应用商店、微服务治理” 等特性，更进一步完善交互设计，并全面提升了用户体验。 +2022 年 6 月下旬，KubeSphere 3.3.0 正式发布，带来了更多令人期待的功能。新增了基于 GitOps 的持续部署方案，进一步优化了 DevOps 的使用体验。同时还增强了 “多集群管理、多租户管理、可观测性、应用商店、微服务治理、边缘计算、存储” 等特性，更进一步完善交互设计，并全面提升了用户体验。。 -关于 3.2.0 新特性的详细解读，可参考博客 [KubeSphere 3.2.0 发布：带来面向 AI 场景的 GPU 调度与更灵活的网关](../../../blogs/kubesphere-3.2.0-ga-announcement/)。 +关于 3.3.0 新特性的详细解读，可参考博客 [KubeSphere 3.2.0 发布：带来面向 AI 场景的 GPU 调度与更灵活的网关](../../../blogs/kubesphere-3.2.0-ga-announcement/)。 -关于 3.2.0 的新功能及增强、Bug 修复、重要的技术调整，以及废弃或移除的功能，请参见 3.2.0 的[发行说明](../../release/release-v320/)。 - -2021 年 12 月 21 日，KubeSphere 社区发布了 3.2.1，修复了多个功能的已知 Bug，并对多项功能进行优化，带来更好的用户体验，查看 [3.2.1 发行说明](../../release/release-v320/) 了解详情。 \ No newline at end of file +关于 3.3.0 的新功能及增强、Bug 修复、重要的技术调整，以及废弃或移除的功能，请参见 3.3.0 的[发行说明](../../release/release-v320/)。 \ No newline at end of file diff --git a/content/zh/docs/quick-start/all-in-one-on-linux.md b/content/zh/docs/quick-start/all-in-one-on-linux.md index fdce6bc80..b3601845c 100644 --- a/content/zh/docs/quick-start/all-in-one-on-linux.md +++ b/content/zh/docs/quick-start/all-in-one-on-linux.md @@ -84,11 +84,6 @@ weight: 2100 -{{< notice note >}} - -如果您想在离线环境中部署 KubeSphere，请务必提前安装一个容器运行时。 - -{{}} ### 依赖项要求 @@ -150,7 +145,7 @@ KubeKey 是用 Go 语言开发的一款全新的安装工具，代替了以前 从 [GitHub Release Page](https://github.com/kubesphere/kubekey/releases) 下载 KubeKey 或直接使用以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -166,7 +161,7 @@ export KKZONE=cn 执行以下命令下载 KubeKey。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -181,7 +176,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -执行以上命令会下载最新版 KubeKey (v2.1.0)，您可以修改命令中的版本号下载指定版本。 +执行以上命令会下载最新版 KubeKey (v2.2.1)，您可以修改命令中的版本号下载指定版本。 {{}} @@ -207,7 +202,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：1.19.x、1.20.x、1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：1.19.x、1.20.x、1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 一般来说，对于 All-in-One 安装，您无需更改任何配置。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，KubeKey 将只安装 Kubernetes。如果您添加标志 `--with-kubesphere` 时不指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 @@ -219,10 +214,6 @@ chmod +x kk ## 步骤 4：验证安装结果 -当您看到以下输出时，表明安装已经完成。 - -![Installation-complete](/images/docs/zh-cn/quickstart/all-in-one-on-linux/Installation-complete.png) - 输入以下命令以检查安装结果。 ```bash diff --git a/content/zh/docs/upgrade/air-gapped-upgrade-with-kubekey.md b/content/zh/docs/upgrade/air-gapped-upgrade-with-kubekey.md index fcee75643..01e0263aa 100644 --- a/content/zh/docs/upgrade/air-gapped-upgrade-with-kubekey.md +++ b/content/zh/docs/upgrade/air-gapped-upgrade-with-kubekey.md @@ -32,7 +32,7 @@ weight: 7400 | 系统 | 最低要求（每个节点） | | ------------------------------------------------------------ | -------------------------------- | -| **Ubuntu** *16.04, 18.04* | CPU：2 核，内存：4 G，硬盘：40 G | +| **Ubuntu** *16.04, 18.04，20.04* | CPU：2 核，内存：4 G，硬盘：40 G | | **Debian** *Buster, Stretch* | CPU：2 核，内存：4 G，硬盘：40 G | | **CentOS** *7.x* | CPU：2 核，内存：4 G，硬盘：40 G | | **Red Hat Enterprise Linux** *7* | CPU：2 核，内存：4 G，硬盘：40 G | @@ -47,7 +47,7 @@ weight: 7400 ### 步骤 1：下载 KubeKey -与在 Linux 上在线安装 KubeSphere 相似，您需要事先[下载 KubeKey v2.1.0](https://github.com/kubesphere/kubekey/releases)。下载 `tar.gz` 文件，将它传输到充当任务机的本地机器上进行安装。解压文件后，执行以下命令，使 `kk` 可执行： +与在 Linux 上在线安装 KubeSphere 相似，您需要事先[下载 KubeKey v2.2.1](https://github.com/kubesphere/kubekey/releases)。下载 `tar.gz` 文件，将它传输到充当任务机的本地机器上进行安装。解压文件后，执行以下命令，使 `kk` 可执行： ```bash chmod +x kk @@ -113,7 +113,7 @@ chmod +x kk {{< notice note >}} - - 您可以根据自己的需求变更下载的 Kubernetes 版本。安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x和v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../installing-on-linux/introduction/kubekey/#支持矩阵)。 + - 您可以根据自己的需求变更下载的 Kubernetes 版本。安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x和v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 您可以通过下载 Kubernetes v1.17.9 二进制文件将 Kubernetes 从 v1.16.13 升级到 v1.17.9。但对于跨多个版本升级，需要事先下载所有中间版本，例如您想将 Kubernetes 从 v1.15.12 升级到 v1.18.6，则需要下载 Kubernetes v1.16.13、v1.17.9 和 v1.18.6 二进制文件。 @@ -204,7 +204,7 @@ chmod +x kk roleGroups: etcd: - ks.master - master: + control-plane: - ks.master worker: - ks.master @@ -288,7 +288,7 @@ chmod +x kk roleGroups: etcd: - ks.master - master: + control-plane: - ks.master worker: - ks.slave1 diff --git a/content/zh/docs/upgrade/upgrade-with-kubekey.md b/content/zh/docs/upgrade/upgrade-with-kubekey.md index a3afc6e0e..d1680ddc0 100644 --- a/content/zh/docs/upgrade/upgrade-with-kubekey.md +++ b/content/zh/docs/upgrade/upgrade-with-kubekey.md @@ -29,7 +29,7 @@ weight: 7200 从 [GitHub 发布页面](https://github.com/kubesphere/kubekey/releases)下载 KubeKey 或直接使用以下命令。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{}} @@ -45,7 +45,7 @@ export KKZONE=cn 执行以下命令下载 KubeKey。 ```bash -curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - +curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - ``` {{< notice note >}} @@ -60,7 +60,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.1.0 sh - {{< notice note >}} -执行以上命令会下载最新版 KubeKey (v2.1.0)，您可以修改命令中的版本号以下载指定版本。 +执行以上命令会下载最新版 KubeKey (v2.2.1)，您可以修改命令中的版本号以下载指定版本。 {{}}