From 36e20306247c2b9be2e48bb2db0a45d924ec0b76 Mon Sep 17 00:00:00 2001 From: Sherlock113 Date: Mon, 4 Jan 2021 14:05:22 +0800 Subject: [PATCH] Update minimal installation on k8s Signed-off-by: Sherlock113 --- .../docs/quick-start/all-in-one-on-linux.md | 4 +- .../quick-start/minimal-kubesphere-on-k8s.md | 5 +-- .../docs/quick-start/all-in-one-on-linux.md | 2 +- .../quick-start/minimal-kubesphere-on-k8s.md | 35 +++++++++--------- .../kubesphere-components-zh.png | Bin 5 files changed, 22 insertions(+), 24 deletions(-) rename static/images/docs/{quickstart => zh-cn/quickstart/minimal-kubesphere-on-k8s}/kubesphere-components-zh.png (100%) diff --git a/content/en/docs/quick-start/all-in-one-on-linux.md b/content/en/docs/quick-start/all-in-one-on-linux.md index 33cbe0e28..13ece8f7d 100644 --- a/content/en/docs/quick-start/all-in-one-on-linux.md +++ b/content/en/docs/quick-start/all-in-one-on-linux.md @@ -12,7 +12,7 @@ For those who are new to KubeSphere and looking for a quick way to discover the To get started with all-in-one installation, you only need to prepare one host according to the following requirements for hardware and operating system. -### Hardware recommendation +### Hardware recommendations | System | Minimum Requirements | | ------------------------------------------------------ | ------------------------------------------- | @@ -144,7 +144,7 @@ To create a Kubernetes cluster with KubeSphere installed, refer to the following {{}} -After you execute the command, you will see a table as below for environment check. For details, read [Node requirements](#node-requirements) and [Dependency requirements](#dependency-requirements) above. Input `y` to continue. +After you execute the command, you will see a table as below for environment check. For details, read [Node requirements](#node-requirements) and [Dependency requirements](#dependency-requirements) above. Input `yes` to continue. ![environment-check](/images/docs/quickstart/all-in-one-installation/environment-check.png) diff --git a/content/en/docs/quick-start/minimal-kubesphere-on-k8s.md b/content/en/docs/quick-start/minimal-kubesphere-on-k8s.md index e379e0ca1..79d43a22f 100644 --- a/content/en/docs/quick-start/minimal-kubesphere-on-k8s.md +++ b/content/en/docs/quick-start/minimal-kubesphere-on-k8s.md @@ -2,7 +2,6 @@ title: "Minimal KubeSphere on Kubernetes" keywords: 'KubeSphere, Kubernetes, Minimal, Installation' description: 'Minimal Installation of KubeSphere on Kubernetes' - linkTitle: "Minimal KubeSphere on Kubernetes" weight: 2200 --- @@ -43,7 +42,7 @@ After you make sure your machine meets the prerequisites, you can follow the ste kubectl get svc/ks-console -n kubesphere-system ``` -4. Make sure the port `30880` is opened in your security group and access the web console through the NodePort (`IP:30880`) with the default account and password (`admin/P@88w0rd`). +4. Make sure port `30880` is opened in your security group and access the web console through the NodePort (`IP:30880`) with the default account and password (`admin/P@88w0rd`). 5. After logging in to the console, you can check the status of different components in **Components**. You may need to wait for some components to be up and running if you want to use related services. @@ -53,5 +52,5 @@ After you make sure your machine meets the prerequisites, you can follow the ste The guide above is used only for the minimal installation by default. To enable other components in KubeSphere, see [Enable Pluggable Components](../../pluggable-components/) for more details. -## Demo +## Code Demonstration diff --git a/content/zh/docs/quick-start/all-in-one-on-linux.md b/content/zh/docs/quick-start/all-in-one-on-linux.md index 3f97bf9e2..fcbb94ac8 100644 --- a/content/zh/docs/quick-start/all-in-one-on-linux.md +++ b/content/zh/docs/quick-start/all-in-one-on-linux.md @@ -150,7 +150,7 @@ chmod +x kk {{}} -执行该命令后，您将看到以下表格，用于环境检查。有关详细信息，请参见[节点要求](#节点要求)和[依赖项要求](#依赖项要求)。输入 `y` 继续安装流程。 +执行该命令后，您将看到以下表格，用于环境检查。有关详细信息，请参见[节点要求](#节点要求)和[依赖项要求](#依赖项要求)。输入 `yes` 继续安装流程。 ![environment-check](https://ap3.qingstor.com/kubesphere-website/docs/environment-check.png) diff --git a/content/zh/docs/quick-start/minimal-kubesphere-on-k8s.md b/content/zh/docs/quick-start/minimal-kubesphere-on-k8s.md index 197231a43..304120c09 100644 --- a/content/zh/docs/quick-start/minimal-kubesphere-on-k8s.md +++ b/content/zh/docs/quick-start/minimal-kubesphere-on-k8s.md @@ -1,58 +1,57 @@ --- title: "在 Kubernetes 上最小化安装 KubeSphere" -keywords: 'kubesphere, kubernetes, docker, multi-tenant' +keywords: 'KubeSphere, Kubernetes, 最小化安装' description: '在已有 Kubernetes 集群上安装最小化 KubeSphere' - linkTitle: "在 Kubernetes 上最小化安装 KubeSphere" weight: 2200 --- -除了在 Linux 机器上安装 KubeSphere 之外，您还可以将其直接部署在现有的 Kubernetes 集群上。本快速入门指南将引导您完成在 Kubernetes 上最小化安装 KubeSphere 的一般步骤。有关更多信息，请参阅在 [Kubernetes 上安装 KubeSphere](../../installing-on-kubernetes/)。 +除了在 Linux 机器上安装 KubeSphere 之外，您还可以将其直接部署在现有的 Kubernetes 集群上。本快速入门指南将引导您完成在 Kubernetes 上最小化安装 KubeSphere 的一般性步骤。有关更多信息，请参见[在 Kubernetes 上安装 KubeSphere](../../installing-on-kubernetes/)。 {{< notice note >}} -- Kubernetes 版本必须为 “1.15.x，1.16.x，1.17.x 或 1.18.x”； -- 确保您的计算机满足最低硬件要求：CPU > 1 核，内存 > 2 G； -- 在安装之前，需要配置 Kubernetes 集群中的**默认**存储类； -- 当使用 `--cluster-signing-cert-file` 和 `--cluster-signing-key-file` 参数启动时，在 kube-apiserver 中会激活 CSR 签名功能。请参阅 [RKE 安装问题](https://github.com/kubesphere/kubesphere/issues/1925#issuecomment-591698309)； -- 有关在 Kubernetes 上安装 KubeSphere 的前提条件的详细信息，请参阅[前提条件](../../installing-on-kubernetes/introduction/prerequisites/)。 +- 支持的 Kubernetes 版本：1.15.x、1.16.x、1.17.x 或 1.18.x； +- 确保您的机器满足最低硬件要求：CPU > 1 核，内存 > 2 G； +- 在安装之前，需要配置 Kubernetes 集群中的**默认**存储类型； +- 当使用 `--cluster-signing-cert-file` 和 `--cluster-signing-key-file` 参数启动时，在 `kube-apiserver` 中会激活 CSR 签名功能。请参见 [RKE 安装问题](https://github.com/kubesphere/kubesphere/issues/1925#issuecomment-591698309)； +- 有关在 Kubernetes 上安装 KubeSphere 的准备工作，请参见[准备工作](../../installing-on-kubernetes/introduction/prerequisites/)。 {{}} ## 部署 KubeSphere -确保您的计算机满足前提条件之后，可以按照以下步骤安装 KubeSphere。 +确保您的机器满足安装的前提条件之后，可以按照以下步骤安装 KubeSphere。 -- 在执行命令开始安装之前，请阅读以下注释： +1. 执行以下命令： ```bash kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.0.0/kubesphere-installer.yaml - + kubectl apply -f https://github.com/kubesphere/ks-installer/releases/download/v3.0.0/cluster-configuration.yaml ``` -- 检查安装日志： +2. 检查安装日志： ```bash kubectl logs -n kubesphere-system $(kubectl get pod -n kubesphere-system -l app=ks-install -o jsonpath='{.items[0].metadata.name}') -f ``` -- 使用 `kubectl get pod --all-namespaces` 查看所有 Pod 是否在 KubeSphere 的相关命名空间中正常运行。如果是，请通过以下命令检查控制台的端口（默认为 30880）： +3. 使用 `kubectl get pod --all-namespaces` 查看所有 Pod 是否在 KubeSphere 的相关命名空间中正常运行。如果是，请通过以下命令检查控制台的端口（默认为 `30880`）： ```bash kubectl get svc/ks-console -n kubesphere-system ``` -- 确保在安全组中打开了端口 30880，并通过 NodePort（IP：30880）使用默认帐户和密码（admin/P@88w0rd）访问 Web 控制台。 +4. 确保在安全组中打开了端口 `30880`，并通过 NodePort `(IP:30880)` 使用默认帐户和密码 `(admin/P@88w0rd)` 访问 Web 控制台。 -- 登录控制台后，您可以在***组件***中检查不同组件的状态。如果要使用相关服务，可能需要等待某些组件启动并运行。 +5. 登录控制台后，您可以在**服务组件**中检查不同组件的状态。如果要使用相关服务，可能需要等待某些组件启动并运行。 - ![components](/images/docs/quickstart/kubesphere-components-zh.png) + ![KubeSphere 组件](/images/docs/zh-cn/quickstart/minimal-kubesphere-on-k8s/kubesphere-components-zh.png) ## 启用可插拔组件（可选） -上面的指南默认情况下仅用于最小化安装，要在 KubeSphere 中启用其他组件，请参阅[启用可插拔组件](../../pluggable-components/)以获取更多详细信息。 +本指南仅适用于默认的最小化安装。若要在 KubeSphere 中启用其他组件，请参见[启用可插拔组件](../../pluggable-components/)。 -## 示例 +## 代码演示 diff --git a/static/images/docs/quickstart/kubesphere-components-zh.png b/static/images/docs/zh-cn/quickstart/minimal-kubesphere-on-k8s/kubesphere-components-zh.png similarity index 100% rename from static/images/docs/quickstart/kubesphere-components-zh.png rename to static/images/docs/zh-cn/quickstart/minimal-kubesphere-on-k8s/kubesphere-components-zh.png