diff --git a/README.md b/README.md index 282806fcf..6095a18b3 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,33 @@ # KubeSphere Website -This repository contains two branches that we are working on: master and release-3.0. +This repository contains branches that we are working on. -The master branch contains KubeSphere Doc 3.1 which has been released together with KubeSphere 3.1. The frontend website currently displays content based on the master branch. If the pull request you submit applies to both the master branch and the release-3.0 branch, use the command `cherry-pick` to submit the same pull request. +The master branch contains KubeSphere Doc 3.3 which has been released together with KubeSphere 3.3. The frontend website currently displays content based on the master branch. If the pull request you submit applies to both the master branch and other branches, use the command `cherry-pick` to submit the same pull request. This project uses [Hugo](https://gohugo.io/) to build the KubeSphere website. -## Contribute +## Contribute to the project -Contributions of any kind are welcome! Thanks goes to these wonderful contributors, they made our community and product grow fast. +Contributions of any kind are welcome! Thanks goes to these wonderful contributors, they made our community and product grow fast. -### Fork and clone the repo +### Fork and clone the repository -First, create your own fork of the repository. +1. Fork the repository. -Then, clone your fork and enter into it: +2. Clone the repository to a local path and access it: -``` -git clone https://github.com//website -cd website -``` + ``` + git clone https://github.com//website + cd website + ``` -### Compiling and preview the website +### Compile and preview the website -You will need to build the website in order to **publish it as static content.** +You need to build the website to **publish it as static content.** #### Install Hugo extended @@ -35,13 +35,11 @@ Go to the [Hugo releases place](https://github.com/gohugoio/hugo/releases) and d **EXTENDED version is MANDATORY to properly build the static content!** -Note: If you install Hugo on Windows, you need to add environment variables for the exe file of Hugo. For example, you place the exe file in the path `C:\Hugo\bin`. You have to add this path in environment variables. Execute `hugo version` to view if the installation is successful. +Note: If you install Hugo on Windows, you need to add environment variables for the .exe file of Hugo. For example, you place the .exe file in the path `C:\Hugo\bin`. You have to add this path in environment variables. Execute `hugo version` to view if the installation is successful. -### Running the website locally +### Run the website locally -hugo version: hugo_extended_0.70.0+, you can install Hugo from [hugo releases](https://github.com/gohugoio/hugo/releases) - -When you have installed Hugo, then run: +After you have installed Hugo, run the following command: ``` hugo server -D @@ -51,7 +49,7 @@ Now you can preview the website in your browser using `http://localhost:1313/`. ### Open a pull request -Open a [pull request (PR)](https://help.github.com/en/desktop/contributing-to-projects/creating-an-issue-or-pull-request#creating-a-new-pull-request) to add a localization to the repository. Please use DCO sign-off when you submit a pr. Refer to the command below (add `-s`): +Open a [pull request (PR)](https://help.github.com/en/desktop/contributing-to-projects/creating-an-issue-or-pull-request#creating-a-new-pull-request) to make contributions to the repository. Please use DCO sign-off when you submit a pull request. Refer to the command below (add `-s`): ```bash git commit -s -m "xxx" @@ -59,62 +57,62 @@ git commit -s -m "xxx" ### Preview a pull request -Go to **Files changed** tab. Click the three dots of the md file you want to preview as shown below. Please note that this method can only give you a preview on the GitHub instead of on the website. +Go to the **Files changed** tab. Click the three dots of the .md file you want to preview, and then click **View file**. Please note that this method can only give you a preview on the GitHub instead of on the website. -![view-file](https://ap3.qingstor.com/kubesphere-website/docs/view-file-github.png) +![view-file](static/images/common/view-file.png) -### Cherry Pick a Commit +### Cherry pick a commit -The command `cherry-pick` allows you to pick a commit in a branch and integrate it into another branch. For example, we are working on both the master branch and the release-3.0 branch. If the pull request you submit to the master branch applies to the release-3.0 branch as well: +The command `cherry-pick` allows you to pick a commit in a branch and integrate it into another branch. For example, we are working on both the master branch and the release-3.2 branch. If the pull request you submit to the master branch applies to the release-3.2 branch as well, perform the following steps: -In the master branch, find and copy the commit ID of your pull request. +1. In the master branch, find and copy the commit ID of your pull request. -``` -git log -``` + ``` + git log + ``` -Checkout to the release-3.0 branch: +2. Switch to the release-3.2 branch: -``` -git checkout release-3.0 -``` + ``` + git checkout release-3.2 + ``` -Rebase first: +3. Rebase first: -```bash -git pull --rebase upstream release-3.0 -``` + ```bash + git pull --rebase upstream release-3.2 + ``` -Use the branch release-3.0 to checkout a new branch: +4. Use the branch release-3.2 to switch to a new branch: -```bash -git checkout -b test -``` + ```bash + git checkout -b test + ``` -Cherry pick: +5. Cherry pick the commit: -```bash -git cherry-pick -``` + ```bash + git cherry-pick + ``` -Push it: +5. Push the commit: -```bash -git push -u origin test -``` + ```bash + git push -u origin test + ``` -When you submit the pull request, make sure you submit it to the release-3.0 branch. +When you submit the pull request, make sure you submit it to the release-3.2 branch. -## Localizing +## Localization -You are welcome to help the KubeSphere community to support more languages, join us to contribute to the localization, see [Localizing the website](localize-website.md) for the instruction. +You are welcome to join the KubeSphere community to contribute to the localization. Please refer to [Localizing the website](localize-website.md) for instructions. -## Build and Publish the website (Optional) +## Build and publish the website (optional) -### Config your domain +### Configure your domain Edit the file `config\_default\config.toml` and modify the var `baseURL` (at the -first line) in order to set your own domain. It will be hardcoded in the static +first line) to set your own domain. It will be hardcoded in the static files. ``` @@ -142,6 +140,6 @@ hugo Total in 2396 ms ``` -#### Get the already built static content +#### Get the generated static content You will find the previously generated content in the `public` directory. diff --git a/content/en/common/kubernetes-versions.md b/content/en/common/kubernetes-versions.md index 3aa67d348..d48fde955 100644 --- a/content/en/common/kubernetes-versions.md +++ b/content/en/common/kubernetes-versions.md @@ -5,6 +5,6 @@ _build: | Installation Tool | KubeSphere version | Supported Kubernetes versions | | ----------------- | ------------------ | ------------------------------------------------------------ | -| KubeKey | 3.2.0 | v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental) | -| ks-installer | 3.2.0 | v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental) | +| KubeKey | 3.3.1 | v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), v1.23.x (experimental support) | +| ks-installer | 3.3.1 | v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), v1.23.x (experimental support) | diff --git a/content/en/docs/v3.3/devops-user-guide/examples/create-multi-cluster-pipeline.md b/content/en/docs/v3.3/devops-user-guide/examples/create-multi-cluster-pipeline.md index 947ce17e5..fe6493541 100644 --- a/content/en/docs/v3.3/devops-user-guide/examples/create-multi-cluster-pipeline.md +++ b/content/en/docs/v3.3/devops-user-guide/examples/create-multi-cluster-pipeline.md @@ -40,7 +40,7 @@ See the table below for the role of each cluster. {{< notice note >}} -These Kubernetes clusters can be hosted across different cloud providers and their Kubernetes versions can also vary. Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +These Kubernetes clusters can be hosted across different cloud providers and their Kubernetes versions can also vary. Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). {{}} diff --git a/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md b/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md index 418561812..a577ea7a5 100644 --- a/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md +++ b/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md @@ -28,7 +28,7 @@ You need to select: {{< notice note >}} -- To install KubeSphere 3.3 on Kubernetes, your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +- To install KubeSphere 3.3 on Kubernetes, your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). - 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 powerful type (such as CPU-Optimized / 8 GB / 4 vCPUs). It seems that DigitalOcean provisions the control plane 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/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-gke.md b/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-gke.md index 6a39d79e4..56692b840 100644 --- a/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-gke.md +++ b/content/en/docs/v3.3/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 >}} -- To install KubeSphere 3.3 on Kubernetes, your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +- To install KubeSphere 3.3 on Kubernetes, your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). - 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/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-huaweicloud-cce.md b/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-huaweicloud-cce.md index c6ddbd50f..b8ad95679 100644 --- a/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-huaweicloud-cce.md +++ b/content/en/docs/v3.3/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. -- To install KubeSphere 3.3 on Kubernetes, your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +- To install KubeSphere 3.3 on Kubernetes, your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). - 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/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-oke.md b/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-oke.md index 4c5752e51..2addf774a 100644 --- a/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-oke.md +++ b/content/en/docs/v3.3/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 >}} - - To install KubeSphere 3.3 on Kubernetes, your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). + - To install KubeSphere 3.3 on Kubernetes, your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). - 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/v3.3/installing-on-linux/high-availability-configurations/ha-configuration.md b/content/en/docs/v3.3/installing-on-linux/high-availability-configurations/ha-configuration.md index 3db607388..dc4b4734e 100644 --- a/content/en/docs/v3.3/installing-on-linux/high-availability-configurations/ha-configuration.md +++ b/content/en/docs/v3.3/installing-on-linux/high-availability-configurations/ha-configuration.md @@ -97,7 +97,7 @@ Create an example configuration file with default configurations. Here Kubernete {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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). +- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. diff --git a/content/en/docs/v3.3/installing-on-linux/high-availability-configurations/internal-ha-configuration.md b/content/en/docs/v3.3/installing-on-linux/high-availability-configurations/internal-ha-configuration.md index 73185d39f..3f17390c0 100644 --- a/content/en/docs/v3.3/installing-on-linux/high-availability-configurations/internal-ha-configuration.md +++ b/content/en/docs/v3.3/installing-on-linux/high-availability-configurations/internal-ha-configuration.md @@ -82,7 +82,7 @@ Create an example configuration file with default configurations. Here Kubernete {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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). +- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. diff --git a/content/en/docs/v3.3/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md b/content/en/docs/v3.3/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md index 73ef10d6d..6cfa61447 100644 --- a/content/en/docs/v3.3/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md +++ b/content/en/docs/v3.3/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md @@ -317,7 +317,7 @@ Create an example configuration file with default configurations. Here Kubernete {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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). +- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. diff --git a/content/en/docs/v3.3/installing-on-linux/introduction/kubekey.md b/content/en/docs/v3.3/installing-on-linux/introduction/kubekey.md index 4ed386719..1bfdcde67 100644 --- a/content/en/docs/v3.3/installing-on-linux/introduction/kubekey.md +++ b/content/en/docs/v3.3/installing-on-linux/introduction/kubekey.md @@ -79,11 +79,11 @@ If you want to use KubeKey to install both Kubernetes and KubeSphere 3.3, see th | KubeSphere version | Supported Kubernetes versions | | ------------------ | ------------------------------------------------------------ | -| v3.3.1 | v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support) | +| v3.3.1 | v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support) | {{< 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 3.3. If you want to [install KubeSphere 3.3 on an existing Kubernetes cluster](../../../installing-on-kubernetes/introduction/overview/), your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). -- If you want to use KubeEdge, you are advised to install Kubernetes v1.22.x or earlier to prevent compatability issues. +- The Kubernetes versions that can be installed using KubeKey are different from the Kubernetes versions supported by KubeSphere 3.3. If you want to [install KubeSphere 3.3 on an existing Kubernetes cluster](../../../installing-on-kubernetes/introduction/overview/), your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). +- If you want to use KubeEdge, you are advised to install Kubernetes v1.21.x or earlier to prevent compatability issues. {{}} \ No newline at end of file diff --git a/content/en/docs/v3.3/installing-on-linux/introduction/multioverview.md b/content/en/docs/v3.3/installing-on-linux/introduction/multioverview.md index 01f36357f..53ee05be5 100644 --- a/content/en/docs/v3.3/installing-on-linux/introduction/multioverview.md +++ b/content/en/docs/v3.3/installing-on-linux/introduction/multioverview.md @@ -165,7 +165,7 @@ Command: {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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). +- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. diff --git a/content/en/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md b/content/en/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md index c0cc50c8b..d76cf37fa 100644 --- a/content/en/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md +++ b/content/en/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md @@ -252,7 +252,7 @@ Create a Kubernetes cluster with KubeSphere installed (for example, `--with-kube {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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). +- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. diff --git a/content/en/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md b/content/en/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md index 002d2b983..50a17429c 100644 --- a/content/en/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md +++ b/content/en/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md @@ -353,7 +353,7 @@ Create a Kubernetes cluster with KubeSphere installed (for example, `--with-kube {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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). +- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. diff --git a/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-glusterfs.md b/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-glusterfs.md index 4687a4634..2cb539e80 100644 --- a/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-glusterfs.md +++ b/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-glusterfs.md @@ -170,7 +170,7 @@ chmod +x kk {{< notice note >}} - - Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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). + - Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. diff --git a/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-nfs-client.md b/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-nfs-client.md index 4dca043a8..76bc1c068 100644 --- a/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-nfs-client.md +++ b/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-nfs-client.md @@ -122,7 +122,7 @@ chmod +x kk {{< notice note >}} - - Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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). + - Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. diff --git a/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md b/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md index 0cfd088aa..b002e5743 100644 --- a/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md +++ b/content/en/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md @@ -124,7 +124,7 @@ chmod +x kk {{< notice note >}} - - Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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). + - Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. diff --git a/content/en/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md b/content/en/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md index 4ee993a3e..86684a2a2 100644 --- a/content/en/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md +++ b/content/en/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md @@ -150,7 +150,7 @@ The commands above download the latest release (v2.3.0) of KubeKey. You can chan {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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). +- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. diff --git a/content/en/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md b/content/en/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md index 9df911cad..76263c7b2 100644 --- a/content/en/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md +++ b/content/en/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md @@ -175,7 +175,7 @@ Create an example configuration file with default configurations. Here Kubernete {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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). +- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. diff --git a/content/en/docs/v3.3/quick-start/all-in-one-on-linux.md b/content/en/docs/v3.3/quick-start/all-in-one-on-linux.md index a9796f7d1..127a98337 100644 --- a/content/en/docs/v3.3/quick-start/all-in-one-on-linux.md +++ b/content/en/docs/v3.3/quick-start/all-in-one-on-linux.md @@ -202,7 +202,7 @@ To create a Kubernetes cluster with KubeSphere installed, refer to the following {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). If you do not specify a Kubernetes version, KubeKey installs Kubernetes v1.23.7 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: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). If you do not specify a Kubernetes version, KubeKey installs Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../installing-on-linux/introduction/kubekey/#support-matrix). - For all-in-one installation, 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/v3.3/quick-start/create-workspace-and-project.md b/content/en/docs/v3.3/quick-start/create-workspace-and-project.md index cc0d8d9eb..329e47215 100644 --- a/content/en/docs/v3.3/quick-start/create-workspace-and-project.md +++ b/content/en/docs/v3.3/quick-start/create-workspace-and-project.md @@ -24,7 +24,7 @@ You can create multiple workspaces within a KubeSphere cluster. Under each works ### Step 1: Create a user -After KubeSphere is installed, you need to add different users with varied roles to the platform so that they can work at different levels on various resources. Initially, you only have one default user, which is `admin`, granted the role `platform-admin`. In the first step, you create a sample user `user-manager`. +After KubeSphere is installed, you need to add different users with varied roles to the platform so that they can work at different levels on various resources. Initially, you only have one default user, which is `admin`, granted the role `platform-admin`. In the first step, you create a sample user `ws-manager`. 1. Log in to the web console as `admin` with the default user and password (`admin/P@88w0rd`). diff --git a/content/en/docs/v3.3/quick-start/minimal-kubesphere-on-k8s.md b/content/en/docs/v3.3/quick-start/minimal-kubesphere-on-k8s.md index 8191f623c..7ac74e2ed 100644 --- a/content/en/docs/v3.3/quick-start/minimal-kubesphere-on-k8s.md +++ b/content/en/docs/v3.3/quick-start/minimal-kubesphere-on-k8s.md @@ -11,7 +11,7 @@ In addition to installing KubeSphere on a Linux machine, you can also deploy it ## Prerequisites -- To install KubeSphere 3.3 on Kubernetes, your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +- To install KubeSphere 3.3 on Kubernetes, your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). - Make sure your machine meets the minimal hardware requirement: CPU > 1 Core, Memory > 2 GB. - A **default** Storage Class in your Kubernetes cluster needs to be configured before the installation. diff --git a/content/en/docs/v3.3/upgrade/air-gapped-upgrade-with-ks-installer.md b/content/en/docs/v3.3/upgrade/air-gapped-upgrade-with-ks-installer.md index f45efda32..94db513b6 100644 --- a/content/en/docs/v3.3/upgrade/air-gapped-upgrade-with-ks-installer.md +++ b/content/en/docs/v3.3/upgrade/air-gapped-upgrade-with-ks-installer.md @@ -15,7 +15,7 @@ ks-installer is recommended for users whose Kubernetes clusters were not set up - Read [Release Notes for 3.3.1](../../../v3.3/release/release-v331/) carefully. - Back up any important component beforehand. - A Docker registry. You need to have a Harbor or other Docker registries. For more information, see [Prepare a Private Image Registry](../../installing-on-linux/introduction/air-gapped-installation/#step-2-prepare-a-private-image-registry). -- Supported Kubernetes versions of KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +- Supported Kubernetes versions of KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). ## Major Updates diff --git a/content/en/docs/v3.3/upgrade/air-gapped-upgrade-with-kubekey.md b/content/en/docs/v3.3/upgrade/air-gapped-upgrade-with-kubekey.md index 7c2b161f5..55085b129 100644 --- a/content/en/docs/v3.3/upgrade/air-gapped-upgrade-with-kubekey.md +++ b/content/en/docs/v3.3/upgrade/air-gapped-upgrade-with-kubekey.md @@ -10,7 +10,7 @@ Air-gapped upgrade with KubeKey is recommended for users whose KubeSphere and Ku ## Prerequisites - You need to have a KubeSphere cluster running v3.2.x. If your KubeSphere version is v3.1.x or earlier, upgrade to v3.2.x first. -- Your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +- Your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). - Read [Release Notes for 3.3.1](../../../v3.3/release/release-v331/) carefully. - Back up any important component beforehand. - A Docker registry. You need to have a Harbor or other Docker registries. @@ -153,7 +153,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 are v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). 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 change the Kubernetes version downloaded based on your needs. Recommended Kubernetes versions for KubeSphere 3.3 are v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). 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. @@ -264,7 +264,7 @@ Set `privateRegistry` of your `config-sample.yaml` file: ./kk upgrade -f config-sample.yaml ``` -To upgrade Kubernetes to a specific version, explicitly provide the version after the flag `--with-kubernetes`. Available versions are v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +To upgrade Kubernetes to a specific version, explicitly provide the version after the flag `--with-kubernetes`. Available versions are v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). ### Air-gapped upgrade for multi-node clusters @@ -348,4 +348,4 @@ Set `privateRegistry` of your `config-sample.yaml` file: ./kk upgrade -f config-sample.yaml ``` -To upgrade Kubernetes to a specific version, explicitly provide the version after the flag `--with-kubernetes`. Available versions are v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +To upgrade Kubernetes to a specific version, explicitly provide the version after the flag `--with-kubernetes`. Available versions are v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). diff --git a/content/en/docs/v3.3/upgrade/upgrade-with-ks-installer.md b/content/en/docs/v3.3/upgrade/upgrade-with-ks-installer.md index 14a975300..b27698e84 100644 --- a/content/en/docs/v3.3/upgrade/upgrade-with-ks-installer.md +++ b/content/en/docs/v3.3/upgrade/upgrade-with-ks-installer.md @@ -13,7 +13,7 @@ ks-installer is recommended for users whose Kubernetes clusters were not set up - You need to have a KubeSphere cluster running v3.2.x. If your KubeSphere version is v3.1.x or earlier, upgrade to v3.2.x first. - Read [Release Notes for 3.3.1](../../../v3.3/release/release-v331/) carefully. - Back up any important component beforehand. -- Supported Kubernetes versions of KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +- Supported Kubernetes versions of KubeSphere 3.3: v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). ## Major Updates diff --git a/content/en/docs/v3.3/upgrade/upgrade-with-kubekey.md b/content/en/docs/v3.3/upgrade/upgrade-with-kubekey.md index 03d368fe7..5c2ecd435 100644 --- a/content/en/docs/v3.3/upgrade/upgrade-with-kubekey.md +++ b/content/en/docs/v3.3/upgrade/upgrade-with-kubekey.md @@ -98,7 +98,7 @@ Run the following command to use KubeKey to upgrade your single-node cluster to ./kk upgrade --with-kubernetes v1.22.10 --with-kubesphere v3.3.1 ``` -To upgrade Kubernetes to a specific version, explicitly provide the version after the flag `--with-kubernetes`. Available versions are v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +To upgrade Kubernetes to a specific version, explicitly provide the version after the flag `--with-kubernetes`. Available versions are v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). ### Multi-node cluster @@ -138,7 +138,7 @@ The following command upgrades your cluster to KubeSphere 3.3 and Kubernetes v1. ./kk upgrade --with-kubernetes v1.22.10 --with-kubesphere v3.3.1 -f sample.yaml ``` -To upgrade Kubernetes to a specific version, explicitly provide the version after the flag `--with-kubernetes`. Available versions are v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +To upgrade Kubernetes to a specific version, explicitly provide the version after the flag `--with-kubernetes`. Available versions are v1.19.x, v1.20.x, v1.21.x, v1.22.x (experimental support), and v1.23.x (experimental support). {{< notice note >}} diff --git a/content/zh/common/kubernetes-versions.md b/content/zh/common/kubernetes-versions.md index 3cf40149b..3b2a55e28 100644 --- a/content/zh/common/kubernetes-versions.md +++ b/content/zh/common/kubernetes-versions.md @@ -5,5 +5,5 @@ _build: | 安装工具 | KubeSphere 版本 | 支持的 Kubernetes 版本 | | ------------ | --------------- | ------------------------------------------------------------ | -| KubeKey | 3.2.0 | v1.19.x, v1.20.x, v1.21.x, v1.22.x（实验性支持） | -| ks-installer | 3.2.0 | v1.19.x, v1.20.x, v1.21.x, v1.22.x（实验性支持） | +| KubeKey | 3.3.1 | v1.19.x, v1.20.x, v1.21.x, v1.22.x（实验性支持）， v1.23.x（实验性支持） | +| ks-installer | 3.3.1 | v1.19.x, v1.20.x, v1.21.x, v1.22.x（实验性支持）， v1.23.x（实验性支持） | diff --git a/content/zh/docs/v3.3/devops-user-guide/examples/create-multi-cluster-pipeline.md b/content/zh/docs/v3.3/devops-user-guide/examples/create-multi-cluster-pipeline.md index a446ccca5..5d63b554b 100644 --- a/content/zh/docs/v3.3/devops-user-guide/examples/create-multi-cluster-pipeline.md +++ b/content/zh/docs/v3.3/devops-user-guide/examples/create-multi-cluster-pipeline.md @@ -40,7 +40,7 @@ weight: 11440 {{< notice note >}} -这些 Kubernetes 集群可以被托管至不同的云厂商，也可以使用不同的 Kubernetes 版本。针对 KubeSphere 3.3 推荐的 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x 、v1.22.x 和 v1.23.x（实验性支持）。 +这些 Kubernetes 集群可以被托管至不同的云厂商，也可以使用不同的 Kubernetes 版本。针对 KubeSphere 3.3 推荐的 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x（实验性支持）和 v1.23.x（实验性支持）。 {{}} diff --git a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-ks-on-tencent-tke.md b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-ks-on-tencent-tke.md index 4e4e46e68..3dbac4591 100644 --- a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-ks-on-tencent-tke.md +++ b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-ks-on-tencent-tke.md @@ -14,7 +14,7 @@ weight: 4270 ### 创建 Kubernetes 集群 首先按使用环境的资源需求[创建 Kubernetes 集群](https://cloud.tencent.com/document/product/457/32189)，满足以下一些条件即可（如已有环境并满足条件可跳过本节内容）： -- KubeSphere 3.3 默认支持的 Kubernetes 版本为 v1.19.x, v1.20.x, v1.21.x, v1.22.x 和 v1.23.x（实验性支持），选择支持的版本创建集群； +- KubeSphere 3.3 默认支持的 Kubernetes 版本为 v1.19.x, v1.20.x, v1.21.x, v1.22.x（实验性支持）和 v1.23.x（实验性支持），选择支持的版本创建集群； - 如果老集群版本不大于1.15.0，需要操作控制台先升级master节点然后升级node节点，依次升级至符合要求版本即可。 - 工作节点机型配置规格方面选择 `标准型S5` 的 `4核｜8GB` 配置即可，并按需扩展工作节点数量（通常生产环境需要 3 个及以上工作节点）。 diff --git a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-ack.md b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-ack.md index 493ac46a5..349d5f374 100644 --- a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-ack.md +++ b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-ack.md @@ -15,7 +15,7 @@ weight: 4250 首先按使用环境的资源需求创建 Kubernetes 集群，满足以下一些条件即可（如已有环境并满足条件可跳过本节内容）： -- KubeSphere 3.3 默认支持的 Kubernetes 版本为 v1.19.x, v1.20.x, v1.21.x, v1.22.x 和 v1.23.x（实验性支持），选择支持的版本创建集群； +- KubeSphere 3.3 默认支持的 Kubernetes 版本为 v1.19.x, v1.20.x, v1.21.x, v1.22.x（实验性支持）和 v1.23.x（实验性支持），选择支持的版本创建集群； - 需要确保 Kubernetes 集群所使用的 ECS 实例的网络正常工作，可以通过在创建集群的同时**自动创建**或**使用已有**弹性 IP；或者在集群创建后自行配置网络（如配置 [NAT 网关](https://www.aliyun.com/product/network/nat/)）； - 小规模场景下工作节点规格建议选择 `4核｜8GB` 配置，不推荐`2核｜4GB` ，并按需扩展工作节点数量（通常生产环境需要 3 个及以上工作节点），详情可参考[最佳实践- ECS 选型](https://help.aliyun.com/document_detail/98886.html)。 diff --git a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md index 796196856..3bfc76775 100644 --- a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md +++ b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-do.md @@ -30,7 +30,7 @@ weight: 4230 {{< notice note >}} -- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x（实验性支持）。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x（实验性支持）或 v1.23.x（实验性支持）。 - 此示例中包括 3 个节点。您可以根据自己的需求添加更多节点，尤其是在生产环境中。 - 机器类型 Standard/4 GB/2 vCPU 仅用于最小化安装的，如果您计划启用多个可插拔组件或将集群用于生产，建议将节点升级到规格更大的类型（例如，CPU-Optimized /8 GB /4 vCPUs）。DigitalOcean 是基于工作节点类型来配置主节点，而对于标准节点，API server 可能会很快会变得无响应。 diff --git a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-eks.md b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-eks.md index 6194025b6..870c98b71 100644 --- a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-eks.md +++ b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-eks.md @@ -84,7 +84,7 @@ aws-cli/2.1.2 Python/3.7.3 Linux/4.18.0-193.6.3.el8_2.x86_64 exe/x86_64.centos.8 {{< notice note >}} -- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x（实验性支持）。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x（实验性支持）或 v1.23.x（实验性支持）。 - 此示例中包括 3 个节点。您可以根据自己的需求添加更多节点，尤其是在生产环境中。 - t3.medium（2 个 vCPU，4 GB 内存）机器类型仅用于最小化安装，如果要启用可插拔组件或集群用于生产，请选择具有更大规格的机器类型。 - 对于其他设置，您也可以根据自己的需要进行更改，也可以使用默认值。 diff --git a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-gke.md b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-gke.md index 1280073bc..46ad080bb 100644 --- a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-gke.md +++ b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-gke.md @@ -30,7 +30,7 @@ weight: 4240 {{< notice note >}} -- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x（实验性支持）。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x（实验性支持）或 v1.23.x（实验性支持）。 - 此示例中包括3个节点，可以根据自己的需求添加更多节点，尤其是在生产环境中。 - 最小安装的机器类型为 e2-medium（2 个 vCPU，4GB 内存）。如果要启用可插拔组件或将集群用于生产，请选择具有更高配置的机器类型。 - 对于其他设置，可以根据自己的需要进行更改，也可以使用默认值。 diff --git a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-huaweicloud-cce.md b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-huaweicloud-cce.md index 10f35dbe3..6accdec62 100644 --- a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-huaweicloud-cce.md +++ b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-huaweicloud-cce.md @@ -15,7 +15,7 @@ weight: 4250 首先按使用环境的资源需求创建 Kubernetes 集群，满足以下一些条件即可（如已有环境并满足条件可跳过本节内容）： -- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x（实验性支持）。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x（实验性支持）或 v1.23.x（实验性支持）。 - 需要确保 Kubernetes 集群所使用的云主机的网络正常工作，可以通过在创建集群的同时**自动创建**或**使用已有**弹性 IP；或者在集群创建后自行配置网络（如配置 [NAT 网关](https://support.huaweicloud.com/natgateway/)）。 - 工作节点规格建议选择 `s3.xlarge.2` 的 `4核｜8GB` 配置，并按需扩展工作节点数量（通常生产环境需要 3 个及以上工作节点）。 diff --git a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-oke.md b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-oke.md index de1e84e6c..de2218599 100644 --- a/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-oke.md +++ b/content/zh/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-oke.md @@ -28,7 +28,7 @@ weight: 4260 {{< notice note >}} -- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x（实验性支持）。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x（实验性支持）或 v1.23.x（实验性支持）。 - 建议您在**可见性类型**中选择**公共**，即每个节点会分配到一个公共 IP 地址，此地址之后可用于访问 KubeSphere Web 控制台。 - 在 Oracle Cloud 中，**配置**定义了一个实例会分配到的 CPU 和内存等资源量，本示例使用 `VM.Standard.E2.2 (2 CPUs and 16G Memory)`。有关更多信息，请参见 [Standard Shapes](https://docs.cloud.oracle.com/en-us/iaas/Content/Compute/References/computeshapes.htm#vmshapes__vm-standard)。 - 本示例包含 3 个节点，可以根据需求自行添加节点（尤其是生产环境）。 diff --git a/content/zh/docs/v3.3/installing-on-kubernetes/introduction/prerequisites.md b/content/zh/docs/v3.3/installing-on-kubernetes/introduction/prerequisites.md index 640951318..7405298fd 100644 --- a/content/zh/docs/v3.3/installing-on-kubernetes/introduction/prerequisites.md +++ b/content/zh/docs/v3.3/installing-on-kubernetes/introduction/prerequisites.md @@ -10,7 +10,7 @@ weight: 4120 您可以在虚拟机和裸机上安装 KubeSphere，并同时配置 Kubernetes。另外，只要 Kubernetes 集群满足以下前提条件，那么您也可以在云托管和本地 Kubernetes 集群上部署 KubeSphere。 -- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x（实验性支持）。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x（实验性支持）或 v1.23.x（实验性支持）。 - 可用 CPU > 1 核；内存 > 2 G。CPU 必须为 x86_64，暂时不支持 Arm 架构的 CPU。 - Kubernetes 集群已配置**默认** StorageClass（请使用 `kubectl get sc` 进行确认）。 - 使用 `--cluster-signing-cert-file` 和 `--cluster-signing-key-file` 参数启动集群时，kube-apiserver 将启用 CSR 签名功能。请参见 [RKE 安装问题](https://github.com/kubesphere/kubesphere/issues/1925#issuecomment-591698309)。 diff --git a/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/ha-configuration.md b/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/ha-configuration.md index 4ec125092..24539df2c 100644 --- a/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/ha-configuration.md +++ b/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/ha-configuration.md @@ -97,7 +97,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3 的建议 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/#支持矩阵)。 +- 安装 KubeSphere 3.3 的建议 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` 命令时再次添加这个标志。 diff --git a/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/internal-ha-configuration.md b/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/internal-ha-configuration.md index cb884590b..465c11baa 100644 --- a/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/internal-ha-configuration.md +++ b/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/internal-ha-configuration.md @@ -82,7 +82,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3 的建议 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/#支持矩阵)。 +- 安装 KubeSphere 3.3 的建议 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` 命令时再次添加这个标志。 diff --git a/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md b/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md index dfea39623..9f241483a 100644 --- a/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md +++ b/content/zh/docs/v3.3/installing-on-linux/high-availability-configurations/set-up-ha-cluster-using-keepalived-haproxy.md @@ -316,7 +316,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3 的建议 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/#支持矩阵)。 +- 安装 KubeSphere 3.3 的建议 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。 diff --git a/content/zh/docs/v3.3/installing-on-linux/introduction/kubekey.md b/content/zh/docs/v3.3/installing-on-linux/introduction/kubekey.md index 475054f60..30fa7d464 100644 --- a/content/zh/docs/v3.3/installing-on-linux/introduction/kubekey.md +++ b/content/zh/docs/v3.3/installing-on-linux/introduction/kubekey.md @@ -80,11 +80,11 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.3.0 sh - | KubeSphere 版本 | 受支持的 Kubernetes 版本 | | ------------------ | ------------------------------------------------------------ | -| v3.3 | v1.19.x、v1.20.x、v1.21.x、v1.22.x、v1.23.x（实验性支持） | +| v3.3 | v1.19.x、v1.20.x、v1.21.x、v1.22.x（实验性支持）、v1.23.x（实验性支持） | {{< notice note >}} - 您也可以运行 `./kk version --show-supported-k8s`，查看能使用 KubeKey 安装的所有受支持的 Kubernetes 版本。 -- 能使用 KubeKey 安装的 Kubernetes 版本与 KubeSphere 3.3 支持的 Kubernetes 版本不同。如需[在现有 Kubernetes 集群上安装 KubeSphere 3.3](../../../installing-on-kubernetes/introduction/overview/)，您的 Kubernetes 版本必须为 v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x（实验性支持）。 -- 如果您需要使用 KubeEdge，为了避免兼容性问题，建议安装 v1.22.x 及以下版本的 Kubernetes。 +- 能使用 KubeKey 安装的 Kubernetes 版本与 KubeSphere 3.3 支持的 Kubernetes 版本不同。如需[在现有 Kubernetes 集群上安装 KubeSphere 3.3](../../../installing-on-kubernetes/introduction/overview/)，您的 Kubernetes 版本必须为 v1.19.x，v1.20.x，v1.21.x，v1.22.x（实验性支持） 或 v1.23.x（实验性支持）。 +- 如果您需要使用 KubeEdge，为了避免兼容性问题，建议安装 v1.21.x 及以下版本的 Kubernetes。 {{}} \ No newline at end of file diff --git a/content/zh/docs/v3.3/installing-on-linux/introduction/multioverview.md b/content/zh/docs/v3.3/installing-on-linux/introduction/multioverview.md index 49f03a44c..fe9fbf948 100644 --- a/content/zh/docs/v3.3/installing-on-linux/introduction/multioverview.md +++ b/content/zh/docs/v3.3/installing-on-linux/introduction/multioverview.md @@ -156,7 +156,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3 的建议 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/#支持矩阵)。 +- 安装 KubeSphere 3.3 的建议 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` 命令时再次添加这个标志。 diff --git a/content/zh/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md b/content/zh/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md index c9f889e83..c62edad83 100644 --- a/content/zh/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md +++ b/content/zh/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-bare-metal.md @@ -253,7 +253,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3 的建议 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/#支持矩阵)。 +- 安装 KubeSphere 3.3 的建议 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。 diff --git a/content/zh/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md b/content/zh/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md index 9025236c2..a09f6011b 100644 --- a/content/zh/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md +++ b/content/zh/docs/v3.3/installing-on-linux/on-premises/install-kubesphere-on-vmware-vsphere.md @@ -343,7 +343,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3 的建议 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/#支持矩阵)。 +- 安装 KubeSphere 3.3 的建议 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` 命令时再次添加这个标志。 diff --git a/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-glusterfs.md b/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-glusterfs.md index 99460a66b..262470660 100644 --- a/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-glusterfs.md +++ b/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-glusterfs.md @@ -170,7 +170,7 @@ chmod +x kk {{< notice note >}} - - 安装 KubeSphere 3.3 的建议 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/#支持矩阵)。 + - 安装 KubeSphere 3.3 的建议 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。 diff --git a/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-nfs-client.md b/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-nfs-client.md index a6d190366..28a834140 100644 --- a/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-nfs-client.md +++ b/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-nfs-client.md @@ -122,7 +122,7 @@ chmod +x kk {{< notice note >}} - - 安装 KubeSphere 3.3 的建议 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/#支持矩阵)。 + - 安装 KubeSphere 3.3 的建议 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。 diff --git a/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md b/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md index bee03c593..1323a3442 100644 --- a/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md +++ b/content/zh/docs/v3.3/installing-on-linux/persistent-storage-configurations/install-qingcloud-csi.md @@ -124,7 +124,7 @@ chmod +x kk {{< notice note >}} - - 安装 KubeSphere 3.3 的建议 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/#支持矩阵)。 + - 安装 KubeSphere 3.3 的建议 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。 diff --git a/content/zh/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md b/content/zh/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md index d658b6f7c..1b1847911 100644 --- a/content/zh/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md +++ b/content/zh/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-azure-vms.md @@ -153,7 +153,7 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.3.0 sh - {{< notice note >}} -- KubeSphere 3.3 对应 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/#support-matrix)。 +- KubeSphere 3.3 对应 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/#support-matrix)。 - 如果在此步骤中的命令中未添加标志 `--with-kubesphere`，则不会部署 KubeSphere，除非您使用配置文件中的 `addons` 字段进行安装，或稍后使用 `./kk create cluster` 时再次添加此标志。 - 如果在未指定 KubeSphere 版本的情况下添加标志 --with kubesphere`，将安装 KubeSphere 的最新版本。 diff --git a/content/zh/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md b/content/zh/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md index b7dcabcd2..5e4a51a25 100644 --- a/content/zh/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md +++ b/content/zh/docs/v3.3/installing-on-linux/public-cloud/install-kubesphere-on-qingcloud-vms.md @@ -175,7 +175,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3 的建议 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/#支持矩阵)。 +- 安装 KubeSphere 3.3 的建议 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` 命令时再次添加这个标志。 diff --git a/content/zh/docs/v3.3/quick-start/all-in-one-on-linux.md b/content/zh/docs/v3.3/quick-start/all-in-one-on-linux.md index 4e751ea55..640172d36 100644 --- a/content/zh/docs/v3.3/quick-start/all-in-one-on-linux.md +++ b/content/zh/docs/v3.3/quick-start/all-in-one-on-linux.md @@ -202,7 +202,7 @@ chmod +x kk {{< notice note >}} -- 安装 KubeSphere 3.3 的建议 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/#支持矩阵)。 +- 安装 KubeSphere 3.3 的建议 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。 diff --git a/content/zh/docs/v3.3/quick-start/minimal-kubesphere-on-k8s.md b/content/zh/docs/v3.3/quick-start/minimal-kubesphere-on-k8s.md index 5c99f4f7d..d32782863 100644 --- a/content/zh/docs/v3.3/quick-start/minimal-kubesphere-on-k8s.md +++ b/content/zh/docs/v3.3/quick-start/minimal-kubesphere-on-k8s.md @@ -10,7 +10,7 @@ weight: 2200 ## 准备工作 -- 您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x（实验性支持）。 +- 您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x（实验性支持）或 v1.23.x（实验性支持）。 - 确保您的机器满足最低硬件要求：CPU > 1 核，内存 > 2 GB。 - 在安装之前，需要配置 Kubernetes 集群中的**默认**存储类型。 diff --git a/content/zh/docs/v3.3/upgrade/air-gapped-upgrade-with-ks-installer.md b/content/zh/docs/v3.3/upgrade/air-gapped-upgrade-with-ks-installer.md index 1f3c860e6..48942f318 100644 --- a/content/zh/docs/v3.3/upgrade/air-gapped-upgrade-with-ks-installer.md +++ b/content/zh/docs/v3.3/upgrade/air-gapped-upgrade-with-ks-installer.md @@ -15,7 +15,7 @@ weight: 7500 - 请仔细阅读 [3.3.1 版本说明](../../../v3.3/release/release-v331/)。 - 提前备份所有重要的组件。 - Docker 仓库。您需要有一个 Harbor 或其他 Docker 仓库。有关更多信息，请参见[准备一个私有镜像仓库](../../installing-on-linux/introduction/air-gapped-installation/#步骤-2准备一个私有镜像仓库)。 -- KubeSphere 3.3 支持的 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、 v1.22.x 和 v1.23.x（实验性支持）。 +- KubeSphere 3.3 支持的 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x（实验性支持）和 v1.23.x（实验性支持）。 ## 重要提示 diff --git a/content/zh/docs/v3.3/upgrade/air-gapped-upgrade-with-kubekey.md b/content/zh/docs/v3.3/upgrade/air-gapped-upgrade-with-kubekey.md index 1cfe347af..cf4523f78 100644 --- a/content/zh/docs/v3.3/upgrade/air-gapped-upgrade-with-kubekey.md +++ b/content/zh/docs/v3.3/upgrade/air-gapped-upgrade-with-kubekey.md @@ -155,7 +155,7 @@ KubeSphere 3.3.1 对内置角色和自定义角色的授权项做了一些调整 {{< notice note >}} - - 您可以根据自己的需求变更下载的 Kubernetes 版本。安装 KubeSphere 3.3 的建议 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 版本。安装 KubeSphere 3.3 的建议 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 二进制文件。 @@ -266,7 +266,7 @@ KubeSphere 3.3.1 对内置角色和自定义角色的授权项做了一些调整 ./kk upgrade -f config-sample.yaml ``` -要将 Kubernetes 升级至特定版本，可以在 `--with-kubernetes` 标志后明确指定版本号。以下是可用版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。 +要将 Kubernetes 升级至特定版本，可以在 `--with-kubernetes` 标志后明确指定版本号。以下是可用版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x（实验性支持）和 v1.23.x（实验性支持）。 ### 离线升级多节点集群 @@ -350,5 +350,5 @@ KubeSphere 3.3.1 对内置角色和自定义角色的授权项做了一些调整 ./kk upgrade -f config-sample.yaml ``` -要将 Kubernetes 升级至特定版本，可以在 `--with-kubernetes` 标志后明确指定版本号。以下是可用版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。 +要将 Kubernetes 升级至特定版本，可以在 `--with-kubernetes` 标志后明确指定版本号。以下是可用版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x（实验性支持）和 v1.23.x（实验性支持）。 diff --git a/content/zh/docs/v3.3/upgrade/upgrade-with-ks-installer.md b/content/zh/docs/v3.3/upgrade/upgrade-with-ks-installer.md index aa5b4482f..b0f8cde60 100644 --- a/content/zh/docs/v3.3/upgrade/upgrade-with-ks-installer.md +++ b/content/zh/docs/v3.3/upgrade/upgrade-with-ks-installer.md @@ -13,7 +13,7 @@ weight: 7300 - 您需要有一个运行 KubeSphere v3.2.x 的集群。如果您的 KubeSphere 是 v3.1.0 或更早的版本，请先升级至 v3.2.x。 - 请仔细阅读 [3.3.1 版本说明](../../../v3.3/release/release-v331/)。 - 提前备份所有重要的组件。 -- KubeSphere 3.3 支持的 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。 +- KubeSphere 3.3 支持的 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x（实验性支持）和 v1.23.x（实验性支持）。 ## 重要提示 diff --git a/content/zh/docs/v3.3/upgrade/upgrade-with-kubekey.md b/content/zh/docs/v3.3/upgrade/upgrade-with-kubekey.md index edf29a658..2b5bceec8 100644 --- a/content/zh/docs/v3.3/upgrade/upgrade-with-kubekey.md +++ b/content/zh/docs/v3.3/upgrade/upgrade-with-kubekey.md @@ -99,7 +99,7 @@ chmod +x kk ./kk upgrade --with-kubernetes v1.22.10 --with-kubesphere v3.3.1 ``` -要将 Kubernetes 升级至特定版本，请在 `--with-kubernetes` 标志后明确指定版本号。以下是可用版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。 +要将 Kubernetes 升级至特定版本，请在 `--with-kubernetes` 标志后明确指定版本号。以下是可用版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x（实验性支持）和 v1.23.x（实验性支持）。 ### 多节点集群 @@ -140,7 +140,7 @@ chmod +x kk ./kk upgrade --with-kubernetes v1.22.10 --with-kubesphere v3.3.1 -f sample.yaml ``` -要将 Kubernetes 升级至特定版本，请在 `--with-kubernetes` 标志后明确指定版本号。以下是可用版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。 +要将 Kubernetes 升级至特定版本，请在 `--with-kubernetes` 标志后明确指定版本号。以下是可用版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x（实验性支持）和 v1.23.x（实验性支持）。 {{< notice note >}} diff --git a/static/images/common/view-file.png b/static/images/common/view-file.png new file mode 100644 index 000000000..8c7535b25 Binary files /dev/null and b/static/images/common/view-file.png differ