Skip to content

Commit

Permalink
en,zh; Bump tidb components to v5.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
csuzhangxc committed Apr 29, 2021
1 parent 1557999 commit 01f0683
Show file tree
Hide file tree
Showing 32 changed files with 133 additions and 133 deletions.
2 changes: 1 addition & 1 deletion en/access-dashboard.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ TiDB Dashboard is built in the PD component in TiDB 4.0 and later versions. You
metadata:
name: basic
spec:
version: v4.0.10
version: v5.0.1
timezone: UTC
pvReclaimPolicy: Delete
pd:
Expand Down
6 changes: 3 additions & 3 deletions en/advanced-statefulset.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ kind: TidbCluster
metadata:
name: asts
spec:
version: v4.0.10
version: v5.0.1
timezone: UTC
pvReclaimPolicy: Delete
pd:
Expand Down Expand Up @@ -128,7 +128,7 @@ metadata:
tikv.tidb.pingcap.com/delete-slots: '[1]'
name: asts
spec:
version: v4.0.10
version: v5.0.1
timezone: UTC
pvReclaimPolicy: Delete
pd:
Expand Down Expand Up @@ -179,7 +179,7 @@ metadata:
tikv.tidb.pingcap.com/delete-slots: '[]'
name: asts
spec:
version: v4.0.10
version: v5.0.1
timezone: UTC
pvReclaimPolicy: Delete
pd:
Expand Down
18 changes: 9 additions & 9 deletions en/configure-a-tidb-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ Usually, components in a cluster are in the same version. It is recommended to c

Here are the formats of the parameters:

- `spec.version`: the format is `imageTag`, such as `v4.0.10`
- `spec.version`: the format is `imageTag`, such as `v5.0.1`

- `spec.<pd/tidb/tikv/pump/tiflash/ticdc>.baseImage`: the format is `imageName`, such as `pingcap/tidb`

- `spec.<pd/tidb/tikv/pump/tiflash/ticdc>.version`: the format is `imageTag`, such as `v4.0.10`
- `spec.<pd/tidb/tikv/pump/tiflash/ticdc>.version`: the format is `imageTag`, such as `v5.0.1`

### Recommended configuration

Expand Down Expand Up @@ -273,7 +273,7 @@ metadata:
spec:
....
tidb:
image: pingcap/tidb:v4.0.10
image: pingcap/tidb:v5.0.1
imagePullPolicy: IfNotPresent
replicas: 1
service:
Expand All @@ -295,7 +295,7 @@ metadata:
spec:
....
tidb:
image: pingcap/tidb:v4.0.10
image: pingcap/tidb:v5.0.1
imagePullPolicy: IfNotPresent
replicas: 1
service:
Expand Down Expand Up @@ -327,7 +327,7 @@ metadata:
spec:
....
tikv:
image: pingcap/tikv:v4.0.10
image: pingcap/tikv:v5.0.1
config:
log-level: "info"
slow-log-threshold: "1s"
Expand All @@ -346,7 +346,7 @@ metadata:
spec:
....
tikv:
image: pingcap/tikv:v4.0.10
image: pingcap/tikv:v5.0.1
config: |
# [storage]
# reserve-space = "2MB"
Expand Down Expand Up @@ -375,7 +375,7 @@ metadata:
spec:
.....
pd:
image: pingcap/pd:v4.0.10
image: pingcap/pd:v5.0.1
config:
lease: 3
enable-prevote: true
Expand All @@ -391,7 +391,7 @@ metadata:
spec:
.....
pd:
image: pingcap/pd:v4.0.10
image: pingcap/pd:v5.0.1
config: |
lease = 3
enable-prevote = true
Expand Down Expand Up @@ -491,7 +491,7 @@ kind: TidbCluster
metadata:
name: basic
spec:
version: v4.0.10
version: v5.0.1
pvReclaimPolicy: Retain
discovery: {}
pd:
Expand Down
6 changes: 3 additions & 3 deletions en/deploy-heterogeneous-tidb-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ metadata:
name: ${heterogeneous_cluster_name}
spec:
configUpdateStrategy: RollingUpdate
version: v4.0.10
version: v5.0.1
timezone: UTC
pvReclaimPolicy: Delete
discovery: {}
Expand Down Expand Up @@ -92,7 +92,7 @@ spec:
version: 6.1.6
initializer:
baseImage: pingcap/tidb-monitor-initializer
version: v4.0.10
version: v5.0.1
reloader:
baseImage: pingcap/tidb-monitor-reloader
version: v1.0.1
Expand Down Expand Up @@ -133,7 +133,7 @@ spec:
tlsCluster:
enabled: true
configUpdateStrategy: RollingUpdate
version: v4.0.10
version: v5.0.1
timezone: UTC
pvReclaimPolicy: Delete
discovery: {}
Expand Down
58 changes: 29 additions & 29 deletions en/deploy-on-general-kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ This document describes how to deploy a TiDB cluster in general Kubernetes.

If the server does not have an external network, you need to download the Docker image used by the TiDB cluster on a machine with Internet access and upload it to the server, and then use `docker load` to install the Docker image on the server.

To deploy a TiDB cluster, you need the following Docker images (assuming the version of the TiDB cluster is v4.0.10):
To deploy a TiDB cluster, you need the following Docker images (assuming the version of the TiDB cluster is v5.0.1):

```shell
pingcap/pd:v4.0.10
pingcap/tikv:v4.0.10
pingcap/tidb:v4.0.10
pingcap/tidb-binlog:v4.0.10
pingcap/ticdc:v4.0.10
pingcap/tiflash:v4.0.10
pingcap/pd:v5.0.1
pingcap/tikv:v5.0.1
pingcap/tidb:v5.0.1
pingcap/tidb-binlog:v5.0.1
pingcap/ticdc:v5.0.1
pingcap/tiflash:v5.0.1
pingcap/tidb-monitor-reloader:v1.0.1
pingcap/tidb-monitor-initializer:v4.0.10
pingcap/tidb-monitor-initializer:v5.0.1
grafana/grafana:6.0.1
prom/prometheus:v2.18.1
busybox:1.26.2
Expand All @@ -63,26 +63,26 @@ This document describes how to deploy a TiDB cluster in general Kubernetes.
{{< copyable "shell-regular" >}}

```shell
docker pull pingcap/pd:v4.0.10
docker pull pingcap/tikv:v4.0.10
docker pull pingcap/tidb:v4.0.10
docker pull pingcap/tidb-binlog:v4.0.10
docker pull pingcap/ticdc:v4.0.10
docker pull pingcap/tiflash:v4.0.10
docker pull pingcap/pd:v5.0.1
docker pull pingcap/tikv:v5.0.1
docker pull pingcap/tidb:v5.0.1
docker pull pingcap/tidb-binlog:v5.0.1
docker pull pingcap/ticdc:v5.0.1
docker pull pingcap/tiflash:v5.0.1
docker pull pingcap/tidb-monitor-reloader:v1.0.1
docker pull pingcap/tidb-monitor-initializer:v4.0.10
docker pull pingcap/tidb-monitor-initializer:v5.0.1
docker pull grafana/grafana:6.0.1
docker pull prom/prometheus:v2.18.1
docker pull busybox:1.26.2
docker save -o pd-v4.0.10.tar pingcap/pd:v4.0.10
docker save -o tikv-v4.0.10.tar pingcap/tikv:v4.0.10
docker save -o tidb-v4.0.10.tar pingcap/tidb:v4.0.10
docker save -o tidb-binlog-v4.0.10.tar pingcap/tidb-binlog:v4.0.10
docker save -o ticdc-v4.0.10.tar pingcap/ticdc:v4.0.10
docker save -o tiflash-v4.0.10.tar pingcap/tiflash:v4.0.10
docker save -o pd-v5.0.1.tar pingcap/pd:v5.0.1
docker save -o tikv-v5.0.1.tar pingcap/tikv:v5.0.1
docker save -o tidb-v5.0.1.tar pingcap/tidb:v5.0.1
docker save -o tidb-binlog-v5.0.1.tar pingcap/tidb-binlog:v5.0.1
docker save -o ticdc-v5.0.1.tar pingcap/ticdc:v5.0.1
docker save -o tiflash-v5.0.1.tar pingcap/tiflash:v5.0.1
docker save -o tidb-monitor-reloader-v1.0.1.tar pingcap/tidb-monitor-reloader:v1.0.1
docker save -o tidb-monitor-initializer-v4.0.10.tar pingcap/tidb-monitor-initializer:v4.0.10
docker save -o tidb-monitor-initializer-v5.0.1.tar pingcap/tidb-monitor-initializer:v5.0.1
docker save -o grafana-6.0.1.tar grafana/grafana:6.0.1
docker save -o prometheus-v2.18.1.tar prom/prometheus:v2.18.1
docker save -o busybox-1.26.2.tar busybox:1.26.2
Expand All @@ -93,14 +93,14 @@ This document describes how to deploy a TiDB cluster in general Kubernetes.
{{< copyable "shell-regular" >}}

```shell
docker load -i pd-v4.0.10.tar
docker load -i tikv-v4.0.10.tar
docker load -i tidb-v4.0.10.tar
docker load -i tidb-binlog-v4.0.10.tar
docker load -i ticdc-v4.0.10.tar
docker load -i tiflash-v4.0.10.tar
docker load -i pd-v5.0.1.tar
docker load -i tikv-v5.0.1.tar
docker load -i tidb-v5.0.1.tar
docker load -i tidb-binlog-v5.0.1.tar
docker load -i ticdc-v5.0.1.tar
docker load -i tiflash-v5.0.1.tar
docker load -i tidb-monitor-reloader-v1.0.1.tar
docker load -i tidb-monitor-initializer-v4.0.10.tar
docker load -i tidb-monitor-initializer-v5.0.1.tar
docker load -i grafana-6.0.1.tar
docker load -i prometheus-v2.18.1.tar
docker load -i busybox-1.26.2.tar
Expand Down
8 changes: 4 additions & 4 deletions en/deploy-tidb-binlog.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TiDB Binlog is disabled in the TiDB cluster by default. To create a TiDB cluster
...
pump:
baseImage: pingcap/tidb-binlog
version: v4.0.10
version: v5.0.1
replicas: 1
storageClassName: local-storage
requests:
Expand All @@ -47,7 +47,7 @@ TiDB Binlog is disabled in the TiDB cluster by default. To create a TiDB cluster
...
pump:
baseImage: pingcap/tidb-binlog
version: v4.0.10
version: v5.0.1
replicas: 1
storageClassName: local-storage
requests:
Expand Down Expand Up @@ -198,7 +198,7 @@ To deploy multiple drainers using the `tidb-drainer` Helm chart for a TiDB clust

```yaml
clusterName: example-tidb
clusterVersion: v4.0.10
clusterVersion: v5.0.1
baseImage:pingcap/tidb-binlog
storageClassName: local-storage
storage: 10Gi
Expand Down Expand Up @@ -231,7 +231,7 @@ To deploy multiple drainers using the `tidb-drainer` Helm chart for a TiDB clust

```yaml
...
clusterVersion: v4.0.10
clusterVersion: v5.0.1
baseImage: pingcap/tidb-binlog-enterprise
...
```
Expand Down
4 changes: 2 additions & 2 deletions en/deploy-tidb-enterprise-edition.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Currently, the difference between the deployment of TiDB Operator Enterprise Edi

```yaml
spec:
version: v4.0.10
version: v5.0.1
...
pd:
baseImage: pingcap/pd-enterprise
Expand Down Expand Up @@ -56,7 +56,7 @@ spec:

```yaml
spec:
version: v4.0.10
version: v5.0.1
...
pd:
baseImage: pingcap/pd
Expand Down
4 changes: 2 additions & 2 deletions en/enable-tls-between-components.md
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@ In this step, you need to perform the following operations:
spec:
tlsCluster:
enabled: true
version: v4.0.10
version: v5.0.1
timezone: UTC
pvReclaimPolicy: Retain
pd:
Expand Down Expand Up @@ -1371,7 +1371,7 @@ In this step, you need to perform the following operations:
version: 6.0.1
initializer:
baseImage: pingcap/tidb-monitor-initializer
version: v4.0.10
version: v5.0.1
reloader:
baseImage: pingcap/tidb-monitor-reloader
version: v1.0.1
Expand Down
2 changes: 1 addition & 1 deletion en/enable-tls-for-mysql-client.md
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ In this step, you create a TiDB cluster and perform the following operations:
name: ${cluster_name}
amespace: ${namespace}
spec:
version: v4.0.10
version: v5.0.1
timezone: UTC
pvReclaimPolicy: Retain
pd:
Expand Down
8 changes: 4 additions & 4 deletions en/monitor-a-tidb-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
type: NodePort
initializer:
baseImage: pingcap/tidb-monitor-initializer
version: v4.0.10
version: v5.0.1
reloader:
baseImage: pingcap/tidb-monitor-reloader
version: v1.0.1
Expand Down Expand Up @@ -158,7 +158,7 @@ spec:
type: NodePort
initializer:
baseImage: pingcap/tidb-monitor-initializer
version: v4.0.10
version: v5.0.1
reloader:
baseImage: pingcap/tidb-monitor-reloader
version: v1.0.1
Expand Down Expand Up @@ -212,7 +212,7 @@ spec:
foo: "bar"
initializer:
baseImage: pingcap/tidb-monitor-initializer
version: v4.0.10
version: v5.0.1
reloader:
baseImage: pingcap/tidb-monitor-reloader
version: v1.0.1
Expand Down Expand Up @@ -249,7 +249,7 @@ spec:
type: ClusterIP
initializer:
baseImage: pingcap/tidb-monitor-initializer
version: v4.0.10
version: v5.0.1
reloader:
baseImage: pingcap/tidb-monitor-reloader
version: v1.0.1
Expand Down
2 changes: 1 addition & 1 deletion en/notes-tidb-operator-v1.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ spec
...
pump:
baseImage: pingcap/tidb-binlog
version: v4.0.10
version: v5.0.1
replicas: 1
storageClassName: local-storage
requests:
Expand Down
2 changes: 1 addition & 1 deletion en/pd-recover.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ aliases: ['/docs/tidb-in-kubernetes/dev/pd-recover/']
wget https://download.pingcap.org/tidb-${version}-linux-amd64.tar.gz
```

In the command above, `${version}` is the version of the TiDB cluster, such as `v4.0.10`.
In the command above, `${version}` is the version of the TiDB cluster, such as `v5.0.1`.

2. Unpack the TiDB package for installation:

Expand Down
2 changes: 1 addition & 1 deletion en/restart-a-tidb-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ kind: TidbCluster
metadata:
name: basic
spec:
version: v4.0.10
version: v5.0.1
timezone: UTC
pvReclaimPolicy: Delete
pd:
Expand Down
2 changes: 1 addition & 1 deletion en/restore-data-using-tidb-lightning.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ You can deploy tikv-importer using the Helm chart. See the following example:

```yaml
clusterName: demo
image: pingcap/tidb-lightning:v4.0.10
image: pingcap/tidb-lightning:v5.0.1
imagePullPolicy: IfNotPresent
storageClassName: local-storage
storage: 20Gi
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 @@ -29,7 +29,7 @@ If the TiDB cluster is deployed directly using TidbCluster CR, or deployed using
The `version` field has following formats:

- `spec.version`: the format is `imageTag`, such as `v4.0.10`
- `spec.version`: the format is `imageTag`, such as `v5.0.1`

- `spec.<pd/tidb/tikv/pump/tiflash/ticdc>.version`: the format is `imageTag`, such as `v3.1.0`

Expand Down Expand Up @@ -112,7 +112,7 @@ If you continue to manage your cluster using Helm, refer to the following steps
>
> 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.10` to `pingcap/pd-enterprise:v4.0.10`.
> For example, change `pd.image` from `pingcap/pd:v5.0.1` to `pingcap/pd-enterprise:v5.0.1`.

2. Run the `helm upgrade` command:

Expand Down
Loading

0 comments on commit 01f0683

Please sign in to comment.