From 57f5a23200813bccab67d587272ff55a4ee185c1 Mon Sep 17 00:00:00 2001 From: Bettygogo2021 <91529409+Bettygogo2021@users.noreply.github.com> Date: Mon, 27 Jun 2022 16:13:25 +0800 Subject: [PATCH] update 3.3 docs Signed-off-by: Bettygogo2021 <91529409+Bettygogo2021@users.noreply.github.com> Change doc URL form docs to docs/v3.3 Signed-off-by: Patrick-LuoYu --- .../examples/create-multi-cluster-pipeline.md | 2 +- .../install-kubesphere-on-do.md | 2 +- .../install-kubesphere-on-eks.md | 2 +- .../install-kubesphere-on-gke.md | 2 +- .../install-kubesphere-on-huaweicloud-cce.md | 2 +- .../install-kubesphere-on-oke.md | 2 +- .../introduction/prerequisites.md | 2 +- .../install-ks-on-linux-airgapped.md | 106 +++--- .../ha-configuration.md | 2 +- .../internal-ha-configuration.md | 2 +- ...-up-ha-cluster-using-keepalived-haproxy.md | 2 +- .../introduction/air-gapped-installation.md | 43 +-- .../introduction/kubekey.md | 4 +- .../introduction/multioverview.md | 2 +- .../install-kubesphere-on-bare-metal.md | 2 +- .../install-kubesphere-on-vmware-vsphere.md | 2 +- .../install-glusterfs.md | 2 +- .../install-nfs-client.md | 2 +- .../install-qingcloud-csi.md | 2 +- .../install-kubesphere-on-azure-vms.md | 2 +- .../install-kubesphere-on-qingcloud-vms.md | 2 +- .../v3.3/introduction/what's-new-in-3.3.0.md | 4 +- .../v3.3/quick-start/all-in-one-on-linux.md | 2 +- .../quick-start/minimal-kubesphere-on-k8s.md | 2 +- .../air-gapped-upgrade-with-ks-installer.md | 6 +- .../air-gapped-upgrade-with-kubekey.md | 10 +- content/en/docs/v3.3/upgrade/overview.md | 4 +- .../v3.3/upgrade/upgrade-with-ks-installer.md | 8 +- .../docs/v3.3/upgrade/upgrade-with-kubekey.md | 8 +- content/en/docs/v3.3/upgrade/what-changed.md | 5 +- .../examples/create-multi-cluster-pipeline.md | 2 +- .../install-ks-on-tencent-tke.md | 2 +- .../install-kubesphere-on-ack.md | 2 +- .../install-kubesphere-on-do.md | 2 +- .../install-kubesphere-on-eks.md | 2 +- .../install-kubesphere-on-gke.md | 2 +- .../install-kubesphere-on-huaweicloud-cce.md | 2 +- .../install-kubesphere-on-oke.md | 2 +- .../introduction/prerequisites.md | 2 +- .../install-ks-on-linux-airgapped.md | 106 +++--- .../ha-configuration.md | 2 +- .../internal-ha-configuration.md | 2 +- ...-up-ha-cluster-using-keepalived-haproxy.md | 2 +- .../introduction/air-gapped-installation.md | 313 ++++++++---------- .../introduction/kubekey.md | 4 +- .../introduction/multioverview.md | 2 +- .../install-kubesphere-on-bare-metal.md | 2 +- .../install-kubesphere-on-vmware-vsphere.md | 2 +- .../install-glusterfs.md | 2 +- .../install-nfs-client.md | 2 +- .../install-qingcloud-csi.md | 2 +- .../install-kubesphere-on-azure-vms.md | 2 +- .../install-kubesphere-on-qingcloud-vms.md | 2 +- .../v3.3/introduction/what's-new-in-3.3.0.md | 4 +- .../v3.3/quick-start/all-in-one-on-linux.md | 2 +- .../quick-start/minimal-kubesphere-on-k8s.md | 2 +- .../air-gapped-upgrade-with-ks-installer.md | 6 +- .../air-gapped-upgrade-with-kubekey.md | 8 +- .../v3.3/upgrade/upgrade-with-ks-installer.md | 6 +- .../docs/v3.3/upgrade/upgrade-with-kubekey.md | 6 +- content/zh/docs/v3.3/upgrade/what-changed.md | 5 +- 61 files changed, 346 insertions(+), 394 deletions(-) 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 58e1e6733..6f3f9accc 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.0: v1.19.x or above. +These Kubernetes clusters can be hosted across different cloud providers and their Kubernetes versions can also vary. Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x, v1.20.x, v1.21.x, v1.22.x, 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 0ecce0bf9..8fd5dfa4d 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.0 on Kubernetes, your Kubernetes version must be v1.19.x or above. +- To install KubeSphere 3.3.0 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). - 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-eks.md b/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-eks.md index 265da7184..47a541e90 100644 --- a/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-eks.md +++ b/content/en/docs/v3.3/installing-on-kubernetes/hosted-kubernetes/install-kubesphere-on-eks.md @@ -79,7 +79,7 @@ Check the installation with `aws --version`. {{< notice note >}} -- To install KubeSphere 3.3.0 on Kubernetes, your Kubernetes version must be v1.19.x or above. +- To install KubeSphere 3.3.0 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). - 3 nodes are included in this example. You can add more nodes based on your own needs especially in a production environment. - The machine type t3.medium (2 vCPU, 4GB memory) is for minimal installation. If you want to enable pluggable components or use the cluster for production, please select a machine type with more resources. - For other settings, you can change them as well based on your own needs or use the default value. diff --git a/content/en/docs/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 24325d53c..9b7ebba6b 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.0 on Kubernetes, your Kubernetes version must be v1.19.x or above. +- To install KubeSphere 3.3.0 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). - 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 381fa697a..eb273f308 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.0 on Kubernetes, your Kubernetes version must be v1.19.x or above. +- To install KubeSphere 3.3.0 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). - 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 d0a2aba73..d8eacf710 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.0 on Kubernetes, your Kubernetes version must be v1.19.x or above. + - To install KubeSphere 3.3.0 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). - 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-kubernetes/introduction/prerequisites.md b/content/en/docs/v3.3/installing-on-kubernetes/introduction/prerequisites.md index 09c0e6cdb..fea56440d 100644 --- a/content/en/docs/v3.3/installing-on-kubernetes/introduction/prerequisites.md +++ b/content/en/docs/v3.3/installing-on-kubernetes/introduction/prerequisites.md @@ -8,7 +8,7 @@ weight: 4120 You can install KubeSphere on virtual machines and bare metal with Kubernetes also provisioned. In addition, KubeSphere can also be deployed on cloud-hosted and on-premises Kubernetes clusters as long as your Kubernetes cluster meets the prerequisites below. -- To install KubeSphere 3.3.0 on Kubernetes, your Kubernetes version must be v1.19.x or above. +- To install KubeSphere 3.3.0 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). - Available CPU > 1 Core and Memory > 2 G. Only x86_64 CPUs are supported, and Arm CPUs are not fully supported at present. - A **default** StorageClass in your Kubernetes cluster is configured; use `kubectl get sc` to verify it. - The CSR signing feature is activated in kube-apiserver when it is started with the `--cluster-signing-cert-file` and `--cluster-signing-key-file` parameters. See [RKE installation issue](https://github.com/kubesphere/kubesphere/issues/1925#issuecomment-591698309). diff --git a/content/en/docs/v3.3/installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped.md b/content/en/docs/v3.3/installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped.md index a8aeee269..7094bee26 100644 --- a/content/en/docs/v3.3/installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped.md +++ b/content/en/docs/v3.3/installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped.md @@ -246,25 +246,28 @@ To access the console, make sure port 30880 is opened in your security group. ```txt ##k8s-images -kubesphere/kube-apiserver:v1.22.1 -kubesphere/kube-controller-manager:v1.22.1 -kubesphere/kube-proxy:v1.22.1 -kubesphere/kube-scheduler:v1.22.1 -kubesphere/kube-apiserver:v1.21.5 -kubesphere/kube-controller-manager:v1.21.5 -kubesphere/kube-proxy:v1.21.5 -kubesphere/kube-scheduler:v1.21.5 -kubesphere/kube-apiserver:v1.20.10 -kubesphere/kube-controller-manager:v1.20.10 -kubesphere/kube-proxy:v1.20.10 -kubesphere/kube-scheduler:v1.20.10 -kubesphere/kube-apiserver:v1.19.9 -kubesphere/kube-controller-manager:v1.19.9 -kubesphere/kube-proxy:v1.19.9 -kubesphere/kube-scheduler:v1.19.9 +kubesphere/kube-apiserver:v1.23.7 +kubesphere/kube-controller-manager:v1.23.7 +kubesphere/kube-proxy:v1.23.7 +kubesphere/kube-scheduler:v1.23.7 +kubesphere/kube-apiserver:v1.24.1 +kubesphere/kube-controller-manager:v1.24.1 +kubesphere/kube-proxy:v1.24.1 +kubesphere/kube-scheduler:v1.24.1 +kubesphere/kube-apiserver:v1.22.10 +kubesphere/kube-controller-manager:v1.22.10 +kubesphere/kube-proxy:v1.22.10 +kubesphere/kube-scheduler:v1.22.10 +kubesphere/kube-apiserver:v1.21.13 +kubesphere/kube-controller-manager:v1.21.13 +kubesphere/kube-proxy:v1.21.13 +kubesphere/kube-scheduler:v1.21.13 +kubesphere/pause:3.7 +kubesphere/pause:3.6 kubesphere/pause:3.5 kubesphere/pause:3.4.1 coredns/coredns:1.8.0 +coredns/coredns:1.8.6 calico/cni:v3.20.0 calico/kube-controllers:v3.20.0 calico/node:v3.20.0 @@ -273,19 +276,23 @@ calico/typha:v3.20.0 kubesphere/flannel:v0.12.0 openebs/provisioner-localpv:2.10.1 openebs/linux-utils:2.10.0 +library/haproxy:2.3 +kubesphere/nfs-subdir-external-provisioner:v4.0.2 kubesphere/k8s-dns-node-cache:1.15.12 ##kubesphere-images kubesphere/ks-installer:v3.3.0 kubesphere/ks-apiserver:v3.3.0 kubesphere/ks-console:v3.3.0 kubesphere/ks-controller-manager:v3.3.0 +kubesphere/kubectl:v1.22.0 +kubesphere/kubectl:v1.21.0 kubesphere/kubectl:v1.20.0 kubesphere/kubefed:v0.8.1 kubesphere/tower:v0.2.0 minio/minio:RELEASE.2019-08-07T01-59-21Z minio/mc:RELEASE.2019-08-07T23-14-43Z csiplugin/snapshot-controller:v4.0.0 -kubesphere/nginx-ingress-controller:v0.48.1 +kubesphere/nginx-ingress-controller:v1.1.0 mirrorgooglecontainers/defaultbackend-amd64:1.4 kubesphere/metrics-server:v0.4.2 redis:5.0.14-alpine @@ -294,32 +301,38 @@ alpine:3.14 osixia/openldap:1.3.0 kubesphere/netshoot:v1.0 ##kubeedge-images -kubeedge/cloudcore:v1.7.2 -kubesphere/edge-watcher:v0.1.1 -kubesphere/edge-watcher-agent:v0.1.0 +kubeedge/cloudcore:v1.9.2 +kubeedge/iptables-manager:v1.9.2 +kubesphere/edgeservice:v0.2.0 ##gatekeeper-images openpolicyagent/gatekeeper:v3.5.2 ##openpitrix-images -kubesphere/openpitrix-jobs:v3.3.0 +kubesphere/openpitrix-jobs:v3.2.1 ##kubesphere-devops-images kubesphere/devops-apiserver:v3.3.0 kubesphere/devops-controller:v3.3.0 kubesphere/devops-tools:v3.3.0 -kubesphere/ks-jenkins:v3.2.0-2.249.1 -jenkins/jnlp-slave:3.27-1 -kubesphere/builder-base:v3.2.0 +kubesphere/ks-jenkins:v3.3.0-2.319.1 +jenkins/inbound-agent:4.10-2 +kubesphere/builder-base:v3.2.2 kubesphere/builder-nodejs:v3.2.0 kubesphere/builder-maven:v3.2.0 +kubesphere/builder-maven:v3.2.1-jdk11 kubesphere/builder-python:v3.2.0 kubesphere/builder-go:v3.2.0 -kubesphere/builder-go:v3.2.0 -kubesphere/builder-base:v3.2.0-podman +kubesphere/builder-go:v3.2.2-1.16 +kubesphere/builder-go:v3.2.2-1.17 +kubesphere/builder-go:v3.2.2-1.18 +kubesphere/builder-base:v3.2.2-podman kubesphere/builder-nodejs:v3.2.0-podman kubesphere/builder-maven:v3.2.0-podman +kubesphere/builder-maven:v3.2.1-jdk11-podman kubesphere/builder-python:v3.2.0-podman kubesphere/builder-go:v3.2.0-podman -kubesphere/builder-go:v3.2.0-podman -kubesphere/s2ioperator:v3.2.0 +kubesphere/builder-go:v3.2.2-1.16-podman +kubesphere/builder-go:v3.2.2-1.17-podman +kubesphere/builder-go:v3.2.2-1.18-podman +kubesphere/s2ioperator:v3.2.1 kubesphere/s2irun:v3.2.0 kubesphere/s2i-binary:v3.2.0 kubesphere/tomcat85-java11-centos7:v3.2.0 @@ -337,33 +350,36 @@ kubesphere/python-36-centos7:v3.2.0 kubesphere/python-35-centos7:v3.2.0 kubesphere/python-34-centos7:v3.2.0 kubesphere/python-27-centos7:v3.2.0 +quay.io/argoproj/argocd:v2.3.3 +quay.io/argoproj/argocd-applicationset:v0.4.1 +ghcr.io/dexidp/dex:v2.30.2 +redis:6.2.6-alpine ##kubesphere-monitoring-images -jimmidyson/configmap-reload:v0.3.0 -prom/prometheus:v2.26.0 -kubesphere/prometheus-config-reloader:v0.43.2 -kubesphere/prometheus-operator:v0.43.2 -kubesphere/kube-rbac-proxy:v0.8.0 -kubesphere/kube-state-metrics:v1.9.7 -prom/node-exporter:v0.18.1 -kubesphere/k8s-prometheus-adapter-amd64:v0.6.0 -prom/alertmanager:v0.21.0 -thanosio/thanos:v0.18.0 -grafana/grafana:7.4.3 +jimmidyson/configmap-reload:v0.5.0 +prom/prometheus:v2.34.0 +kubesphere/prometheus-config-reloader:v0.55.1 +kubesphere/prometheus-operator:v0.55.1 +kubesphere/kube-rbac-proxy:v0.11.0 +kubesphere/kube-state-metrics:v2.3.0 +prom/node-exporter:v1.3.1 +prom/alertmanager:v0.23.0 +thanosio/thanos:v0.25.2 +grafana/grafana:8.3.3 kubesphere/kube-rbac-proxy:v0.8.0 kubesphere/notification-manager-operator:v1.4.0 kubesphere/notification-manager:v1.4.0 kubesphere/notification-tenant-sidecar:v3.2.0 ##kubesphere-logging-images kubesphere/elasticsearch-curator:v5.7.6 -kubesphere/elasticsearch-oss:6.7.0-1 -kubesphere/fluentbit-operator:v0.11.0 +kubesphere/elasticsearch-oss:6.8.22 +kubesphere/fluentbit-operator:v0.13.0 docker:19.03 -kubesphere/fluent-bit:v1.8.3 +kubesphere/fluent-bit:v1.8.11 kubesphere/log-sidecar-injector:1.1 elastic/filebeat:6.7.0 -kubesphere/kube-events-operator:v0.3.0 -kubesphere/kube-events-exporter:v0.3.0 -kubesphere/kube-events-ruler:v0.3.0 +kubesphere/kube-events-operator:v0.4.0 +kubesphere/kube-events-exporter:v0.4.0 +kubesphere/kube-events-ruler:v0.4.0 kubesphere/kube-auditing-operator:v0.2.0 kubesphere/kube-auditing-webhook:v0.2.0 ##istio-images 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 cd5e288f0..041181331 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.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: 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). - 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 94a258273..6227ee6c5 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.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: 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). - 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 e79d236eb..c06cf0aa0 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.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: 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). - 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/air-gapped-installation.md b/content/en/docs/v3.3/installing-on-linux/introduction/air-gapped-installation.md index d14d93a88..ea95e71f9 100644 --- a/content/en/docs/v3.3/installing-on-linux/introduction/air-gapped-installation.md +++ b/content/en/docs/v3.3/installing-on-linux/introduction/air-gapped-installation.md @@ -92,31 +92,9 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides iso: localPath: url: https://github.com/kubesphere/kubekey/releases/download/v2.2.1/ubuntu-20.04-debs-amd64.iso - - arch: amd64 - type: linux - id: ubuntu - version: "18.04" - repository: - iso: - localPath: - url: https://github.com/kubesphere/kubekey/releases/download/v2.2.1/ubuntu-18.04-debs-amd64.iso - - arch: amd64 - type: linux - id: ubuntu - version: "16.04" - repository: - iso: - localPath: - url: https://github.com/kubesphere/kubekey/releases/download/v2.2.1/ubuntu-16.04-debs-amd64.iso kubernetesDistributions: - type: kubernetes - version: v1.22.1 - - type: kubernetes - version: v1.21.5 - - type: kubernetes - version: v1.20.10 - - type: kubernetes - version: v1.19.9 + version: v1.22.10 components: helm: version: v3.6.3 @@ -139,28 +117,12 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides docker-compose: version: v2.2.2 images: - - docker.io/kubesphere/kube-apiserver:v1.23.7 - - docker.io/kubesphere/kube-controller-manager:v1.23.7 - - docker.io/kubesphere/kube-proxy:v1.23.7 - - docker.io/kubesphere/kube-scheduler:v1.23.7 - - docker.io/kubesphere/kube-apiserver:v1.24.1 - - docker.io/kubesphere/kube-controller-manager:v1.24.1 - - docker.io/kubesphere/kube-proxy:v1.24.1 - - docker.io/kubesphere/kube-scheduler:v1.24.1 - docker.io/kubesphere/kube-apiserver:v1.22.10 - docker.io/kubesphere/kube-controller-manager:v1.22.10 - docker.io/kubesphere/kube-proxy:v1.22.10 - docker.io/kubesphere/kube-scheduler:v1.22.10 - - docker.io/kubesphere/kube-apiserver:v1.21.13 - - docker.io/kubesphere/kube-controller-manager:v1.21.13 - - docker.io/kubesphere/kube-proxy:v1.21.13 - - docker.io/kubesphere/kube-scheduler:v1.21.13 - - docker.io/kubesphere/pause:3.7 - - docker.io/kubesphere/pause:3.6 - docker.io/kubesphere/pause:3.5 - - docker.io/kubesphere/pause:3.4.1 - docker.io/coredns/coredns:1.8.0 - - docker.io/coredns/coredns:1.8.6 - docker.io/calico/cni:v3.20.0 - docker.io/calico/kube-controllers:v3.20.0 - docker.io/calico/node:v3.20.0 @@ -177,6 +139,7 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides - docker.io/kubesphere/ks-console:v3.3.0 - docker.io/kubesphere/ks-controller-manager:v3.3.0 - docker.io/kubesphere/kubectl:v1.20.0 + - docker.io/kubesphere/kubectl:v1.21.0 - docker.io/kubesphere/kubectl:v1.22.0 - docker.io/kubesphere/kubefed:v0.8.1 - docker.io/kubesphere/tower:v0.2.0 @@ -349,7 +312,7 @@ In KubeKey v2.1.0, we bring in concepts of manifest and artifact, which provides 2. Run the following command to create a configuration file for the air-gapped cluster: ```bash - ./kk create config --with-kubesphere v3.2.1 --with-kubernetes v1.21.5 -f config-sample.yaml + ./kk create config --with-kubesphere v3.3.0 --with-kubernetes v1.21.5 -f config-sample.yaml ``` 3. Run the following command to modify the configuration file: 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 bbb947b5a..509a36b20 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.0, see | KubeSphere version | Supported Kubernetes versions | | ------------------ | ------------------------------------------------------------ | -| v3.3.0 | v1.19.x or above | +| v3.3.0 | v1.19.x, v1.20.x, v1.21.x, v1.22.x, 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 v3.3.0. If you want to [install KubeSphere 3.3.0 on an existing Kubernetes cluster](../../../installing-on-kubernetes/introduction/overview/), your Kubernetes version must be v1.19.x or above. +- The Kubernetes versions that can be installed using KubeKey are different from the Kubernetes versions supported by KubeSphere v3.3.0. If you want to [install KubeSphere 3.3.0 on an existing Kubernetes cluster](../../../installing-on-kubernetes/introduction/overview/), your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). {{}} \ 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 acd9ffdd2..fbc32b6e5 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.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: 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). - 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 e845d31b8..f4572023b 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.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: 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). - 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 7f0376d8b..49bd7822b 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.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: 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). - 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 ff859c0a6..afdf15e35 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.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). + - Recommended Kubernetes versions for KubeSphere 3.3.0: 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). - 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 a816885a6..211b975d5 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.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). + - Recommended Kubernetes versions for KubeSphere 3.3.0: 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). - 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 20b1a79df..4f347b9aa 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.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). + - Recommended Kubernetes versions for KubeSphere 3.3.0: 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). - 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 8a67113f7..555ef8128 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.2.1) of KubeKey. You can chan {{< notice note >}} -- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.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.0: 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). - 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 2cf8b42e6..2b8ee8c0a 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.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.23.7 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: 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). - 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/introduction/what's-new-in-3.3.0.md b/content/en/docs/v3.3/introduction/what's-new-in-3.3.0.md index ed29ef1fa..01855885e 100644 --- a/content/en/docs/v3.3/introduction/what's-new-in-3.3.0.md +++ b/content/en/docs/v3.3/introduction/what's-new-in-3.3.0.md @@ -8,6 +8,6 @@ weight: 1400 In June 2022, KubeSphere 3.3.0 has been released with more exciting features. This release introduces GitOps-based continuous deployment and supports Git-based code repository management to further optimize the DevOps feature. Moreover, it also provides enhanced features of storage, multi-tenancy, multi-cluster, observability, app store, service mesh, and edge computing, to further perfect the interactive design for better user experience. -If you want to know details about new feature of KubeSphere 3.3.0, you can read the article [KubeSphere 3.3.0: Embrace GitOps](../../../blogs/kubesphere-3.3.0-ga-announcement/). +If you want to know details about new feature of KubeSphere 3.3.0, you can read the article [KubeSphere 3.3.0: Embrace GitOps](https://kubesphere.com.cn/news/kubesphere-3.3.0-ga-announcement/). -In addition to the above highlights, this release also features other functionality upgrades and fixes the known bugs. There were some deprecated or removed features in 3.3.0. For more and detailed information, see the [KubeSphere 3.3.0 Release Notes](../../release/release-v330/). \ No newline at end of file +In addition to the above highlights, this release also features other functionality upgrades and fixes the known bugs. There were some deprecated or removed features in 3.3.0. For more and detailed information, see the [Release Notes for 3.3.0](../../../v3.3/release/release-v330/). \ No newline at end of file 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 789708b5b..66ca452e7 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.0: v1.19.x or above. If you do not specify a Kubernetes version, KubeKey installs Kubernetes v1.21.5 by default. For more information about supported Kubernetes versions, see [Support Matrix](../../installing-on-linux/introduction/kubekey/#support-matrix). +- Recommended Kubernetes versions for KubeSphere 3.3.0: v1.19.x, 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.21.5 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/minimal-kubesphere-on-k8s.md b/content/en/docs/v3.3/quick-start/minimal-kubesphere-on-k8s.md index 056b0a907..0933f9d69 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.0 on Kubernetes, your Kubernetes version must be v1.19.x or above. +- To install KubeSphere 3.3.0 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). - 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 11334e7fb..d36cd02ef 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 @@ -11,11 +11,11 @@ ks-installer is recommended for users whose Kubernetes clusters were not set up ## Prerequisites -- You need to have a KubeSphere cluster running v3.1.x. If your KubeSphere version is v3.0.0 or earlier, upgrade to v3.1.x first. -- Read [Release Notes for 3.3.0](../../release/release-v321/) carefully. +- 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.0](../../../v3.3/release/release-v330/) 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.0: v1.19.x or above. +- Supported Kubernetes versions of KubeSphere 3.3.0: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). ## Step 1: Prepare Installation Images 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 5b512c153..d4ef29c73 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,8 +10,8 @@ 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 or above. -- Read [Release Notes for 3.3.0](../../release/release-v321/) carefully. +- Your Kubernetes version must be v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). +- Read [Release Notes for 3.3.0](../../../v3.3/release/release-v330/) carefully. - Back up any important component beforehand. - A Docker registry. You need to have a Harbor or other Docker registries. - Make sure every node can push and pull images from the Docker Registry. @@ -113,7 +113,7 @@ As you install KubeSphere and Kubernetes on Linux, you need to prepare an image {{< notice note >}} - - You can change the Kubernetes version downloaded based on your needs. Recommended Kubernetes versions for KubeSphere 3.3.0 are v1.19.x or above. If you do not specify a Kubernetes version, KubeKey will install Kubernetes v1.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.0 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 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. @@ -224,7 +224,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. +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). ### Air-gapped upgrade for multi-node clusters @@ -308,4 +308,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. +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). diff --git a/content/en/docs/v3.3/upgrade/overview.md b/content/en/docs/v3.3/upgrade/overview.md index 1ae199818..da69b1efa 100644 --- a/content/en/docs/v3.3/upgrade/overview.md +++ b/content/en/docs/v3.3/upgrade/overview.md @@ -8,9 +8,9 @@ weight: 7100 ## Make Your Upgrade Plan -KubeSphere 3.3.0 is compatible with Kubernetes 1.19.x, 1.20.x, 1.21.x, 1.22.x, and 1.23.x: +KubeSphere 3.3.0 is compatible with Kubernetes 1.19.x, 1.20.x, 1.21.x, 1.22.x, and 1.23.x (experimental support): -- Before you upgrade your cluster to KubeSphere 3.3.0, you need to have a KubeSphere cluster running v3.1.x. +- Before you upgrade your cluster to KubeSphere 3.3.0, you need to have a KubeSphere cluster running v3.2.x. - If your existing KubeSphere v3.1.x cluster is installed on Kubernetes 1.19.x+, you can choose to only upgrade KubeSphere to 3.3.0 or upgrade Kubernetes (to a higher version) and KubeSphere (to 3.3.0) at the same time. ## Before the Upgrade 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 851b8c874..0517f9148 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 @@ -10,17 +10,17 @@ ks-installer is recommended for users whose Kubernetes clusters were not set up ## Prerequisites -- You need to have a KubeSphere cluster running v3.2.x. If your KubeSphere version is v3.0.0 or earlier, upgrade to v3.2.x first. -- Read [Release Notes for 3.3.0](../../release/release-v321/) carefully. +- 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.0](../../../v3.3/release/release-v330/) carefully. - Back up any important component beforehand. -- Supported Kubernetes versions of KubeSphere 3.3.0: v1.19.x or above. +- Supported Kubernetes versions of KubeSphere 3.3.0: v1.19.x, v1.20.x, v1.21.x, v1.22.x, and v1.23.x (experimental support). ## Apply ks-installer Run the following command to upgrade your cluster. ```bash -kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.3.0/kubesphere-installer.yaml +kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.3.0/kubesphere-installer.yaml --force ``` ## Enable Pluggable Components 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 ca556af54..46c639ca4 100644 --- a/content/en/docs/v3.3/upgrade/upgrade-with-kubekey.md +++ b/content/en/docs/v3.3/upgrade/upgrade-with-kubekey.md @@ -11,8 +11,8 @@ This tutorial demonstrates how to upgrade your cluster using KubeKey. ## Prerequisites -- You need to have a KubeSphere cluster running v3.1.x. If your KubeSphere version is v3.0.0 or earlier, upgrade to v3.1.x first. -- Read [Release Notes for 3.3.0](../../release/release-v321/) carefully. +- 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.0](../../../v3.3/release/release-v330/) carefully. - Back up any important component beforehand. - Make your upgrade plan. Two scenarios are provided in this document for [all-in-one clusters](#all-in-one-cluster) and [multi-node clusters](#multi-node-cluster) respectively. @@ -86,7 +86,7 @@ Run the following command to use KubeKey to upgrade your single-node cluster to ./kk upgrade --with-kubernetes v1.21.5 --with-kubesphere v3.3.0 ``` -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. +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). ### Multi-node cluster @@ -126,7 +126,7 @@ The following command upgrades your cluster to KubeSphere 3.3.0 and Kubernetes v ./kk upgrade --with-kubernetes v1.21.5 --with-kubesphere v3.3.0 -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. +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). {{< notice note >}} diff --git a/content/en/docs/v3.3/upgrade/what-changed.md b/content/en/docs/v3.3/upgrade/what-changed.md index 62765be7d..a3c693036 100644 --- a/content/en/docs/v3.3/upgrade/what-changed.md +++ b/content/en/docs/v3.3/upgrade/what-changed.md @@ -7,9 +7,6 @@ linkTitle: "Changes after Upgrade" weight: 7600 --- -This section covers the changes after upgrade for existing settings in previous versions. If you want to know all the new features and enhancements in KubeSphere 3.3.0, see [Release Notes for 3.3.0](../../release/release-v321/). +This section covers the changes after upgrade for existing settings in previous versions. If you want to know all the new features and enhancements in KubeSphere 3.3.0, see [Release Notes for 3.3.0](../../../v3.3/release/release-v330/). -## Access Control - -The definition of custom roles has been simplified. Some closely-related permission items have been aggregated into permission groups. Custom roles will not change during the upgrade and can be used directly after the upgrade if they conform to new policy rules for authorization assignment. Otherwise, you need to modify them manually by adding authorization to these roles. 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 84721453a..f4086dc5e 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.0 推荐的 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x 、v1.22.x 和 v1.23.x。 +这些 Kubernetes 集群可以被托管至不同的云厂商，也可以使用不同的 Kubernetes 版本。针对 KubeSphere 3.3.0 推荐的 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 618178b2a..2f0e87033 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.0 默认支持的 Kubernetes 版本为 v1.19.x, v1.20.x, v1.21.x, v1.22.x 和 v1.23.x，选择支持的版本创建集群； +- KubeSphere 3.3.0 默认支持的 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 fd0b9eda2..1dcbb43b2 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.0 默认支持的 Kubernetes 版本为 v1.19.x, v1.20.x, v1.21.x, v1.22.x 和 v1.23.x，选择支持的版本创建集群； +- KubeSphere 3.3.0 默认支持的 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 22f9979f5..38ac4ee86 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.0，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3.0，您的 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 f2212d22b..08a6b55b7 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.0，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3.0，您的 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 a89c06525..0561335e4 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.0，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3.0，您的 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 0d8bfbfdf..dfb43185d 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.0，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3.0，您的 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 1a189225e..572b40240 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.0，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3.0，您的 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 7bbef0283..b7eada26e 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.0，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3.0，您的 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-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped.md b/content/zh/docs/v3.3/installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped.md index 934be6afb..17ce8637c 100644 --- a/content/zh/docs/v3.3/installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped.md +++ b/content/zh/docs/v3.3/installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped.md @@ -245,25 +245,28 @@ https://kubesphere.io 20xx-xx-xx xx:xx:xx ```txt ##k8s-images -kubesphere/kube-apiserver:v1.22.1 -kubesphere/kube-controller-manager:v1.22.1 -kubesphere/kube-proxy:v1.22.1 -kubesphere/kube-scheduler:v1.22.1 -kubesphere/kube-apiserver:v1.21.5 -kubesphere/kube-controller-manager:v1.21.5 -kubesphere/kube-proxy:v1.21.5 -kubesphere/kube-scheduler:v1.21.5 -kubesphere/kube-apiserver:v1.20.10 -kubesphere/kube-controller-manager:v1.20.10 -kubesphere/kube-proxy:v1.20.10 -kubesphere/kube-scheduler:v1.20.10 -kubesphere/kube-apiserver:v1.19.9 -kubesphere/kube-controller-manager:v1.19.9 -kubesphere/kube-proxy:v1.19.9 -kubesphere/kube-scheduler:v1.19.9 +kubesphere/kube-apiserver:v1.23.7 +kubesphere/kube-controller-manager:v1.23.7 +kubesphere/kube-proxy:v1.23.7 +kubesphere/kube-scheduler:v1.23.7 +kubesphere/kube-apiserver:v1.24.1 +kubesphere/kube-controller-manager:v1.24.1 +kubesphere/kube-proxy:v1.24.1 +kubesphere/kube-scheduler:v1.24.1 +kubesphere/kube-apiserver:v1.22.10 +kubesphere/kube-controller-manager:v1.22.10 +kubesphere/kube-proxy:v1.22.10 +kubesphere/kube-scheduler:v1.22.10 +kubesphere/kube-apiserver:v1.21.13 +kubesphere/kube-controller-manager:v1.21.13 +kubesphere/kube-proxy:v1.21.13 +kubesphere/kube-scheduler:v1.21.13 +kubesphere/pause:3.7 +kubesphere/pause:3.6 kubesphere/pause:3.5 kubesphere/pause:3.4.1 coredns/coredns:1.8.0 +coredns/coredns:1.8.6 calico/cni:v3.20.0 calico/kube-controllers:v3.20.0 calico/node:v3.20.0 @@ -272,19 +275,23 @@ calico/typha:v3.20.0 kubesphere/flannel:v0.12.0 openebs/provisioner-localpv:2.10.1 openebs/linux-utils:2.10.0 +library/haproxy:2.3 +kubesphere/nfs-subdir-external-provisioner:v4.0.2 kubesphere/k8s-dns-node-cache:1.15.12 ##kubesphere-images kubesphere/ks-installer:v3.3.0 kubesphere/ks-apiserver:v3.3.0 kubesphere/ks-console:v3.3.0 kubesphere/ks-controller-manager:v3.3.0 +kubesphere/kubectl:v1.22.0 +kubesphere/kubectl:v1.21.0 kubesphere/kubectl:v1.20.0 kubesphere/kubefed:v0.8.1 kubesphere/tower:v0.2.0 minio/minio:RELEASE.2019-08-07T01-59-21Z minio/mc:RELEASE.2019-08-07T23-14-43Z csiplugin/snapshot-controller:v4.0.0 -kubesphere/nginx-ingress-controller:v0.48.1 +kubesphere/nginx-ingress-controller:v1.1.0 mirrorgooglecontainers/defaultbackend-amd64:1.4 kubesphere/metrics-server:v0.4.2 redis:5.0.14-alpine @@ -293,32 +300,38 @@ alpine:3.14 osixia/openldap:1.3.0 kubesphere/netshoot:v1.0 ##kubeedge-images -kubeedge/cloudcore:v1.7.2 -kubesphere/edge-watcher:v0.1.1 -kubesphere/edge-watcher-agent:v0.1.0 +kubeedge/cloudcore:v1.9.2 +kubeedge/iptables-manager:v1.9.2 +kubesphere/edgeservice:v0.2.0 ##gatekeeper-images openpolicyagent/gatekeeper:v3.5.2 ##openpitrix-images -kubesphere/openpitrix-jobs:v3.3.0 +kubesphere/openpitrix-jobs:v3.2.1 ##kubesphere-devops-images kubesphere/devops-apiserver:v3.3.0 kubesphere/devops-controller:v3.3.0 kubesphere/devops-tools:v3.3.0 -kubesphere/ks-jenkins:v3.2.0-2.249.1 -jenkins/jnlp-slave:3.27-1 -kubesphere/builder-base:v3.2.0 +kubesphere/ks-jenkins:v3.3.0-2.319.1 +jenkins/inbound-agent:4.10-2 +kubesphere/builder-base:v3.2.2 kubesphere/builder-nodejs:v3.2.0 kubesphere/builder-maven:v3.2.0 +kubesphere/builder-maven:v3.2.1-jdk11 kubesphere/builder-python:v3.2.0 kubesphere/builder-go:v3.2.0 -kubesphere/builder-go:v3.2.0 -kubesphere/builder-base:v3.2.0-podman +kubesphere/builder-go:v3.2.2-1.16 +kubesphere/builder-go:v3.2.2-1.17 +kubesphere/builder-go:v3.2.2-1.18 +kubesphere/builder-base:v3.2.2-podman kubesphere/builder-nodejs:v3.2.0-podman kubesphere/builder-maven:v3.2.0-podman +kubesphere/builder-maven:v3.2.1-jdk11-podman kubesphere/builder-python:v3.2.0-podman kubesphere/builder-go:v3.2.0-podman -kubesphere/builder-go:v3.2.0-podman -kubesphere/s2ioperator:v3.2.0 +kubesphere/builder-go:v3.2.2-1.16-podman +kubesphere/builder-go:v3.2.2-1.17-podman +kubesphere/builder-go:v3.2.2-1.18-podman +kubesphere/s2ioperator:v3.2.1 kubesphere/s2irun:v3.2.0 kubesphere/s2i-binary:v3.2.0 kubesphere/tomcat85-java11-centos7:v3.2.0 @@ -336,33 +349,36 @@ kubesphere/python-36-centos7:v3.2.0 kubesphere/python-35-centos7:v3.2.0 kubesphere/python-34-centos7:v3.2.0 kubesphere/python-27-centos7:v3.2.0 +quay.io/argoproj/argocd:v2.3.3 +quay.io/argoproj/argocd-applicationset:v0.4.1 +ghcr.io/dexidp/dex:v2.30.2 +redis:6.2.6-alpine ##kubesphere-monitoring-images -jimmidyson/configmap-reload:v0.3.0 -prom/prometheus:v2.26.0 -kubesphere/prometheus-config-reloader:v0.43.2 -kubesphere/prometheus-operator:v0.43.2 -kubesphere/kube-rbac-proxy:v0.8.0 -kubesphere/kube-state-metrics:v1.9.7 -prom/node-exporter:v0.18.1 -kubesphere/k8s-prometheus-adapter-amd64:v0.6.0 -prom/alertmanager:v0.21.0 -thanosio/thanos:v0.18.0 -grafana/grafana:7.4.3 +jimmidyson/configmap-reload:v0.5.0 +prom/prometheus:v2.34.0 +kubesphere/prometheus-config-reloader:v0.55.1 +kubesphere/prometheus-operator:v0.55.1 +kubesphere/kube-rbac-proxy:v0.11.0 +kubesphere/kube-state-metrics:v2.3.0 +prom/node-exporter:v1.3.1 +prom/alertmanager:v0.23.0 +thanosio/thanos:v0.25.2 +grafana/grafana:8.3.3 kubesphere/kube-rbac-proxy:v0.8.0 kubesphere/notification-manager-operator:v1.4.0 kubesphere/notification-manager:v1.4.0 kubesphere/notification-tenant-sidecar:v3.2.0 ##kubesphere-logging-images kubesphere/elasticsearch-curator:v5.7.6 -kubesphere/elasticsearch-oss:6.7.0-1 -kubesphere/fluentbit-operator:v0.11.0 +kubesphere/elasticsearch-oss:6.8.22 +kubesphere/fluentbit-operator:v0.13.0 docker:19.03 -kubesphere/fluent-bit:v1.8.3 +kubesphere/fluent-bit:v1.8.11 kubesphere/log-sidecar-injector:1.1 elastic/filebeat:6.7.0 -kubesphere/kube-events-operator:v0.3.0 -kubesphere/kube-events-exporter:v0.3.0 -kubesphere/kube-events-ruler:v0.3.0 +kubesphere/kube-events-operator:v0.4.0 +kubesphere/kube-events-exporter:v0.4.0 +kubesphere/kube-events-ruler:v0.4.0 kubesphere/kube-auditing-operator:v0.2.0 kubesphere/kube-auditing-webhook:v0.2.0 ##istio-images 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 603aac80a..f1ed27edb 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.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 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 2a7717077..bd1aa08a2 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.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 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 d16bbf866..bf840aa5d 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.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您没有在本步骤的命令中添加标志 `--with-kubesphere`，那么除非您使用配置文件中的 `addons` 字段进行安装，或者稍后使用 `./kk create cluster` 时再添加该标志，否则 KubeSphere 将不会被部署。 - 如果您添加标志 `--with-kubesphere` 时未指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 diff --git a/content/zh/docs/v3.3/installing-on-linux/introduction/air-gapped-installation.md b/content/zh/docs/v3.3/installing-on-linux/introduction/air-gapped-installation.md index 0d59c25dd..8c8d3ec7c 100644 --- a/content/zh/docs/v3.3/installing-on-linux/introduction/air-gapped-installation.md +++ b/content/zh/docs/v3.3/installing-on-linux/introduction/air-gapped-installation.md @@ -96,31 +96,9 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 iso: localPath: url: https://github.com/kubesphere/kubekey/releases/download/v2.2.1/ubuntu-20.04-debs-amd64.iso - - arch: amd64 - type: linux - id: ubuntu - version: "18.04" - repository: - iso: - localPath: - url: https://github.com/kubesphere/kubekey/releases/download/v2.2.1/ubuntu-18.04-debs-amd64.iso - - arch: amd64 - type: linux - id: ubuntu - version: "16.04" - repository: - iso: - localPath: - url: https://github.com/kubesphere/kubekey/releases/download/v2.2.1/ubuntu-16.04-debs-amd64.iso kubernetesDistributions: - type: kubernetes - version: v1.22.1 - - type: kubernetes - version: v1.21.5 - - type: kubernetes - version: v1.20.10 - - type: kubernetes - version: v1.19.9 + version: v1.22.10 components: helm: version: v3.6.3 @@ -143,157 +121,142 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 docker-compose: version: v2.2.2 images: - - docker.io/kubesphere/kube-apiserver:v1.23.7 - - docker.io/kubesphere/kube-controller-manager:v1.23.7 - - docker.io/kubesphere/kube-proxy:v1.23.7 - - docker.io/kubesphere/kube-scheduler:v1.23.7 - - docker.io/kubesphere/kube-apiserver:v1.24.1 - - docker.io/kubesphere/kube-controller-manager:v1.24.1 - - docker.io/kubesphere/kube-proxy:v1.24.1 - - docker.io/kubesphere/kube-scheduler:v1.24.1 - - docker.io/kubesphere/kube-apiserver:v1.22.10 - - docker.io/kubesphere/kube-controller-manager:v1.22.10 - - docker.io/kubesphere/kube-proxy:v1.22.10 - - docker.io/kubesphere/kube-scheduler:v1.22.10 - - docker.io/kubesphere/kube-apiserver:v1.21.13 - - docker.io/kubesphere/kube-controller-manager:v1.21.13 - - docker.io/kubesphere/kube-proxy:v1.21.13 - - docker.io/kubesphere/kube-scheduler:v1.21.13 - - docker.io/kubesphere/pause:3.7 - - docker.io/kubesphere/pause:3.6 - - docker.io/kubesphere/pause:3.5 - - docker.io/kubesphere/pause:3.4.1 - - docker.io/coredns/coredns:1.8.0 - - docker.io/coredns/coredns:1.8.6 - - docker.io/calico/cni:v3.20.0 - - docker.io/calico/kube-controllers:v3.20.0 - - docker.io/calico/node:v3.20.0 - - docker.io/calico/pod2daemon-flexvol:v3.20.0 - - docker.io/calico/typha:v3.20.0 - - docker.io/kubesphere/flannel:v0.12.0 - - docker.io/openebs/provisioner-localpv:2.10.1 - - docker.io/openebs/linux-utils:2.10.0 - - docker.io/library/haproxy:2.3 - - docker.io/kubesphere/nfs-subdir-external-provisioner:v4.0.2 - - docker.io/kubesphere/k8s-dns-node-cache:1.15.12 - - docker.io/kubesphere/ks-installer:v3.3.0 - - docker.io/kubesphere/ks-apiserver:v3.3.0 - - docker.io/kubesphere/ks-console:v3.3.0 - - docker.io/kubesphere/ks-controller-manager:v3.3.0 - - docker.io/kubesphere/kubectl:v1.20.0 - - docker.io/kubesphere/kubectl:v1.22.0 - - docker.io/kubesphere/kubefed:v0.8.1 - - docker.io/kubesphere/tower:v0.2.0 - - docker.io/minio/minio:RELEASE.2019-08-07T01-59-21Z - - docker.io/minio/mc:RELEASE.2019-08-07T23-14-43Z - - docker.io/csiplugin/snapshot-controller:v4.0.0 - - docker.io/kubesphere/nginx-ingress-controller:v1.1.0 - - docker.io/mirrorgooglecontainers/defaultbackend-amd64:1.4 - - docker.io/kubesphere/metrics-server:v0.4.2 - - docker.io/library/redis:5.0.14-alpine - - docker.io/library/haproxy:2.0.25-alpine - - docker.io/library/alpine:3.14 - - docker.io/osixia/openldap:1.3.0 - - docker.io/kubesphere/netshoot:v1.0 - - docker.io/kubeedge/cloudcore:v1.9.2 - - docker.io/kubeedge/iptables-manager:v1.9.2 - - docker.io/kubesphere/edgeservice:v0.2.0 - - docker.io/kubesphere/openpitrix-jobs:v3.2.1 - - docker.io/kubesphere/devops-apiserver:v3.3.0 - - docker.io/kubesphere/devops-controller:v3.3.0 - - docker.io/kubesphere/devops-tools:v3.3.0 - - docker.io/kubesphere/ks-jenkins:v3.3.0-2.319.1 - - docker.io/jenkins/inbound-agent:4.10-2 - - docker.io/kubesphere/builder-base:v3.2.2 - - docker.io/kubesphere/builder-nodejs:v3.2.0 - - docker.io/kubesphere/builder-maven:v3.2.0 - - docker.io/kubesphere/builder-maven:v3.2.1-jdk11 - - docker.io/kubesphere/builder-python:v3.2.0 - - docker.io/kubesphere/builder-go:v3.2.0 - - docker.io/kubesphere/builder-go:v3.2.2-1.16 - - docker.io/kubesphere/builder-go:v3.2.2-1.17 - - docker.io/kubesphere/builder-go:v3.2.2-1.18 - - docker.io/kubesphere/builder-base:v3.2.2-podman - - docker.io/kubesphere/builder-nodejs:v3.2.0-podman - - docker.io/kubesphere/builder-maven:v3.2.0-podman - - docker.io/kubesphere/builder-maven:v3.2.1-jdk11-podman - - docker.io/kubesphere/builder-python:v3.2.0-podman - - docker.io/kubesphere/builder-go:v3.2.0-podman - - docker.io/kubesphere/builder-go:v3.2.2-1.16-podman - - docker.io/kubesphere/builder-go:v3.2.2-1.17-podman - - docker.io/kubesphere/builder-go:v3.2.2-1.18-podman - - docker.io/kubesphere/s2ioperator:v3.2.1 - - docker.io/kubesphere/s2irun:v3.2.0 - - docker.io/kubesphere/s2i-binary:v3.2.0 - - docker.io/kubesphere/tomcat85-java11-centos7:v3.2.0 - - docker.io/kubesphere/tomcat85-java11-runtime:v3.2.0 - - docker.io/kubesphere/tomcat85-java8-centos7:v3.2.0 - - docker.io/kubesphere/tomcat85-java8-runtime:v3.2.0 - - docker.io/kubesphere/java-11-centos7:v3.2.0 - - docker.io/kubesphere/java-8-centos7:v3.2.0 - - docker.io/kubesphere/java-8-runtime:v3.2.0 - - docker.io/kubesphere/java-11-runtime:v3.2.0 - - docker.io/kubesphere/nodejs-8-centos7:v3.2.0 - - docker.io/kubesphere/nodejs-6-centos7:v3.2.0 - - docker.io/kubesphere/nodejs-4-centos7:v3.2.0 - - docker.io/kubesphere/python-36-centos7:v3.2.0 - - docker.io/kubesphere/python-35-centos7:v3.2.0 - - docker.io/kubesphere/python-34-centos7:v3.2.0 - - docker.io/kubesphere/python-27-centos7:v3.2.0 - - quay.io/argoproj/argocd:v2.3.3 - - quay.io/argoproj/argocd-applicationset:v0.4.1 - - ghcr.io/dexidp/dex:v2.30.2 - - docker.io/library/redis:6.2.6-alpine - - docker.io/jimmidyson/configmap-reload:v0.5.0 - - docker.io/prom/prometheus:v2.34.0 - - docker.io/kubesphere/prometheus-config-reloader:v0.55.1 - - docker.io/kubesphere/prometheus-operator:v0.55.1 - - docker.io/kubesphere/kube-rbac-proxy:v0.11.0 - - docker.io/kubesphere/kube-state-metrics:v2.3.0 - - docker.io/prom/node-exporter:v1.3.1 - - docker.io/prom/alertmanager:v0.23.0 - - docker.io/thanosio/thanos:v0.25.2 - - docker.io/grafana/grafana:8.3.3 - - docker.io/kubesphere/kube-rbac-proxy:v0.8.0 - - docker.io/kubesphere/notification-manager-operator:v1.4.0 - - docker.io/kubesphere/notification-manager:v1.4.0 - - docker.io/kubesphere/notification-tenant-sidecar:v3.2.0 - - docker.io/kubesphere/elasticsearch-curator:v5.7.6 - - docker.io/kubesphere/elasticsearch-oss:6.8.22 - - docker.io/kubesphere/fluentbit-operator:v0.13.0 - - docker.io/library/docker:19.03 - - docker.io/kubesphere/fluent-bit:v1.8.11 - - docker.io/kubesphere/log-sidecar-injector:1.1 - - docker.io/elastic/filebeat:6.7.0 - - docker.io/kubesphere/kube-events-operator:v0.4.0 - - docker.io/kubesphere/kube-events-exporter:v0.4.0 - - docker.io/kubesphere/kube-events-ruler:v0.4.0 - - docker.io/kubesphere/kube-auditing-operator:v0.2.0 - - docker.io/kubesphere/kube-auditing-webhook:v0.2.0 - - docker.io/istio/pilot:1.11.1 - - docker.io/istio/proxyv2:1.11.1 - - docker.io/jaegertracing/jaeger-operator:1.27 - - docker.io/jaegertracing/jaeger-agent:1.27 - - docker.io/jaegertracing/jaeger-collector:1.27 - - docker.io/jaegertracing/jaeger-query:1.27 - - docker.io/jaegertracing/jaeger-es-index-cleaner:1.27 - - docker.io/kubesphere/kiali-operator:v1.38.1 - - docker.io/kubesphere/kiali:v1.38 - - docker.io/library/busybox:1.31.1 - - docker.io/library/nginx:1.14-alpine - - docker.io/joosthofman/wget:1.0 - - docker.io/nginxdemos/hello:plain-text - - docker.io/library/wordpress:4.8-apache - - docker.io/mirrorgooglecontainers/hpa-example:latest - - docker.io/library/java:openjdk-8-jre-alpine - - docker.io/fluent/fluentd:v1.4.2-2.0 - - docker.io/library/perl:latest - - docker.io/kubesphere/examples-bookinfo-productpage-v1:1.16.2 - - docker.io/kubesphere/examples-bookinfo-reviews-v1:1.16.2 - - docker.io/kubesphere/examples-bookinfo-reviews-v2:1.16.2 - - docker.io/kubesphere/examples-bookinfo-details-v1:1.16.2 - - docker.io/kubesphere/examples-bookinfo-ratings-v1:1.16.3 - - docker.io/weaveworks/scope:1.13.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-apiserver:v1.22.10 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-controller-manager:v1.22.10 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-proxy:v1.22.10 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-scheduler:v1.22.10 + - registry.cn-beijing.aliyuncs.com/kubesphereio/pause:3.5 + - registry.cn-beijing.aliyuncs.com/kubesphereio/coredns:1.8.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/cni:v3.20.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-controllers:v3.20.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/node:v3.20.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/pod2daemon-flexvol:v3.20.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/typha:v3.20.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/flannel:v0.12.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/provisioner-localpv:2.10.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/linux-utils:2.10.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/haproxy:2.3 + - registry.cn-beijing.aliyuncs.com/kubesphereio/nfs-subdir-external-provisioner:v4.0.2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/k8s-dns-node-cache:1.15.12 + - registry.cn-beijing.aliyuncs.com/kubesphereio/ks-installer:v3.3.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/ks-apiserver:v3.3.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/ks-console:v3.3.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/ks-controller-manager:v3.3.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kubectl:v1.20.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kubectl:v1.21.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kubectl:v1.22.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kubefed:v0.8.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/tower:v0.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/minio:RELEASE.2019-08-07T01-59-21Z + - registry.cn-beijing.aliyuncs.com/kubesphereio/mc:RELEASE.2019-08-07T23-14-43Z + - registry.cn-beijing.aliyuncs.com/kubesphereio/snapshot-controller:v4.0.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/nginx-ingress-controller:v1.1.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/defaultbackend-amd64:1.4 + - registry.cn-beijing.aliyuncs.com/kubesphereio/metrics-server:v0.4.2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/redis:5.0.14-alpine + - registry.cn-beijing.aliyuncs.com/kubesphereio/haproxy:2.0.25-alpine + - registry.cn-beijing.aliyuncs.com/kubesphereio/alpine:3.14 + - registry.cn-beijing.aliyuncs.com/kubesphereio/openldap:1.3.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/netshoot:v1.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/cloudcore:v1.9.2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/iptables-manager:v1.9.2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/edgeservice:v0.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/openpitrix-jobs:v3.2.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/devops-apiserver:v3.3.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/devops-controller:v3.3.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/devops-tools:v3.3.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/ks-jenkins:v3.3.0-2.319.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/inbound-agent:4.10-2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-base:v3.2.2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-nodejs:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-maven:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-maven:v3.2.1-jdk11 + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-python:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-go:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-go:v3.2.2-1.16 + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-go:v3.2.2-1.17 + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-go:v3.2.2-1.18 + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-base:v3.2.2-podman + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-nodejs:v3.2.0-podman + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-maven:v3.2.0-podman + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-maven:v3.2.1-jdk11-podman + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-python:v3.2.0-podman + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-go:v3.2.0-podman + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-go:v3.2.2-1.16-podman + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-go:v3.2.2-1.17-podman + - registry.cn-beijing.aliyuncs.com/kubesphereio/builder-go:v3.2.2-1.18-podman + - registry.cn-beijing.aliyuncs.com/kubesphereio/s2ioperator:v3.2.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/s2irun:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/s2i-binary:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/tomcat85-java11-centos7:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/tomcat85-java11-runtime:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/tomcat85-java8-centos7:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/tomcat85-java8-runtime:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/java-11-centos7:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/java-8-centos7:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/java-8-runtime:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/java-11-runtime:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/nodejs-8-centos7:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/nodejs-6-centos7:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/nodejs-4-centos7:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/python-36-centos7:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/python-35-centos7:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/python-34-centos7:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/python-27-centos7:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/argocd:v2.3.3 + - registry.cn-beijing.aliyuncs.com/kubesphereio/argocd-applicationset:v0.4.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/dex:v2.30.2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/redis:6.2.6-alpine + - registry.cn-beijing.aliyuncs.com/kubesphereio/configmap-reload:v0.5.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/prometheus:v2.34.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/prometheus-config-reloader:v0.55.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/prometheus-operator:v0.55.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-rbac-proxy:v0.11.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-state-metrics:v2.3.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/node-exporter:v1.3.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/alertmanager:v0.23.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/thanos:v0.25.2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/grafana:8.3.3 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-rbac-proxy:v0.8.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/notification-manager-operator:v1.4.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/notification-manager:v1.4.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/notification-tenant-sidecar:v3.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/elasticsearch-curator:v5.7.6 + - registry.cn-beijing.aliyuncs.com/kubesphereio/elasticsearch-oss:6.8.22 + - registry.cn-beijing.aliyuncs.com/kubesphereio/fluentbit-operator:v0.13.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/docker:19.03 + - registry.cn-beijing.aliyuncs.com/kubesphereio/fluent-bit:v1.8.11 + - registry.cn-beijing.aliyuncs.com/kubesphereio/log-sidecar-injector:1.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/filebeat:6.7.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-events-operator:v0.4.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-events-exporter:v0.4.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-events-ruler:v0.4.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-auditing-operator:v0.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kube-auditing-webhook:v0.2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/pilot:1.11.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/proxyv2:1.11.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/jaeger-operator:1.27 + - registry.cn-beijing.aliyuncs.com/kubesphereio/jaeger-agent:1.27 + - registry.cn-beijing.aliyuncs.com/kubesphereio/jaeger-collector:1.27 + - registry.cn-beijing.aliyuncs.com/kubesphereio/jaeger-query:1.27 + - registry.cn-beijing.aliyuncs.com/kubesphereio/jaeger-es-index-cleaner:1.27 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kiali-operator:v1.38.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/kiali:v1.38 + - registry.cn-beijing.aliyuncs.com/kubesphereio/busybox:1.31.1 + - registry.cn-beijing.aliyuncs.com/kubesphereio/nginx:1.14-alpine + - registry.cn-beijing.aliyuncs.com/kubesphereio/wget:1.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/hello:plain-text + - registry.cn-beijing.aliyuncs.com/kubesphereio/wordpress:4.8-apache + - registry.cn-beijing.aliyuncs.com/kubesphereio/hpa-example:latest + - registry.cn-beijing.aliyuncs.com/kubesphereio/java:openjdk-8-jre-alpine + - registry.cn-beijing.aliyuncs.com/kubesphereio/fluentd:v1.4.2-2.0 + - registry.cn-beijing.aliyuncs.com/kubesphereio/perl:latest + - registry.cn-beijing.aliyuncs.com/kubesphereio/examples-bookinfo-productpage-v1:1.16.2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/examples-bookinfo-reviews-v1:1.16.2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/examples-bookinfo-reviews-v2:1.16.2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/examples-bookinfo-details-v1:1.16.2 + - registry.cn-beijing.aliyuncs.com/kubesphereio/examples-bookinfo-ratings-v1:1.16.3 + - registry.cn-beijing.aliyuncs.com/kubesphereio/scope:1.13.0 registry: auths: {} ``` @@ -357,7 +320,7 @@ KubeKey v2.1.0 版本新增了清单（manifest）和制品（artifact）的概 2. 执行以下命令创建离线集群配置文件： ```bash - ./kk create config --with-kubesphere v3.2.1 --with-kubernetes v1.21.5 -f config-sample.yaml + ./kk create config --with-kubesphere v3.3.0 --with-kubernetes v1.21.5 -f config-sample.yaml ``` 3. 执行以下命令修改配置文件： 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 5714b71e0..f7b77258e 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,12 +80,12 @@ curl -sfL https://get-kk.kubesphere.io | VERSION=v2.2.1 sh - | KubeSphere 版本 | 受支持的 Kubernetes 版本 | | ------------------ | ------------------------------------------------------------ | -| v3.3.0 | v1.19.x、v1.20.x、v1.21.x、v1.22.x、v1.23.x | +| v3.3.0 | 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 v3.3.0 支持的 Kubernetes 版本不同。如需[在现有 Kubernetes 集群上安装 KubeSphere 3.3.0](../../../installing-on-kubernetes/introduction/overview/)，您的 Kubernetes 版本必须为 v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x。 +- 能使用 KubeKey 安装的 Kubernetes 版本与 KubeSphere v3.3.0 支持的 Kubernetes 版本不同。如需[在现有 Kubernetes 集群上安装 KubeSphere 3.3.0](../../../installing-on-kubernetes/introduction/overview/)，您的 Kubernetes 版本必须为 v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x（实验性支持）。 {{}} \ 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 a84b3d92e..eed80e201 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.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在此步骤的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 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 f1f938bf0..73730ce27 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.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装 KubeSphere，或者在您后续使用 `./kk create cluster` 命令时再次添加该标志。 - 如果您添加标志 `--with-kubesphere` 时不指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 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 bca858008..a851c29b3 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.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 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 173a4053b..5798fcb22 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.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 + - 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在此步骤的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 - 如果您添加标志 `--with-kubesphere` 时不指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 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 e86ace3aa..ca6745dba 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.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 + - 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在此步骤的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 - 如果您添加标志 `--with-kubesphere` 时不指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 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 f56c6622d..32b0000f3 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.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 + - 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在此步骤的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 - 如果您添加标志 `--with-kubesphere` 时不指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 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 599b170a9..3ef226a17 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.2.1 sh - {{< notice note >}} -- KubeSphere 3.3.0 对应 Kubernetes 版本推荐：v1.19.x、v1.20.x、v1.21.x、 v1.22.x 和 v1.23.x。如果未指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关支持的 Kubernetes 版本请参阅[支持矩阵](../../../installing-on-linux/introduction/kubekey/#support-matrix)。 +- KubeSphere 3.3.0 对应 Kubernetes 版本推荐：v1.19.x、v1.20.x、v1.21.x、 v1.22.x 和 v1.23.x（实验性支持）。如果未指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.21.5。有关支持的 Kubernetes 版本请参阅[支持矩阵](../../../installing-on-linux/introduction/kubekey/#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 a31eb4d49..05cb63716 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.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，只能使用配置文件中的 `addons` 字段安装，或者在您后续使用 `./kk create cluster` 命令时再次添加这个标志。 diff --git a/content/zh/docs/v3.3/introduction/what's-new-in-3.3.0.md b/content/zh/docs/v3.3/introduction/what's-new-in-3.3.0.md index c4c384fd2..e58c2160e 100644 --- a/content/zh/docs/v3.3/introduction/what's-new-in-3.3.0.md +++ b/content/zh/docs/v3.3/introduction/what's-new-in-3.3.0.md @@ -8,6 +8,6 @@ weight: 1400 2022 年 6 月 24 日，KubeSphere 3.3.0 正式发布，带来了更多令人期待的功能。新增了基于 GitOps 的持续部署方案，进一步优化了 DevOps 的使用体验。同时还增强了 “多集群管理、多租户管理、可观测性、应用商店、微服务治理、边缘计算、存储” 等特性，更进一步完善交互设计，并全面提升了用户体验。 -关于 3.3.0 新特性的详细解读，可参考博客 [KubeSphere 3.3.0 发布：全面拥抱 GitOps](../../../blogs/kubesphere-3.3.0-ga-announcement/)。 +关于 3.3.0 新特性的详细解读，可参考博客 [KubeSphere 3.3.0 发布：全面拥抱 GitOps](https://kubesphere.com.cn/news/kubesphere-3.3.0-ga-announcement/)。 -关于 3.3.0 的新功能及增强、Bug 修复、重要的技术调整，以及废弃或移除的功能，请参见 3.3.0 的[发行说明](../../release/release-v330/)。 \ No newline at end of file +关于 3.3.0 的新功能及增强、Bug 修复、重要的技术调整，以及废弃或移除的功能，请参见 [3.3.0 版本说明](../../v3.3/release/release-v330/)。 \ No newline at end of file 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 b3601845c..c8e6621b6 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.0 的建议 Kubernetes 版本：1.19.x、1.20.x、1.21.x、v1.22.x 和 v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../installing-on-linux/introduction/kubekey/#支持矩阵)。 +- 安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：1.19.x、1.20.x、1.21.x、v1.22.x 和 v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 一般来说，对于 All-in-One 安装，您无需更改任何配置。 - 如果您在这一步的命令中不添加标志 `--with-kubesphere`，则不会部署 KubeSphere，KubeKey 将只安装 Kubernetes。如果您添加标志 `--with-kubesphere` 时不指定 KubeSphere 版本，则会安装最新版本的 KubeSphere。 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 8a85b51b4..6338cdf0e 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 上安装 KubeSphere 3.3.0，您的 Kubernetes 版本必须为：v1.19.x，v1.20.x，v1.21.x，v1.22.x 或 v1.23.x。 +- 如需在 Kubernetes 上安装 KubeSphere 3.3.0，您的 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 a5bb4721b..4ec946307 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 @@ -12,10 +12,10 @@ weight: 7500 ## 准备工作 - 您需要有一个运行 KubeSphere v3.2.x 的集群。如果您的 KubeSphere 是 v3.1.0 或更早的版本，请先升级至 v3.2.x。 -- 请仔细阅读 [3.3.0 版本说明](../../release/release-v321/)。 +- 请仔细阅读 [3.3.0 版本说明](../../../v3.3/release/release-v330/)。 - 提前备份所有重要的组件。 - Docker 仓库。您需要有一个 Harbor 或其他 Docker 仓库。有关更多信息，请参见[准备一个私有镜像仓库](../../installing-on-linux/introduction/air-gapped-installation/#步骤-2准备一个私有镜像仓库)。 -- KubeSphere 3.3.0 支持的 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、 v1.22.x 和 v1.23.x。 +- KubeSphere 3.3.0 支持的 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、 v1.22.x 和 v1.23.x（实验性支持）。 ## 步骤 1：准备安装镜像 @@ -29,7 +29,7 @@ weight: 7500 {{< notice note >}} - 该文件根据不同的模块列出了 `##+modulename` 下的镜像。您可以按照相同的规则把自己的镜像添加到这个文件中。要查看完整文件，请参见[附录](../../installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped/#kubesphere-v321-镜像清单)。 + 该文件根据不同的模块列出了 `##+modulename` 下的镜像。您可以按照相同的规则把自己的镜像添加到这个文件中。要查看完整文件，请参见[附录](../../installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped/#kubesphere-v330-镜像清单)。 {{}} 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 01e0263aa..d39a07806 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 @@ -11,7 +11,7 @@ weight: 7400 - 您需要有一个运行 KubeSphere v3.2.x 的集群。如果您的 KubeSphere 是 v3.1.0 或更早的版本，请先升级至 v3.2.x。 - 您的 Kubernetes 版本必须为 v1.19.x及以上版本。 -- 请仔细阅读 [3.3.0 版本说明](../../release/release-v321/)。 +- 请仔细阅读 [3.3.0 版本说明](../../../v3.3/release/release-v330/)。 - 提前备份所有重要的组件。 - Docker 仓库。您需要有一个 Harbor 或其他 Docker 仓库。 - 请确保每个节点都可以从该 Docker 仓库拉取镜像或向其推送镜像。 @@ -113,7 +113,7 @@ chmod +x kk {{< notice note >}} - - 您可以根据自己的需求变更下载的 Kubernetes 版本。安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x和v1.23.x。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../installing-on-linux/introduction/kubekey/#支持矩阵)。 + - 您可以根据自己的需求变更下载的 Kubernetes 版本。安装 KubeSphere 3.3.0 的建议 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x和v1.23.x（实验性支持）。如果不指定 Kubernetes 版本，KubeKey 将默认安装 Kubernetes v1.23.7。有关受支持的 Kubernetes 版本的更多信息，请参见[支持矩阵](../../installing-on-linux/introduction/kubekey/#支持矩阵)。 - 您可以通过下载 Kubernetes v1.17.9 二进制文件将 Kubernetes 从 v1.16.13 升级到 v1.17.9。但对于跨多个版本升级，需要事先下载所有中间版本，例如您想将 Kubernetes 从 v1.15.12 升级到 v1.18.6，则需要下载 Kubernetes v1.16.13、v1.17.9 和 v1.18.6 二进制文件。 @@ -224,7 +224,7 @@ chmod +x kk ./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（实验性支持）。 ### 离线升级多节点集群 @@ -308,5 +308,5 @@ chmod +x kk ./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 0b509e5b5..700e19b60 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 @@ -11,16 +11,16 @@ weight: 7300 ## 准备工作 - 您需要有一个运行 KubeSphere v3.2.x 的集群。如果您的 KubeSphere 是 v3.1.0 或更早的版本，请先升级至 v3.2.x。 -- 请仔细阅读 [3.3.0 版本说明](../../release/release-v321/)。 +- 请仔细阅读 [3.3.0 版本说明](../../../v3.3/release/release-v330/)。 - 提前备份所有重要的组件。 -- KubeSphere 3.3.0 支持的 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x。 +- KubeSphere 3.3.0 支持的 Kubernetes 版本：v1.19.x、v1.20.x、v1.21.x、v1.22.x 和 v1.23.x（实验性支持）。 ## 应用 ks-installer 运行以下命令升级集群： ```bash -kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.3.0/kubesphere-installer.yaml +kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.3.0/kubesphere-installer.yaml --force ``` ## 启用可插拔组件 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 d1680ddc0..3611ccc2e 100644 --- a/content/zh/docs/v3.3/upgrade/upgrade-with-kubekey.md +++ b/content/zh/docs/v3.3/upgrade/upgrade-with-kubekey.md @@ -14,7 +14,7 @@ weight: 7200 ## 准备工作 - 您需要有一个运行 KubeSphere v3.2.x 的集群。如果您的 KubeSphere 是 v3.1.0 或更早的版本，请先升级至 v3.2.x。 -- 请仔细阅读 [3.3.0 版本说明](../../release/release-v321/)。 +- 请仔细阅读 [3.3.0 版本说明](../../../v3.3/release/release-v330/)。 - 提前备份所有重要的组件。 - 确定您的升级方案。本文档中提供 [All-in-One 集群](#all-in-one-集群)和[多节点集群](#多节点集群)的两种升级场景。 @@ -87,7 +87,7 @@ chmod +x kk ./kk upgrade --with-kubernetes v1.21.5 --with-kubesphere v3.3.0 ``` -要将 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（实验性支持）。 ### 多节点集群 @@ -128,7 +128,7 @@ chmod +x kk ./kk upgrade --with-kubernetes v1.21.5 --with-kubesphere v3.3.0 -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/content/zh/docs/v3.3/upgrade/what-changed.md b/content/zh/docs/v3.3/upgrade/what-changed.md index e17d6410d..d5ebfe69d 100644 --- a/content/zh/docs/v3.3/upgrade/what-changed.md +++ b/content/zh/docs/v3.3/upgrade/what-changed.md @@ -7,9 +7,6 @@ linkTitle: "升级后的变更" weight: 7600 --- -本文说明先前版本现有设置在升级后的变更。如果您想了解 KubeSphere 3.3.0 的所有新功能和优化，请直接参阅 [3.2.1 发布说明](../../release/release-v321/)。 +本文说明先前版本现有设置在升级后的变更。如果您想了解 KubeSphere 3.3.0 的所有新功能和优化，请直接参阅 [3.3.0 版本说明](../../../v3.3/release/release-v330/)。 -## 访问控制 - -自定义角色的定义得到简化。一些紧密关联的权限项已整合进权限组。自定义角色在升级过程中不会改变，并且如果自定义角色符合权限分配的新策略规则，升级后可以直接使用。否则，您需要手动修改这些角色，为他们添加权限。