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 tidb version to v4.0.9 #928

Merged
merged 5 commits into from
Dec 21, 2020
Merged

en, zh: bump tidb version to v4.0.9 #928

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
784578a
bump tidb version to v4.0.9
dragonly Dec 17, 2020
32c6ecf
fix version mistakes
dragonly Dec 18, 2020
3bd11b9
Merge branch 'master' into bump-version-1.1.8
dragonly Dec 18, 2020
f2ae6e4
fix version mistakes
dragonly Dec 18, 2020
9192e0b
fix version mistakes and multi-cluaster monitor
dragonly Dec 18, 2020
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
2 changes: 1 addition & 1 deletion en/access-dashboard.md
View file
Open in desktop
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.8
version: v4.0.9
timezone: UTC
pvReclaimPolicy: Delete
pd:
Expand Down
2 changes: 1 addition & 1 deletion en/access-tidb.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ kind: TidbCluster
metadata:
name: basic
spec:
version: v4.0.8
version: v4.0.9
pvReclaimPolicy: Retain
discovery: {}
pd:
Expand Down
6 changes: 3 additions & 3 deletions en/advanced-statefulset.md
View file
Open in desktop
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.8
version: v4.0.9
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.8
version: v4.0.9
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.8
version: v4.0.9
timezone: UTC
pvReclaimPolicy: Delete
pd:
Expand Down
18 changes: 9 additions & 9 deletions en/backup-to-aws-s3-using-br.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Before you perform ad-hoc backup, AWS account permissions need to be granted. Th

> **Note:**
>
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.8, `tikv_gc_life_time` will be adjusted by BR automatically. You can omit the step that creates the secret which stores the account and password needed to access the TiDB cluster.
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.9, `tikv_gc_life_time` will be adjusted by BR automatically. You can omit the step that creates the secret which stores the account and password needed to access the TiDB cluster.
dragonly marked this conversation as resolved.
Show resolved Hide resolved

#### Grant permissions by importing AccessKey and SecretKey

Expand Down Expand Up @@ -203,7 +203,7 @@ Before you perform ad-hoc backup, AWS account permissions need to be granted. Th
# sendCredToTikv: true
# options:
# - --lastbackupts=420134118382108673
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.9
from:
host: ${tidb_host}
port: ${tidb_port}
Expand Down Expand Up @@ -250,7 +250,7 @@ Before you perform ad-hoc backup, AWS account permissions need to be granted. Th
# checksum: true
# options:
# - --lastbackupts=420134118382108673
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.9
from:
host: ${tidb_host}
port: ${tidb_port}
Expand Down Expand Up @@ -295,7 +295,7 @@ Before you perform ad-hoc backup, AWS account permissions need to be granted. Th
# checksum: true
# options:
# - --lastbackupts=420134118382108673
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.9
from:
host: ${tidb_host}
port: ${tidb_port}
Expand Down Expand Up @@ -373,7 +373,7 @@ More `Backup` CR parameter description:

> **Note:**
>
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.8, `tikv_gc_life_time` will be adjusted by BR automatically, so you can omit `spec.tikvGCLifeTime`.
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.9, `tikv_gc_life_time` will be adjusted by BR automatically, so you can omit `spec.tikvGCLifeTime`.

- * `.spec.cleanPolicy`: The clean policy of the backup data when the backup CR is deleted.

Expand Down Expand Up @@ -403,7 +403,7 @@ More `Backup` CR parameter description:

> **Note:**
>
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.8, `tikv_gc_life_time` will be adjusted by BR automatically, so you can omit `spec.from`.
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.9, `tikv_gc_life_time` will be adjusted by BR automatically, so you can omit `spec.from`.

- `.spec.tableFilter`: BR only backs up tables that match the [table filter rules](https://docs.pingcap.com/tidb/stable/table-filter/). This field can be ignored by default. If the field is not configured, BR backs up all schemas except the system schemas.

Expand Down Expand Up @@ -489,7 +489,7 @@ The prerequisites for the scheduled full backup is the same as the [prerequisite
# timeAgo: ${time}
# checksum: true
# sendCredToTikv: true
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.9
from:
host: ${tidb_host}
port: ${tidb_port}
Expand Down Expand Up @@ -539,7 +539,7 @@ The prerequisites for the scheduled full backup is the same as the [prerequisite
# rateLimit: 0
# timeAgo: ${time}
# checksum: true
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.9
from:
host: ${tidb_host}
port: ${tidb_port}
Expand Down Expand Up @@ -587,7 +587,7 @@ The prerequisites for the scheduled full backup is the same as the [prerequisite
# rateLimit: 0
# timeAgo: ${time}
# checksum: true
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.9
from:
host: ${tidb_host}
port: ${tidb_port}
Expand Down
8 changes: 4 additions & 4 deletions en/backup-to-gcs-using-br.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ This document provides examples in which the data of the `demo1` TiDB cluster in

> **Note:**
>
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.8, `tikv_gc_life_time` will be adjusted by BR automatically, so you can omit this step.
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.9, `tikv_gc_life_time` will be adjusted by BR automatically, so you can omit this step.
dragonly marked this conversation as resolved.
Show resolved Hide resolved

### Required database account privileges

Expand Down Expand Up @@ -177,7 +177,7 @@ More descriptions of fields in the `Backup` CR:

> **Note:**
>
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.8, `tikv_gc_life_time` will be adjusted by BR automatically, so you can omit `spec.tikvGCLifeTime`.
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.9, `tikv_gc_life_time` will be adjusted by BR automatically, so you can omit `spec.tikvGCLifeTime`.

* `.spec.cleanPolicy`: The clean policy of the backup data when the backup CR is deleted after the backup is completed.

Expand Down Expand Up @@ -209,7 +209,7 @@ More descriptions of fields in the `Backup` CR:

> **Note:**
>
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.8, `tikv_gc_life_time` will be adjusted by BR automatically, so you can omit `spec.from`.
> If TiDB Operator >= v1.1.7 && TiDB >= v4.0.9, `tikv_gc_life_time` will be adjusted by BR automatically, so you can omit `spec.from`.

* `.spec.tableFilter`: BR only backs up tables that match the [table filter rules](https://docs.pingcap.com/tidb/stable/table-filter/). This field can be ignored by default. If the field is not configured, BR backs up all schemas except the system schemas.

Expand Down Expand Up @@ -256,7 +256,7 @@ The prerequisites for the scheduled full backup is the same with the [prerequisi
maxReservedTime: "3h"
schedule: "*/2 * * * *"
backupTemplate:
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
# Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.9
from:
host: ${tidb_host}
port: ${tidb_port}
Expand Down
16 changes: 8 additions & 8 deletions en/configure-a-tidb-cluster.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ The cluster name can be configured by changing `metadata.name` in the `TiDBCuste
Usually, components in a cluster are in the same version. It is recommended to configure `spec.<pd/tidb/tikv/pump/tiflash/ticdc>.baseImage` and `spec.version`, if you need to configure different versions for different components, you can configure `spec.<pd/tidb/tikv/pump/tiflash/ticdc>.version`.
Here are the formats of the parameters:

- `spec.version`: the format is `imageTag`, such as `v4.0.8`
- `spec.version`: the format is `imageTag`, such as `v4.0.9`

- `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.8`
- `spec.<pd/tidb/tikv/pump/tiflash/ticdc>.version`: the format is `imageTag`, such as `v4.0.9`

### Recommended configuration

Expand Down Expand Up @@ -258,7 +258,7 @@ metadata:
spec:
....
tidb:
image: pingcap/tidb:v4.0.8
image: pingcap/tidb:v4.0.9
imagePullPolicy: IfNotPresent
replicas: 1
service:
Expand All @@ -280,7 +280,7 @@ metadata:
spec:
....
tidb:
image: pingcap/tidb:v4.0.8
image: pingcap/tidb:v4.0.9
imagePullPolicy: IfNotPresent
replicas: 1
service:
Expand Down Expand Up @@ -312,7 +312,7 @@ metadata:
spec:
....
tikv:
image: pingcap/tikv:v4.0.8
image: pingcap/tikv:v4.0.9
config:
log-level: "info"
slow-log-threshold: "1s"
Expand All @@ -331,7 +331,7 @@ metadata:
spec:
....
tikv:
image: pingcap/tikv:v4.0.8
image: pingcap/tikv:v4.0.9
config: |
# [storage]
# reserve-space = "2MB"
Expand Down Expand Up @@ -360,7 +360,7 @@ metadata:
spec:
.....
pd:
image: pingcap/pd:v4.0.8
image: pingcap/pd:v4.0.9
config:
lease: 3
enable-prevote: true
Expand All @@ -376,7 +376,7 @@ metadata:
spec:
.....
pd:
image: pingcap/pd:v4.0.8
image: pingcap/pd:v4.0.9
config: |
lease = 3
enable-prevote = true
Expand Down
6 changes: 3 additions & 3 deletions en/deploy-heterogeneous-tidb-cluster.md
View file
Open in desktop
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.8
version: v4.0.9
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.8
version: v4.0.9
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.8
version: v4.0.9
timezone: UTC
pvReclaimPolicy: Delete
discovery: {}
Expand Down
58 changes: 29 additions & 29 deletions en/deploy-on-general-kubernetes.md
View file
Open in desktop
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.8):
To deploy a TiDB cluster, you need the following Docker images (assuming the version of the TiDB cluster is v4.0.9):

```shell
pingcap/pd:v4.0.8
pingcap/tikv:v4.0.8
pingcap/tidb:v4.0.8
pingcap/tidb-binlog:v4.0.8
pingcap/ticdc:v4.0.8
pingcap/tiflash:v4.0.8
pingcap/pd:v4.0.9
pingcap/tikv:v4.0.9
pingcap/tidb:v4.0.9
pingcap/tidb-binlog:v4.0.9
pingcap/ticdc:v4.0.9
pingcap/tiflash:v4.0.9
pingcap/tidb-monitor-reloader:v1.0.1
pingcap/tidb-monitor-initializer:v4.0.8
pingcap/tidb-monitor-initializer:v4.0.9
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.8
docker pull pingcap/tikv:v4.0.8
docker pull pingcap/tidb:v4.0.8
docker pull pingcap/tidb-binlog:v4.0.8
docker pull pingcap/ticdc:v4.0.8
docker pull pingcap/tiflash:v4.0.8
docker pull pingcap/pd:v4.0.9
docker pull pingcap/tikv:v4.0.9
docker pull pingcap/tidb:v4.0.9
docker pull pingcap/tidb-binlog:v4.0.9
docker pull pingcap/ticdc:v4.0.9
docker pull pingcap/tiflash:v4.0.9
docker pull pingcap/tidb-monitor-reloader:v1.0.1
docker pull pingcap/tidb-monitor-initializer:v4.0.8
docker pull pingcap/tidb-monitor-initializer:v4.0.9
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.8.tar pingcap/pd:v4.0.8
docker save -o tikv-v4.0.8.tar pingcap/tikv:v4.0.8
docker save -o tidb-v4.0.8.tar pingcap/tidb:v4.0.8
docker save -o tidb-binlog-v4.0.8.tar pingcap/tidb-binlog:v4.0.8
docker save -o ticdc-v4.0.8.tar pingcap/ticdc:v4.0.8
docker save -o tiflash-v4.0.8.tar pingcap/tiflash:v4.0.8
docker save -o pd-v4.0.9.tar pingcap/pd:v4.0.9
docker save -o tikv-v4.0.9.tar pingcap/tikv:v4.0.9
docker save -o tidb-v4.0.9.tar pingcap/tidb:v4.0.9
docker save -o tidb-binlog-v4.0.9.tar pingcap/tidb-binlog:v4.0.9
docker save -o ticdc-v4.0.9.tar pingcap/ticdc:v4.0.9
docker save -o tiflash-v4.0.9.tar pingcap/tiflash:v4.0.9
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.8.tar pingcap/tidb-monitor-initializer:v4.0.8
docker save -o tidb-monitor-initializer-v4.0.9.tar pingcap/tidb-monitor-initializer:v4.0.9
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.8.tar
docker load -i tikv-v4.0.8.tar
docker load -i tidb-v4.0.8.tar
docker load -i tidb-binlog-v4.0.8.tar
docker load -i ticdc-v4.0.8.tar
docker load -i tiflash-v4.0.8.tar
docker load -i pd-v4.0.9.tar
docker load -i tikv-v4.0.9.tar
docker load -i tidb-v4.0.9.tar
docker load -i tidb-binlog-v4.0.9.tar
docker load -i ticdc-v4.0.9.tar
docker load -i tiflash-v4.0.9.tar
docker load -i tidb-monitor-reloader-v1.0.1.tar
docker load -i tidb-monitor-initializer-v4.0.8.tar
docker load -i tidb-monitor-initializer-v4.0.9.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
View file
Open in desktop
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.8
version: v4.0.9
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.8
version: v4.0.9
replicas: 1
storageClassName: local-storage
requests:
Expand Down Expand Up @@ -208,7 +208,7 @@ To deploy multiple drainers using the `tidb-drainer` Helm chart for a TiDB clust

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

```yaml
...
clusterVersion: v4.0.8
clusterVersion: v4.0.9
baseImage: pingcap/tidb-binlog-enterprise
...
```
Expand Down
4 changes: 2 additions & 2 deletions en/deploy-tidb-enterprise-edition.md
View file
Open in desktop
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.8
version: v4.0.9
...
pd:
baseImage: pingcap/pd-enterprise
Expand Down Expand Up @@ -56,7 +56,7 @@ spec:

```yaml
spec:
version: v4.0.8
version: v4.0.9
...
pd:
baseImage: pingcap/pd
Expand Down
Loading