From 82ae86c8a36241a09a503d969c54907080078a34 Mon Sep 17 00:00:00 2001 From: Shiori Date: Wed, 18 Aug 2021 10:31:59 +0800 Subject: [PATCH] en,zh; Bump DM to v2.0.6 (#1356) --- en/deploy-tidb-dm.md | 16 ++++++++-------- en/enable-tls-for-dm.md | 4 ++-- zh/deploy-tidb-dm.md | 16 ++++++++-------- zh/enable-tls-for-dm.md | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/en/deploy-tidb-dm.md b/en/deploy-tidb-dm.md index 2c29ba516e..ae7c0a9724 100644 --- a/en/deploy-tidb-dm.md +++ b/en/deploy-tidb-dm.md @@ -29,9 +29,9 @@ Usually, components in a cluster are in the same version. It is recommended to c The formats of the related parameters are as follows: -- `spec.version`: the format is `imageTag`, such as `v2.0.4`. +- `spec.version`: the format is `imageTag`, such as `v2.0.6`. - `spec..baseImage`: the format is `imageName`, such as `pingcap/dm`. -- `spec..version`: the format is `imageTag`, such as `v2.0.4`. +- `spec..version`: the format is `imageTag`, such as `v2.0.6`. TiDB Operator only supports deploying DM 2.0 and later versions. @@ -50,7 +50,7 @@ metadata: name: ${dm_cluster_name} namespace: ${namespace} spec: - version: v2.0.4 + version: v2.0.6 pvReclaimPolicy: Retain discovery: {} master: @@ -142,10 +142,10 @@ kubectl apply -f ${dm_cluster_name}.yaml -n ${namespace} If the server does not have an external network, you need to download the Docker image used by the DM cluster and upload the image to the server, and then execute `docker load` to install the Docker image on the server: -1. Deploy a DM cluster requires the following Docker image (assuming the version of the DM cluster is v2.0.4): +1. Deploy a DM cluster requires the following Docker image (assuming the version of the DM cluster is v2.0.6): ```shell - pingcap/dm:v2.0.4 + pingcap/dm:v2.0.6 ``` 2. To download the image, execute the following command: @@ -153,8 +153,8 @@ If the server does not have an external network, you need to download the Docker {{< copyable "shell-regular" >}} ```shell - docker pull pingcap/dm:v2.0.4 - docker save -o dm-v2.0.4.tar pingcap/dm:v2.0.4 + docker pull pingcap/dm:v2.0.6 + docker save -o dm-v2.0.6.tar pingcap/dm:v2.0.6 ``` 3. Upload the Docker image to the server, and execute `docker load` to install the image on the server: @@ -162,7 +162,7 @@ If the server does not have an external network, you need to download the Docker {{< copyable "shell-regular" >}} ```shell - docker load -i dm-v2.0.4.tar + docker load -i dm-v2.0.6.tar ``` After deploying the DM cluster, execute the following command to view the Pod status: diff --git a/en/enable-tls-for-dm.md b/en/enable-tls-for-dm.md index 8eeef663ea..8a0f732498 100644 --- a/en/enable-tls-for-dm.md +++ b/en/enable-tls-for-dm.md @@ -510,7 +510,7 @@ metadata: spec: tlsCluster: enabled: true - version: v2.0.4 + version: v2.0.6 pvReclaimPolicy: Retain discovery: {} master: @@ -578,7 +578,7 @@ metadata: name: ${cluster_name} namespace: ${namespace} spec: - version: v2.0.4 + version: v2.0.6 pvReclaimPolicy: Retain discovery: {} tlsClientSecretNames: diff --git a/zh/deploy-tidb-dm.md b/zh/deploy-tidb-dm.md index cfa2c934a0..7a06ef8ce3 100644 --- a/zh/deploy-tidb-dm.md +++ b/zh/deploy-tidb-dm.md @@ -29,9 +29,9 @@ summary: 了解如何在 Kubernetes 上部署 TiDB DM 集群。 相关参数的格式如下： -- `spec.version`，格式为 `imageTag`，例如 `v2.0.4` +- `spec.version`，格式为 `imageTag`，例如 `v2.0.6` - `spec..baseImage`，格式为 `imageName`，例如 `pingcap/dm` -- `spec..version`，格式为 `imageTag`，例如 `v2.0.4` +- `spec..version`，格式为 `imageTag`，例如 `v2.0.6` TiDB Operator 仅支持部署 DM 2.0 及更新版本。 @@ -50,7 +50,7 @@ metadata: name: ${dm_cluster_name} namespace: ${namespace} spec: - version: v2.0.4 + version: v2.0.6 pvReclaimPolicy: Retain discovery: {} master: @@ -140,10 +140,10 @@ kubectl apply -f ${dm_cluster_name}.yaml -n ${namespace} 如果服务器没有外网，需要按下述步骤在有外网的机器上将 DM 集群用到的 Docker 镜像下载下来并上传到服务器上，然后使用 `docker load` 将 Docker 镜像安装到服务器上： -1. 部署一套 DM 集群会用到下面这些 Docker 镜像（假设 DM 集群的版本是 v2.0.4）： +1. 部署一套 DM 集群会用到下面这些 Docker 镜像（假设 DM 集群的版本是 v2.0.6）： ```shell - pingcap/dm:v2.0.4 + pingcap/dm:v2.0.6 ``` 2. 通过下面的命令将所有这些镜像下载下来： @@ -151,9 +151,9 @@ kubectl apply -f ${dm_cluster_name}.yaml -n ${namespace} {{< copyable "shell-regular" >}} ```shell - docker pull pingcap/dm:v2.0.4 + docker pull pingcap/dm:v2.0.6 - docker save -o dm-v2.0.4.tar pingcap/dm:v2.0.4 + docker save -o dm-v2.0.6.tar pingcap/dm:v2.0.6 ``` 3. 将这些 Docker 镜像上传到服务器上，并执行 `docker load` 将这些 Docker 镜像安装到服务器上： @@ -161,7 +161,7 @@ kubectl apply -f ${dm_cluster_name}.yaml -n ${namespace} {{< copyable "shell-regular" >}} ```shell - docker load -i dm-v2.0.4.tar + docker load -i dm-v2.0.6.tar ``` 部署 DM 集群完成后，通过下面命令查看 Pod 状态： diff --git a/zh/enable-tls-for-dm.md b/zh/enable-tls-for-dm.md index a1830d8d81..287408635c 100644 --- a/zh/enable-tls-for-dm.md +++ b/zh/enable-tls-for-dm.md @@ -483,7 +483,7 @@ metadata: spec: tlsCluster: enabled: true - version: v2.0.4 + version: v2.0.6 pvReclaimPolicy: Retain discovery: {} master: @@ -549,7 +549,7 @@ metadata: name: ${cluster_name} namespace: ${namespace} spec: - version: v2.0.4 + version: v2.0.6 pvReclaimPolicy: Retain discovery: {} tlsClientSecretNames: