Skip to content

Commit

Permalink
en: simplify deployment on aws eks (#663)
Browse files Browse the repository at this point in the history
Signed-off-by: Ran <huangran@pingcap.com>
  • Loading branch information
ran-huang committed Sep 11, 2020
1 parent 991b1b8 commit 79295f8
Show file tree
Hide file tree
Showing 9 changed files with 253 additions and 604 deletions.
4 changes: 2 additions & 2 deletions en/configure-a-tidb-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ If you want to enable TiCDC in the cluster, you can add TiCDC spec to the `TiDBC
replicas: 3
```

#### Deploy the enterprise version
#### Deploy Enterprise Edition

To deploy the enterprise version of TiDB/PD/TiKV/TiFlash/TiCDC, edit the `db.yaml` file to set `spec.<tidb/pd/tikv/tiflash/ticdc>.baseImage` to the enterprise image (`pingcap/<tidb/pd/tikv/tiflash/ticdc>-enterprise`).
To deploy Enterprise Edition of TiDB/PD/TiKV/TiFlash/TiCDC, edit the `db.yaml` file to set `spec.<tidb/pd/tikv/tiflash/ticdc>.baseImage` to the enterprise image (`pingcap/<tidb/pd/tikv/tiflash/ticdc>-enterprise`).

For example:

Expand Down
2 changes: 1 addition & 1 deletion en/deploy-on-alibaba-cloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ All the instances except ACK mandatory workers are deployed across availability

Modify `replicas` according to your needs.

To deploy the enterprise version of TiDB/PD/TiKV/TiFlash/TiCDC, edit the `db.yaml` file to set `spec.<tidb/pd/tikv/tiflash/ticdc>.baseImage` to the enterprise image (`pingcap/<tidb/pd/tikv/tiflash/ticdc>-enterprise`).
To deploy Enterprise Edition of TiDB/PD/TiKV/TiFlash/TiCDC, edit the `db.yaml` file to set `spec.<tidb/pd/tikv/tiflash/ticdc>.baseImage` to the enterprise image (`pingcap/<tidb/pd/tikv/tiflash/ticdc>-enterprise`).

For example:

Expand Down
835 changes: 242 additions & 593 deletions en/deploy-on-aws-eks.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion en/deploy-on-gcp-gke.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ This section describes how to deploy a TiDB cluster.
To complete the CR file configuration, refer to [TiDB Operator API documentation](https://github.com/pingcap/tidb-operator/blob/master/docs/api-references/docs.md) and [Configure Cluster using TidbCluster](configure-a-tidb-cluster.md).
To deploy the enterprise version of TiDB/PD/TiKV, edit the `db.yaml` file to set `spec.<tidb/pd/tikv>.baseImage` to the enterprise image (`pingcap/<tidb/pd/tikv>-enterprise`).
To deploy Enterprise Edition of TiDB/PD/TiKV, edit the `db.yaml` file to set `spec.<tidb/pd/tikv>.baseImage` to the enterprise image (`pingcap/<tidb/pd/tikv>-enterprise`).
For example:
Expand Down
2 changes: 1 addition & 1 deletion en/deploy-ticdc.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ To deploy TiCDC when deploying the TiDB cluster, refer to [Deploy TiDB in Genera
replicas: 3
```

To deploy the enterprise version of TiCDC, edit the `db.yaml` file to set `spec.ticdc.baseImage` to the enterprise image (`pingcap/ticdc-enterprise`).
To deploy Enterprise Edition of TiCDC, edit the `db.yaml` file to set `spec.ticdc.baseImage` to the enterprise image (`pingcap/ticdc-enterprise`).

For example:

Expand Down
4 changes: 2 additions & 2 deletions en/deploy-tidb-binlog.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ TiDB Binlog is disabled in the TiDB cluster by default. To create a TiDB cluster
Edit `version`, `replicas`, `storageClassName`, and `requests.storage` according to your cluster.

To deploy the enterprise version of Pump, edit the YAML file above to set `spec.pump.baseImage` to the enterprise image (`pingcap/tidb-binlog-enterprise`).
To deploy Enterprise Edition of Pump, edit the YAML file above to set `spec.pump.baseImage` to the enterprise image (`pingcap/tidb-binlog-enterprise`).

For example:

Expand Down Expand Up @@ -203,7 +203,7 @@ To deploy multiple drainers using the `tidb-drainer` Helm chart for a TiDB clust

For complete configuration details, refer to [TiDB Binlog Drainer Configurations in Kubernetes](configure-tidb-binlog-drainer.md).

To deploy the enterprise version of Drainer, edit the YAML file above to set `baseImage` to the enterprise image (`pingcap/tidb-binlog-enterprise`).
To deploy Enterprise Edition of Drainer, edit the YAML file above to set `baseImage` to the enterprise image (`pingcap/tidb-binlog-enterprise`).

For example:

Expand Down
2 changes: 1 addition & 1 deletion en/deploy-tidb-enterprise-edition.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
+ If you are deploying a new cluster:
Refer to [Configure a TiDB Cluster in Kubernetes](configure-a-tidb-cluster.md) to configure `tidb-cluster.yaml` and the enterprise edition image as described above, and run the `kubectl apply -f tidb-cluster.yaml -n ${namespace}` command to deploy the TiDB Enterprise Edition cluster and related tools.
Refer to [Configure a TiDB Cluster in Kubernetes](configure-a-tidb-cluster.md) to configure `tidb-cluster.yaml` and Enterprise Edition image as described above, and run the `kubectl apply -f tidb-cluster.yaml -n ${namespace}` command to deploy the TiDB Enterprise Edition cluster and related tools.

+ If you want to switch an existing Community Edition cluster to Enterprise Edition:

Expand Down
2 changes: 1 addition & 1 deletion en/deploy-tiflash.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
storageClassName: local-storage
```
To deploy the enterprise version of TiFlash, edit the `dm.yaml` file above to set `spec.tiflash.baseImage` to the enterprise image (`pingcap/tiflash-enterprise`).
To deploy Enterprise Edition of TiFlash, edit the `dm.yaml` file above to set `spec.tiflash.baseImage` to the enterprise image (`pingcap/tiflash-enterprise`).

For example:

Expand Down
4 changes: 2 additions & 2 deletions en/upgrade-a-tidb-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ If the TiDB cluster is deployed directly using TidbCluster CR, or deployed using

> **Note:**
>
> If you want to upgrade to the enterprise version, edit the `db.yaml` file to set `spec.<tidb/pd/tikv/tiflash/ticdc/pump>.baseImage` to the enterprise image (`pingcap/<tidb/pd/tikv/tiflash/ticdc/tidb-binlog>-enterprise`).
> If you want to upgrade to Enterprise Edition, edit the `db.yaml` file to set `spec.<tidb/pd/tikv/tiflash/ticdc/pump>.baseImage` to the enterprise image (`pingcap/<tidb/pd/tikv/tiflash/ticdc/tidb-binlog>-enterprise`).
>
> For example, change `spec.pd.baseImage` from `pingcap/pd` to `pingcap/pd-enterprise`.
Expand Down Expand Up @@ -85,7 +85,7 @@ If you continue to manage your cluster using Helm, refer to the following steps

> **Note:**
>
> If you want to upgrade to the enterprise version, set the value of `<tidb/pd/tikv>.image` to the enterprise image.
> If you want to upgrade to Enterprise Edition, set the value of `<tidb/pd/tikv>.image` to the enterprise image.
>
> For example, change `pd.image` from `pingcap/pd:v4.0.4` to `pingcap/pd-enterprise:v4.0.4`.

Expand Down

0 comments on commit 79295f8

Please sign in to comment.