cherry pick pingcap#928 to release-1.1

Signed-off-by: ti-srebot <[email protected]>
ti-srebot · Dec 21, 2020 · a3b9864 · a3b9864
1 parent fe3c4cf
commit a3b9864
Show file tree

Hide file tree

Showing 33 changed files with 131 additions and 131 deletions.
diff --git a/en/access-dashboard.md b/en/access-dashboard.md
@@ -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:

diff --git a/en/access-tidb.md b/en/access-tidb.md
@@ -86,7 +86,7 @@ kind: TidbCluster
 metadata:
   name: basic
 spec:
-  version: v4.0.8
+  version: v4.0.9
   pvReclaimPolicy: Retain
   discovery: {}
   pd:

diff --git a/en/advanced-statefulset.md b/en/advanced-statefulset.md
@@ -79,7 +79,7 @@ kind: TidbCluster
 metadata:
   name: asts
 spec:
-  version: v4.0.8
+  version: v4.0.9
   timezone: UTC
   pvReclaimPolicy: Delete
   pd:
@@ -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:
@@ -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:

diff --git a/en/configure-a-tidb-cluster.md b/en/configure-a-tidb-cluster.md
@@ -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
 
@@ -262,7 +262,7 @@ metadata:
 spec:
 ....
   tidb:
-    image: pingcap/tidb:v4.0.8
+    image: pingcap/tidb:v4.0.9
     imagePullPolicy: IfNotPresent
     replicas: 1
     service:
@@ -284,7 +284,7 @@ metadata:
 spec:
 ....
   tidb:
-    image: pingcap/tidb:v4.0.8
+    image: pingcap/tidb:v4.0.9
     imagePullPolicy: IfNotPresent
     replicas: 1
     service:
@@ -316,7 +316,7 @@ metadata:
 spec:
 ....
   tikv:
-    image: pingcap/tikv:v4.0.8
+    image: pingcap/tikv:v4.0.9
     config:
       log-level: "info"
       slow-log-threshold: "1s"
@@ -335,7 +335,7 @@ metadata:
 spec:
 ....
   tikv:
-    image: pingcap/tikv:v4.0.8
+    image: pingcap/tikv:v4.0.9
     config: |
       #  [storage]
       #    reserve-space = "2MB"
@@ -364,7 +364,7 @@ metadata:
 spec:
 .....
   pd:
-    image: pingcap/pd:v4.0.8
+    image: pingcap/pd:v4.0.9
     config:
       lease: 3
       enable-prevote: true
@@ -380,7 +380,7 @@ metadata:
 spec:
 .....
   pd:
-    image: pingcap/pd:v4.0.8
+    image: pingcap/pd:v4.0.9
     config: |
       lease = 3
       enable-prevote = true

diff --git a/en/deploy-heterogeneous-tidb-cluster.md b/en/deploy-heterogeneous-tidb-cluster.md
@@ -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: {}
@@ -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
@@ -133,7 +133,7 @@ spec:
   tlsCluster:
     enabled: true
   configUpdateStrategy: RollingUpdate
-  version: v4.0.8
+  version: v4.0.9
   timezone: UTC
   pvReclaimPolicy: Delete
   discovery: {}

diff --git a/en/deploy-on-general-kubernetes.md b/en/deploy-on-general-kubernetes.md
@@ -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
@@ -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
@@ -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

diff --git a/en/deploy-tidb-binlog.md b/en/deploy-tidb-binlog.md
@@ -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:
@@ -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:
@@ -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
@@ -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
     ...
     ```

diff --git a/en/deploy-tidb-enterprise-edition.md b/en/deploy-tidb-enterprise-edition.md
@@ -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
@@ -56,7 +56,7 @@ spec:
 
 ```yaml
 spec:
-  version: v4.0.8
+  version: v4.0.9
   ...
   pd:
     baseImage: pingcap/pd

diff --git a/en/enable-tls-between-components.md b/en/enable-tls-between-components.md
@@ -1109,7 +1109,7 @@ In this step, you need to perform the following operations:
     spec:
      tlsCluster:
        enabled: true
-     version: v4.0.8
+     version: v4.0.9
      timezone: UTC
      pvReclaimPolicy: Retain
      pd:
@@ -1165,7 +1165,7 @@ In this step, you need to perform the following operations:
        version: 6.0.1
      initializer:
        baseImage: pingcap/tidb-monitor-initializer
-       version: v4.0.8
+       version: v4.0.9
      reloader:
        baseImage: pingcap/tidb-monitor-reloader
        version: v1.0.1

diff --git a/en/enable-tls-for-mysql-client.md b/en/enable-tls-for-mysql-client.md
@@ -503,7 +503,7 @@ In this step, you create a TiDB cluster and perform the following operations:
           name: ${cluster_name}
           amespace: ${namespace}
         spec:
-          version: v4.0.8
+          version: v4.0.9
           timezone: UTC
           pvReclaimPolicy: Retain
           pd:

diff --git a/en/monitor-using-tidbmonitor.md b/en/monitor-using-tidbmonitor.md
@@ -49,7 +49,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
@@ -130,7 +130,7 @@ spec:
       type: NodePort
   initializer:
     baseImage: pingcap/tidb-monitor-initializer
-    version: v4.0.8
+    version: v4.0.9
   reloader:
     baseImage: pingcap/tidb-monitor-reloader
     version: v1.0.1
@@ -178,7 +178,7 @@ spec:
       type: NodePort
   initializer:
     baseImage: pingcap/tidb-monitor-initializer
-    version: v4.0.8
+    version: v4.0.9
   reloader:
     baseImage: pingcap/tidb-monitor-reloader
     version: v1.0.1
@@ -232,7 +232,7 @@ spec:
         foo: "bar"
   initializer:
     baseImage: pingcap/tidb-monitor-initializer
-    version: v4.0.8
+    version: v4.0.9
   reloader:
     baseImage: pingcap/tidb-monitor-reloader
     version: v1.0.1
@@ -269,7 +269,7 @@ spec:
       type: ClusterIP
   initializer:
     baseImage: pingcap/tidb-monitor-initializer
-    version: v4.0.8
+    version: v4.0.9
   reloader:
     baseImage: pingcap/tidb-monitor-reloader
     version: v1.0.1

diff --git a/en/notes-tidb-operator-v1.1.md b/en/notes-tidb-operator-v1.1.md
@@ -70,7 +70,7 @@ spec
   ...
   pump:
     baseImage: pingcap/tidb-binlog
-    version: v4.0.8
+    version: v4.0.9
     replicas: 1
     storageClassName: local-storage
     requests:

diff --git a/en/pd-recover.md b/en/pd-recover.md
@@ -18,7 +18,7 @@ aliases: ['/docs/tidb-in-kubernetes/stable/pd-recover/','/docs/tidb-in-kubernete
     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.8`.
+    In the command above, `${version}` is the version of the TiDB cluster, such as `v4.0.9`.
 
 2. Unpack the TiDB package for installation:
 

diff --git a/en/restart-a-tidb-cluster.md b/en/restart-a-tidb-cluster.md
@@ -32,7 +32,7 @@ kind: TidbCluster
 metadata:
   name: basic
 spec:
-  version: v4.0.8
+  version: v4.0.9
   timezone: UTC
   pvReclaimPolicy: Delete
   pd:

diff --git a/en/restore-data-using-tidb-lightning.md b/en/restore-data-using-tidb-lightning.md
@@ -42,7 +42,7 @@ You can deploy tikv-importer using the Helm chart. See the following example:
 
     ```yaml
     clusterName: demo
-    image: pingcap/tidb-lightning:v4.0.8
+    image: pingcap/tidb-lightning:v4.0.9
     imagePullPolicy: IfNotPresent
     storageClassName: local-storage
     storage: 20Gi