Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

en,zh; Bump DM to v2.0.6 #1356

Merged
merged 1 commit into from
Aug 18, 2021
Merged

en,zh; Bump DM to v2.0.6 #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions en/deploy-tidb-dm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.<master/worker>.baseImage`: the format is `imageName`, such as `pingcap/dm`.
- `spec.<master/worker>.version`: the format is `imageTag`, such as `v2.0.4`.
- `spec.<master/worker>.version`: the format is `imageTag`, such as `v2.0.6`.

TiDB Operator only supports deploying DM 2.0 and later versions.

Expand All @@ -50,7 +50,7 @@ metadata:
name: ${dm_cluster_name}
namespace: ${namespace}
spec:
version: v2.0.4
version: v2.0.6
pvReclaimPolicy: Retain
discovery: {}
master:
Expand Down Expand Up @@ -142,27 +142,27 @@ 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:

{{< 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:

{{< 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:
Expand Down
4 changes: 2 additions & 2 deletions en/enable-tls-for-dm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ metadata:
spec:
tlsCluster:
enabled: true
version: v2.0.4
version: v2.0.6
pvReclaimPolicy: Retain
discovery: {}
master:
Expand Down Expand Up @@ -578,7 +578,7 @@ metadata:
name: ${cluster_name}
namespace: ${namespace}
spec:
version: v2.0.4
version: v2.0.6
pvReclaimPolicy: Retain
discovery: {}
tlsClientSecretNames:
Expand Down
16 changes: 8 additions & 8 deletions zh/deploy-tidb-dm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ summary: 了解如何在 Kubernetes 上部署 TiDB DM 集群。

相关参数的格式如下：

- `spec.version`，格式为 `imageTag`，例如 `v2.0.4`
- `spec.version`，格式为 `imageTag`，例如 `v2.0.6`
- `spec.<master/worker>.baseImage`，格式为 `imageName`，例如 `pingcap/dm`
- `spec.<master/worker>.version`，格式为 `imageTag`，例如 `v2.0.4`
- `spec.<master/worker>.version`，格式为 `imageTag`，例如 `v2.0.6`

TiDB Operator 仅支持部署 DM 2.0 及更新版本。

Expand All @@ -50,7 +50,7 @@ metadata:
name: ${dm_cluster_name}
namespace: ${namespace}
spec:
version: v2.0.4
version: v2.0.6
pvReclaimPolicy: Retain
discovery: {}
master:
Expand Down Expand Up @@ -140,28 +140,28 @@ 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. 通过下面的命令将所有这些镜像下载下来：

{{< 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 镜像安装到服务器上：

{{< copyable "shell-regular" >}}

```shell
docker load -i dm-v2.0.4.tar
docker load -i dm-v2.0.6.tar
```

部署 DM 集群完成后，通过下面命令查看 Pod 状态：
Expand Down
4 changes: 2 additions & 2 deletions zh/enable-tls-for-dm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ metadata:
spec:
tlsCluster:
enabled: true
version: v2.0.4
version: v2.0.6
pvReclaimPolicy: Retain
discovery: {}
master:
Expand Down Expand Up @@ -549,7 +549,7 @@ metadata:
name: ${cluster_name}
namespace: ${namespace}
spec:
version: v2.0.4
version: v2.0.6
pvReclaimPolicy: Retain
discovery: {}
tlsClientSecretNames:
Expand Down