Merge branch 'kubesphere:master' into master

assets/scss/partner.scss

@@ -242,8 +242,10 @@
       }
 
       li {
+        display: flex;
+        flex-direction: column;
         width: 570px;
-        height: 309px;
+        min-height: 309px;
         border-radius: 10px;
         margin-top: 20px;
         box-shadow: 0 4px 8px 0 rgba(36, 46, 66, 0.06), 0 8px 16px 0 rgba(36, 46, 66, 0.05);
@@ -258,10 +260,11 @@
         }
 
         p {
-          height: 128px;
+          min-height: 128px;
           margin-left: 40px;
           margin-right: 40px;
           line-height: 2;
+          flex: 1;
 
           @media only screen and (max-width: $mobile-max-width) {
             height: auto;
@@ -274,10 +277,28 @@
           margin-bottom: 20px;
           font-weight: 600;
           line-height: 1.5;
+
+          &:last-of-type{
+            justify-self: flex-end;
+          }
         }
       }
     }
   }
+
+  .apply{
+    display: flex;
+    margin: 0px auto;
+    justify-content: center;
+    margin-top: 20px;
+    width: 130px;
+    height: 48px;
+    border-radius: 30px;
+    align-items: center;
+    color: #fff;
+    cursor: pointer;
+    background-image: linear-gradient(to bottom,rgba(0,0,0,0),rgba(0,0,0,0.1) 97%),linear-gradient(to bottom,#55bc8a,#55bc8a);
+  }
 }
 
 .section-4 {

config/upstream-zh/config.toml

@@ -8,6 +8,8 @@ addBaiduAnalytics = true
 
 bilibiliLink = "https://space.bilibili.com/438908638"
 
+applyAllInOne = true
+
 [languages.en.params]
 useSendcloud = true
 mailchimpSubscribeUrl = "https://www.sendcloud.net/v3/api/subInvite/subscription?invitecode=1dc5a4fb-894c-4470-b01d-ca7fa9d47a46"

config/upstream/config.toml

@@ -2,6 +2,7 @@ baseURL = "https://kubesphere.io"
 
 [params]
 
+applyAllInOne = false
 addGoogleAnalytics = true
 addGoogleTag = true
 hotjarTracking = true

content/en/docs/v3.3/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.3.0  sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2  sh -
 ```
 
 {{</ tab >}}
@@ -64,7 +64,7 @@ export KKZONE=cn
 Run the following command to download KubeKey:
 
 ```bash
-curl -sfL https://get-kk.kubesphere.io | VERSION=v2.3.0  sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2  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.3.0) of KubeKey. You can change the version number in the command to download a specific version.
+The commands above download the latest release (v3.0.2) of KubeKey. You can change the version number in the command to download a specific version.
 
 {{</ notice >}} 
 
@@ -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, * v1.23.x, and * v1.24.x. For Kubernetes versions with an asterisk, some features of edge nodes may be unavailable due to incompatability. Therefore, if you want to use edge nodes, you are advised to install Kubernetes v1.21.x or earlier. 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, * v1.23.x, and * v1.24.x. For Kubernetes versions with an asterisk, some features of edge nodes may be unavailable due to incompatability. Therefore, if you want to use edge nodes, you are advised to install Kubernetes v1.21.x or earlier. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.10 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.

content/en/docs/v3.3/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.3.0 sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 sh -
 ```
 
 {{</ tab >}}
@@ -49,7 +49,7 @@ export KKZONE=cn
 Run the following command to download KubeKey:
 
 ```bash
-curl -sfL https://get-kk.kubesphere.io | VERSION=v2.3.0 sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 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.3.0). You can modify the version number in the command to download a specific version.
+The preceding commands download the latest release of KubeKey (v3.0.2). You can modify the version number in the command to download a specific version.
 
 {{</ notice >}}
 
@@ -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, * v1.23.x, and * v1.24.x. For Kubernetes versions with an asterisk, some features of edge nodes may be unavailable due to incompatability. Therefore, if you want to use edge nodes, you are advised to install Kubernetes v1.21.x or earlier. 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, * v1.23.x, and * v1.24.x. For Kubernetes versions with an asterisk, some features of edge nodes may be unavailable due to incompatability. Therefore, if you want to use edge nodes, you are advised to install Kubernetes v1.21.x or earlier. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.10 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.
 

content/en/docs/v3.3/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.3.0 sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 sh -
 ```
 
 {{</ tab >}}
@@ -284,7 +284,7 @@ export KKZONE=cn
 Run the following command to download KubeKey:
 
 ```bash
-curl -sfL https://get-kk.kubesphere.io | VERSION=v2.3.0 sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 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.3.0) of KubeKey. You can change the version number in the command to download a specific version.
+The commands above download the latest release (v3.0.2) of KubeKey. You can change the version number in the command to download a specific version.
 
 {{</ notice >}} 
 
@@ -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, * v1.23.x, and * v1.24.x. For Kubernetes versions with an asterisk, some features of edge nodes may be unavailable due to incompatability. Therefore, if you want to use edge nodes, you are advised to install Kubernetes v1.21.x or earlier. 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, * v1.23.x, and * v1.24.x. For Kubernetes versions with an asterisk, some features of edge nodes may be unavailable due to incompatability. Therefore, if you want to use edge nodes, you are advised to install Kubernetes v1.21.x or earlier. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.10 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.

content/en/docs/v3.3/installing-on-linux/introduction/air-gapped-installation.md

@@ -20,15 +20,15 @@ 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.3.0 .
+1. Run the following commands to download KubeKey v3.0.2 .
    {{< tabs >}}
 
    {{< tab "Good network connections to GitHub/Googleapis" >}}
 
    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.3.0 sh -
+   curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 sh -
    ```
 
    {{</ tab >}}
@@ -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.3.0 sh -
+   curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 sh -
    ```
    {{</ tab >}}
 
@@ -83,15 +83,15 @@ 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.3.0/centos7-rpms-amd64.iso
+           url: https://github.com/kubesphere/kubekey/releases/download/v3.0.2/centos7-rpms-amd64.iso
      - arch: amd64
        type: linux
        id: ubuntu
        version: "20.04"
        repository:
          iso:
            localPath:
-           url: https://github.com/kubesphere/kubekey/releases/download/v2.3.0/ubuntu-20.04-debs-amd64.iso
+           url: https://github.com/kubesphere/kubekey/releases/download/v3.0.2/ubuntu-20.04-debs-amd64.iso
      kubernetesDistributions:
      - type: kubernetes
        version: v1.22.12
@@ -265,7 +265,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.3.0.
+   - You can download the ISO files at https://github.com/kubesphere/kubekey/releases/tag/v3.0.2.
 
    {{</ notice >}}
 

content/en/docs/v3.3/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.3.0 sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 sh -
 ```
 
 {{</ tab >}}
@@ -54,7 +54,7 @@ export KKZONE=cn
 Run the following command to download KubeKey:
 
 ```bash
-curl -sfL https://get-kk.kubesphere.io | VERSION=v2.3.0 sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 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.3.0) of KubeKey. You can change the version number in the command to download a specific version.
+The commands above download the latest release (v3.0.2) of KubeKey. You can change the version number in the command to download a specific version.
 
 {{</ notice >}}
 

content/en/docs/v3.3/installing-on-linux/introduction/multioverview.md

@@ -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.3.0 sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 sh -
 ```
 
 {{</ tab >}}
@@ -126,7 +126,7 @@ export KKZONE=cn
 Run the following command to download KubeKey:
 
 ```bash
-curl -sfL https://get-kk.kubesphere.io | VERSION=v2.3.0 sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 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.3.0) of KubeKey. You can change the version number in the command to download a specific version.
+The commands above download the latest release (v3.0.2) of KubeKey. You can change the version number in the command to download a specific version.
 
 {{</ notice >}}
 
@@ -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, * v1.23.x, and * v1.24.x. For Kubernetes versions with an asterisk, some features of edge nodes may be unavailable due to incompatability. Therefore, if you want to use edge nodes, you are advised to install Kubernetes v1.21.x or earlier. 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, * v1.23.x, and * v1.24.x. For Kubernetes versions with an asterisk, some features of edge nodes may be unavailable due to incompatability. Therefore, if you want to use edge nodes, you are advised to install Kubernetes v1.21.x or earlier. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.10 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.

content/en/docs/v3.3/installing-on-linux/introduction/vars.md

@@ -45,7 +45,7 @@ The below table describes the above parameters in detail.
    </tr>
    <tr>
      <td><code>version</code></td>
-     <td>The Kubernetes version to be installed. If you do not specify a Kubernetes version, {{< contentLink "docs/installing-on-linux/introduction/kubekey" "KubeKey" >}} v2.3.0 will install Kubernetes v1.23.7 by default. For more information, see {{< contentLink "docs/installing-on-linux/introduction/kubekey/#support-matrix" "Support Matrix" >}}.</td>
+     <td>The Kubernetes version to be installed. If you do not specify a Kubernetes version, {{< contentLink "docs/installing-on-linux/introduction/kubekey" "KubeKey" >}} v3.0.2 will install Kubernetes v1.23.10 by default. For more information, see {{< contentLink "docs/installing-on-linux/introduction/kubekey/#support-matrix" "Support Matrix" >}}.</td>
    </tr>
    <tr>
      <td><code>imageRepo</code></td>

content/en/docs/v3.3/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.3.0 sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 sh -
 ```
 
 {{</ tab >}}
@@ -48,7 +48,7 @@ export KKZONE=cn
 Run the following command to download KubeKey:
 
 ```bash
-curl -sfL https://get-kk.kubesphere.io | VERSION=v2.3.0 sh -
+curl -sfL https://get-kk.kubesphere.io | VERSION=v3.0.2 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.3.0) of KubeKey. Note that an earlier version of KubeKey cannot be used to install K3s.
+The commands above download the latest release (v3.0.2) of KubeKey. Note that an earlier version of KubeKey cannot be used to install K3s.
 
 {{</ notice >}}
 
@@ -83,7 +83,7 @@ chmod +x kk
 
    {{< notice note >}}
 
-   KubeKey v2.3.0 supports the installation of K3s v1.21.4.
+   KubeKey v3.0.2 supports the installation of K3s v1.21.4.
 
    {{</ notice >}}