From f5ccfd0a85cd0e899572aa4e7f9af6a6873c7829 Mon Sep 17 00:00:00 2001 From: Aolin Date: Mon, 14 Oct 2024 21:52:10 +0800 Subject: [PATCH 1/2] update CentOS 7 related description --- en/deploy-on-gcp-gke.md | 4 ++-- en/prerequisites.md | 3 +-- zh/deploy-on-gcp-gke.md | 4 ++-- zh/prerequisites.md | 3 +-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/en/deploy-on-gcp-gke.md b/en/deploy-on-gcp-gke.md index 1a8f3b7e8..42aeacf50 100644 --- a/en/deploy-on-gcp-gke.md +++ b/en/deploy-on-gcp-gke.md @@ -235,8 +235,8 @@ The LoadBalancer created for your TiDB cluster is an intranet LoadBalancer. You ```shell gcloud compute instances create bastion \ --machine-type=n1-standard-4 \ - --image-project=centos-cloud \ - --image-family=centos-7 \ + --image-project=TODO \ + --image-family=TODO \ --zone=${your-region}-a ``` diff --git a/en/prerequisites.md b/en/prerequisites.md index 6d40b0b7c..91acfcf95 100644 --- a/en/prerequisites.md +++ b/en/prerequisites.md @@ -13,7 +13,6 @@ This document introduces the hardware and software prerequisites for deploying a | Software Name | Version | | :--- | :--- | | Kubernetes | v1.24+ | -| CentOS | 7.6 and kernel 3.10.0-957 or later | | Helm | v3.0.0+ | ## Configure the firewall @@ -159,7 +158,7 @@ sysctl --system ## Docker service -It is recommended to install Docker CE 18.09.6 or later versions. See [Install Docker](https://docs.docker.com/engine/install/centos/) for details. +It is recommended to install Docker CE 18.09.6 or later versions. See [Install Docker](https://docs.docker.com/engine/install/) for details. After the installation, take the following steps: diff --git a/zh/deploy-on-gcp-gke.md b/zh/deploy-on-gcp-gke.md index 90b70e8e5..185b4a865 100644 --- a/zh/deploy-on-gcp-gke.md +++ b/zh/deploy-on-gcp-gke.md @@ -226,8 +226,8 @@ tidb-tikv-2 1/1 Running 0 47h ```shell gcloud compute instances create bastion \ --machine-type=n1-standard-4 \ - --image-project=centos-cloud \ - --image-family=centos-7 \ + --image-project=TODO \ + --image-family=TODO \ --zone=${your-region}-a ``` diff --git a/zh/prerequisites.md b/zh/prerequisites.md index 56aa4d021..41c6220bc 100644 --- a/zh/prerequisites.md +++ b/zh/prerequisites.md @@ -13,7 +13,6 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/prerequisites/'] | 软件名称 | 版本 | | :--- | :--- | | Kubernetes | v1.24+ | -| CentOS | CentOS 7.6，内核要求为 3.10.0-957 或之后版本 | | Helm | v3.0.0+ | ## 配置防火墙 @@ -161,7 +160,7 @@ sysctl --system ## Docker 服务 -安装 Docker 时，建议选择 Docker CE 18.09.6 及以上版本。请参考 [Docker 安装指南](https://docs.docker.com/engine/install/centos/) 进行安装。 +安装 Docker 时，建议选择 Docker CE 18.09.6 及以上版本。请参考 [Docker 安装指南](https://docs.docker.com/engine/install/)进行安装。 安装完 Docker 服务以后，执行以下步骤： From 7623cf9ab7a1f64a7dc84b31e8cdab46f316d6fa Mon Sep 17 00:00:00 2001 From: Aolin Date: Tue, 15 Oct 2024 11:28:06 +0800 Subject: [PATCH 2/2] remove image-project and image-family --- en/deploy-on-gcp-gke.md | 2 -- zh/deploy-on-gcp-gke.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/en/deploy-on-gcp-gke.md b/en/deploy-on-gcp-gke.md index 42aeacf50..3ff694278 100644 --- a/en/deploy-on-gcp-gke.md +++ b/en/deploy-on-gcp-gke.md @@ -235,8 +235,6 @@ The LoadBalancer created for your TiDB cluster is an intranet LoadBalancer. You ```shell gcloud compute instances create bastion \ --machine-type=n1-standard-4 \ - --image-project=TODO \ - --image-family=TODO \ --zone=${your-region}-a ``` diff --git a/zh/deploy-on-gcp-gke.md b/zh/deploy-on-gcp-gke.md index 185b4a865..0c66ee3f9 100644 --- a/zh/deploy-on-gcp-gke.md +++ b/zh/deploy-on-gcp-gke.md @@ -226,8 +226,6 @@ tidb-tikv-2 1/1 Running 0 47h ```shell gcloud compute instances create bastion \ --machine-type=n1-standard-4 \ - --image-project=TODO \ - --image-family=TODO \ --zone=${your-region}-a ```