This is an automated cherry-pick of #2432

Signed-off-by: ti-chi-bot <[email protected]>
pingcap · Oct 18, 2023 · d5d5c51 · d5d5c51
1 parent 150a7c3
commit d5d5c51
Show file tree

Hide file tree

Showing 46 changed files with 206 additions and 166 deletions.
diff --git a/en/access-dashboard.md b/en/access-dashboard.md
@@ -238,7 +238,7 @@ To enable this feature, you need to deploy TidbNGMonitoring CR using TiDB Operat
       ngMonitoring:
         requests:
           storage: 10Gi
-        version: v7.1.0
+        version: v7.1.1
         # storageClassName: default
         baseImage: pingcap/ng-monitoring
     EOF

diff --git a/en/advanced-statefulset.md b/en/advanced-statefulset.md
@@ -95,7 +95,7 @@ kind: TidbCluster
 metadata:
   name: asts
 spec:
-  version: v7.1.0
+  version: v7.1.1
   timezone: UTC
   pvReclaimPolicy: Delete
   pd:
@@ -147,7 +147,7 @@ metadata:
     tikv.tidb.pingcap.com/delete-slots: '[1]'
   name: asts
 spec:
-  version: v7.1.0
+  version: v7.1.1
   timezone: UTC
   pvReclaimPolicy: Delete
   pd:
@@ -201,7 +201,7 @@ metadata:
     tikv.tidb.pingcap.com/delete-slots: '[]'
   name: asts
 spec:
-  version: v7.1.0
+  version: v7.1.1
   timezone: UTC
   pvReclaimPolicy: Delete
   pd:

diff --git a/en/aggregate-multiple-cluster-monitor-data.md b/en/aggregate-multiple-cluster-monitor-data.md
@@ -170,7 +170,7 @@ spec:
     version: 7.5.11
   initializer:
     baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb-monitor-initializer
-    version: v7.1.0
+    version: v7.1.1
   reloader:
     baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb-monitor-reloader
     version: v1.0.1

diff --git a/en/backup-restore-cr.md b/en/backup-restore-cr.md
@@ -20,11 +20,16 @@ This section introduces the fields in the `Backup` CR.
 
     - When using BR for backup, you can specify the BR version in this field.
         - If the field is not specified or the value is empty, the `pingcap/br:${tikv_version}` image is used for backup by default.
-        - If the BR version is specified in this field, such as `.spec.toolImage: pingcap/br:v7.1.0`, the image of the specified version is used for backup.
+        - If the BR version is specified in this field, such as `.spec.toolImage: pingcap/br:v7.1.1`, the image of the specified version is used for backup.
         - If an image is specified without the version, such as `.spec.toolImage: private/registry/br`, the `private/registry/br:${tikv_version}` image is used for backup.
     - When using Dumpling for backup, you can specify the Dumpling version in this field.
+<<<<<<< HEAD
         - If the Dumpling version is specified in this field, such as `spec.toolImage: pingcap/dumpling:v7.1.0`, the image of the specified version is used for backup.
         - If the field is not specified, the Dumpling version specified in `TOOLKIT_VERSION` of the [Backup Manager Dockerfile](https://github.com/pingcap/tidb-operator/blob/v1.5.0/images/tidb-backup-manager/Dockerfile) is used for backup by default.
+=======
+        - If the Dumpling version is specified in this field, such as `spec.toolImage: pingcap/dumpling:v7.1.1`, the image of the specified version is used for backup.
+        - If the field is not specified, the Dumpling version specified in `TOOLKIT_VERSION` of the [Backup Manager Dockerfile](https://github.com/pingcap/tidb-operator/blob/master/images/tidb-backup-manager/Dockerfile) is used for backup by default.
+>>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
 
 * `.spec.backupType`: the backup type. This field is valid only when you use BR for backup. Currently, the following three types are supported, and this field can be combined with the `.spec.tableFilter` field to configure table filter rules:
     * `full`: back up all databases in a TiDB cluster.
@@ -260,8 +265,13 @@ This section introduces the fields in the `Restore` CR.
 * `.spec.metadata.namespace`: the namespace where the `Restore` CR is located.
 * `.spec.toolImage`：the tools image used by `Restore`. TiDB Operator supports this configuration starting from v1.1.9.
 
+<<<<<<< HEAD
     - When using BR for restoring, you can specify the BR version in this field. For example,`spec.toolImage: pingcap/br:v7.1.0`. If not specified, `pingcap/br:${tikv_version}` is used for restoring by default.
     - When using Lightning for restoring, you can specify the Lightning version in this field. For example, `spec.toolImage: pingcap/lightning:v7.1.0`. If not specified, the Lightning version specified in `TOOLKIT_VERSION` of the [Backup Manager Dockerfile](https://github.com/pingcap/tidb-operator/blob/v1.5.0/images/tidb-backup-manager/Dockerfile) is used for restoring by default.
+=======
+    - When using BR for restoring, you can specify the BR version in this field. For example,`spec.toolImage: pingcap/br:v7.1.1`. If not specified, `pingcap/br:${tikv_version}` is used for restoring by default.
+    - When using Lightning for restoring, you can specify the Lightning version in this field. For example, `spec.toolImage: pingcap/lightning:v7.1.1`. If not specified, the Lightning version specified in `TOOLKIT_VERSION` of the [Backup Manager Dockerfile](https://github.com/pingcap/tidb-operator/blob/master/images/tidb-backup-manager/Dockerfile) is used for restoring by default.
+>>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
 
 * `.spec.backupType`: the restore type. This field is valid only when you use BR to restore data. Currently, the following three types are supported, and this field can be combined with the `.spec.tableFilter` field to configure table filter rules:
     * `full`: restore all databases in a TiDB cluster.

diff --git a/en/backup-restore-faq.md b/en/backup-restore-faq.md
@@ -186,7 +186,7 @@ Solution:
 
 2. Edit the configuration file of the TiDB cluster and increase the value of TiKV's `keepalive`:
 
-    ```shell
+    ```yaml
     config: |
       [server]
         grpc-keepalive-time = "500s"
@@ -208,7 +208,7 @@ Solution:
       backupType: full
       restoreMode: volume-snapshot
       serviceAccount: tidb-backup-manager
-      toolImage: pingcap/br:v7.1.0
+      toolImage: pingcap/br:v7.1.1
       br:
         cluster: basic
         clusterNamespace: tidb-cluster

diff --git a/en/configure-a-tidb-cluster.md b/en/configure-a-tidb-cluster.md
@@ -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 `v7.1.0`
+- `spec.version`: the format is `imageTag`, such as `v7.1.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 `v7.1.0`
+- `spec.<pd/tidb/tikv/pump/tiflash/ticdc>.version`: the format is `imageTag`, such as `v7.1.1`
 
 ### Recommended configuration
 

diff --git a/en/deploy-cluster-on-arm64.md b/en/deploy-cluster-on-arm64.md
@@ -38,7 +38,7 @@ Before starting the process, make sure that Kubernetes clusters are deployed on
     name: ${cluster_name}
     namespace: ${cluster_namespace}
   spec:
-    version: "v7.1.0"
+    version: "v7.1.1"
     # ...
     helper:
       image: busybox:1.33.0

diff --git a/en/deploy-heterogeneous-tidb-cluster.md b/en/deploy-heterogeneous-tidb-cluster.md
@@ -48,7 +48,7 @@ To deploy a heterogeneous cluster, do the following:
       name: ${heterogeneous_cluster_name}
     spec:
       configUpdateStrategy: RollingUpdate
-      version: v7.1.0
+      version: v7.1.1
       timezone: UTC
       pvReclaimPolicy: Delete
       discovery: {}
@@ -129,7 +129,7 @@ After creating certificates, take the following steps to deploy a TLS-enabled he
       tlsCluster:
         enabled: true
       configUpdateStrategy: RollingUpdate
-      version: v7.1.0
+      version: v7.1.1
       timezone: UTC
       pvReclaimPolicy: Delete
       discovery: {}
@@ -218,7 +218,7 @@ If you need to deploy a monitoring component for a heterogeneous cluster, take t
         version: 7.5.11
     initializer:
         baseImage: pingcap/tidb-monitor-initializer
-        version: v7.1.0
+        version: v7.1.1
     reloader:
         baseImage: pingcap/tidb-monitor-reloader
         version: v1.0.1

diff --git a/en/deploy-on-aws-eks.md b/en/deploy-on-aws-eks.md
@@ -461,7 +461,7 @@ After the bastion host is created, you can connect to the bastion host via SSH a
     $ mysql --comments -h abfc623004ccb4cc3b363f3f37475af1-9774d22c27310bc1.elb.us-west-2.amazonaws.com -P 4000 -u root
     Welcome to the MariaDB monitor.  Commands end with ; or \g.
     Your MySQL connection id is 1189
-    Server version: 5.7.25-TiDB-v7.1.0 TiDB Server (Apache License 2.0) Community Edition, MySQL 5.7 compatible
+    Server version: 5.7.25-TiDB-v7.1.1 TiDB Server (Apache License 2.0) Community Edition, MySQL 5.7 compatible
 
     Copyright (c) 2000, 2022, Oracle and/or its affiliates.
 

diff --git a/en/deploy-on-azure-aks.md b/en/deploy-on-azure-aks.md
@@ -342,7 +342,7 @@ After access to the internal host via SSH, you can access the TiDB cluster throu
     $ mysql --comments -h 20.240.0.7 -P 4000 -u root
     Welcome to the MariaDB monitor.  Commands end with ; or \g.
     Your MySQL connection id is 1189
-    Server version: 5.7.25-TiDB-v7.1.0 TiDB Server (Apache License 2.0) Community Edition, MySQL 5.7 compatible
+    Server version: 5.7.25-TiDB-v7.1.1 TiDB Server (Apache License 2.0) Community Edition, MySQL 5.7 compatible
 
     Copyright (c) 2000, 2022, Oracle and/or its affiliates.
 

diff --git a/en/deploy-on-gcp-gke.md b/en/deploy-on-gcp-gke.md
@@ -279,7 +279,7 @@ After the bastion host is created, you can connect to the bastion host via SSH a
     $ mysql --comments -h 10.128.15.243 -P 4000 -u root
     Welcome to the MariaDB monitor.  Commands end with ; or \g.
     Your MySQL connection id is 7823
-    Server version: 5.7.25-TiDB-v7.1.0 TiDB Server (Apache License 2.0) Community Edition, MySQL 5.7 compatible
+    Server version: 5.7.25-TiDB-v7.1.1 TiDB Server (Apache License 2.0) Community Edition, MySQL 5.7 compatible
 
     Copyright (c) 2000, 2022, Oracle and/or its affiliates.
 

diff --git a/en/deploy-on-general-kubernetes.md b/en/deploy-on-general-kubernetes.md
@@ -42,18 +42,23 @@ This document describes how to deploy a TiDB cluster on 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 v7.1.0):
+    To deploy a TiDB cluster, you need the following Docker images (assuming the version of the TiDB cluster is v7.1.1):
 
     ```shell
-    pingcap/pd:v7.1.0
-    pingcap/tikv:v7.1.0
-    pingcap/tidb:v7.1.0
-    pingcap/tidb-binlog:v7.1.0
-    pingcap/ticdc:v7.1.0
-    pingcap/tiflash:v7.1.0
+    pingcap/pd:v7.1.1
+    pingcap/tikv:v7.1.1
+    pingcap/tidb:v7.1.1
+    pingcap/tidb-binlog:v7.1.1
+    pingcap/ticdc:v7.1.1
+    pingcap/tiflash:v7.1.1
     pingcap/tidb-monitor-reloader:v1.0.1
+<<<<<<< HEAD
     pingcap/tidb-monitor-initializer:v7.1.0
     grafana/grafana:7.5.11
+=======
+    pingcap/tidb-monitor-initializer:v7.1.1
+    grafana/grafana:6.0.1
+>>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
     prom/prometheus:v2.18.1
     busybox:1.26.2
     ```
@@ -63,27 +68,37 @@ This document describes how to deploy a TiDB cluster on general Kubernetes.
     {{< copyable "shell-regular" >}}
 
     ```shell
-    docker pull pingcap/pd:v7.1.0
-    docker pull pingcap/tikv:v7.1.0
-    docker pull pingcap/tidb:v7.1.0
-    docker pull pingcap/tidb-binlog:v7.1.0
-    docker pull pingcap/ticdc:v7.1.0
-    docker pull pingcap/tiflash:v7.1.0
+    docker pull pingcap/pd:v7.1.1
+    docker pull pingcap/tikv:v7.1.1
+    docker pull pingcap/tidb:v7.1.1
+    docker pull pingcap/tidb-binlog:v7.1.1
+    docker pull pingcap/ticdc:v7.1.1
+    docker pull pingcap/tiflash:v7.1.1
     docker pull pingcap/tidb-monitor-reloader:v1.0.1
+<<<<<<< HEAD
     docker pull pingcap/tidb-monitor-initializer:v7.1.0
     docker pull grafana/grafana:7.5.11
+=======
+    docker pull pingcap/tidb-monitor-initializer:v7.1.1
+    docker pull grafana/grafana:6.0.1
+>>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
     docker pull prom/prometheus:v2.18.1
     docker pull busybox:1.26.2
 
-    docker save -o pd-v7.1.0.tar pingcap/pd:v7.1.0
-    docker save -o tikv-v7.1.0.tar pingcap/tikv:v7.1.0
-    docker save -o tidb-v7.1.0.tar pingcap/tidb:v7.1.0
-    docker save -o tidb-binlog-v7.1.0.tar pingcap/tidb-binlog:v7.1.0
-    docker save -o ticdc-v7.1.0.tar pingcap/ticdc:v7.1.0
-    docker save -o tiflash-v7.1.0.tar pingcap/tiflash:v7.1.0
+    docker save -o pd-v7.1.1.tar pingcap/pd:v7.1.1
+    docker save -o tikv-v7.1.1.tar pingcap/tikv:v7.1.1
+    docker save -o tidb-v7.1.1.tar pingcap/tidb:v7.1.1
+    docker save -o tidb-binlog-v7.1.1.tar pingcap/tidb-binlog:v7.1.1
+    docker save -o ticdc-v7.1.1.tar pingcap/ticdc:v7.1.1
+    docker save -o tiflash-v7.1.1.tar pingcap/tiflash:v7.1.1
     docker save -o tidb-monitor-reloader-v1.0.1.tar pingcap/tidb-monitor-reloader:v1.0.1
+<<<<<<< HEAD
     docker save -o tidb-monitor-initializer-v7.1.0.tar pingcap/tidb-monitor-initializer:v7.1.0
     docker save -o grafana-7.5.11.tar grafana/grafana:7.5.11
+=======
+    docker save -o tidb-monitor-initializer-v7.1.1.tar pingcap/tidb-monitor-initializer:v7.1.1
+    docker save -o grafana-6.0.1.tar grafana/grafana:6.0.1
+>>>>>>> cf63ac66 (en,zh: Bump tidb components to v7.1.1 (#2432))
     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 +108,14 @@ This document describes how to deploy a TiDB cluster on general Kubernetes.
     {{< copyable "shell-regular" >}}
 
     ```shell
-    docker load -i pd-v7.1.0.tar
-    docker load -i tikv-v7.1.0.tar
-    docker load -i tidb-v7.1.0.tar
-    docker load -i tidb-binlog-v7.1.0.tar
-    docker load -i ticdc-v7.1.0.tar
-    docker load -i tiflash-v7.1.0.tar
+    docker load -i pd-v7.1.1.tar
+    docker load -i tikv-v7.1.1.tar
+    docker load -i tidb-v7.1.1.tar
+    docker load -i tidb-binlog-v7.1.1.tar
+    docker load -i ticdc-v7.1.1.tar
+    docker load -i tiflash-v7.1.1.tar
     docker load -i tidb-monitor-reloader-v1.0.1.tar
-    docker load -i tidb-monitor-initializer-v7.1.0.tar
+    docker load -i tidb-monitor-initializer-v7.1.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

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: v7.1.0
+        version: v7.1.1
         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: v7.1.0
+        version: v7.1.1
         replicas: 1
         storageClassName: local-storage
         requests:
@@ -188,7 +188,7 @@ To deploy multiple drainers using the `tidb-drainer` Helm chart for a TiDB clust
 
     ```yaml
     clusterName: example-tidb
-    clusterVersion: v7.1.0
+    clusterVersion: v7.1.1
     baseImage:pingcap/tidb-binlog
     storageClassName: local-storage
     storage: 10Gi

diff --git a/en/deploy-tidb-cluster-across-multiple-kubernetes.md b/en/deploy-tidb-cluster-across-multiple-kubernetes.md
@@ -52,7 +52,7 @@ kind: TidbCluster
 metadata:
   name: "${tc_name_1}"
 spec:
-  version: v7.1.0
+  version: v7.1.1
   timezone: UTC
   pvReclaimPolicy: Delete
   enableDynamicConfiguration: true
@@ -106,7 +106,7 @@ kind: TidbCluster
 metadata:
   name: "${tc_name_2}"
 spec:
-  version: v7.1.0
+  version: v7.1.1
   timezone: UTC
   pvReclaimPolicy: Delete
   enableDynamicConfiguration: true
@@ -383,7 +383,7 @@ kind: TidbCluster
 metadata:
   name: "${tc_name_1}"
 spec:
-  version: v7.1.0
+  version: v7.1.1
   timezone: UTC
   tlsCluster:
    enabled: true
@@ -441,7 +441,7 @@ kind: TidbCluster
 metadata:
   name: "${tc_name_2}"
 spec:
-  version: v7.1.0
+  version: v7.1.1
   timezone: UTC
   tlsCluster:
    enabled: true

diff --git a/en/deploy-tidb-dm.md b/en/deploy-tidb-dm.md
@@ -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 `v7.1.0`.
+- `spec.version`: the format is `imageTag`, such as `v7.1.1`.
 - `spec.<master/worker>.baseImage`: the format is `imageName`, such as `pingcap/dm`.
-- `spec.<master/worker>.version`: the format is `imageTag`, such as `v7.1.0`.
+- `spec.<master/worker>.version`: the format is `imageTag`, such as `v7.1.1`.
 
 TiDB Operator only supports deploying DM 2.0 and later versions.
 
@@ -50,7 +50,7 @@ metadata:
   name: ${dm_cluster_name}
   namespace: ${namespace}
 spec:
-  version: v7.1.0
+  version: v7.1.1
   configUpdateStrategy: RollingUpdate
   pvReclaimPolicy: Retain
   discovery: {}
@@ -141,27 +141,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 v7.1.0):
+1. Deploy a DM cluster requires the following Docker image (assuming the version of the DM cluster is v7.1.1):
 
     ```shell
-    pingcap/dm:v7.1.0
+    pingcap/dm:v7.1.1
     ```
 
 2. To download the image, execute the following command:
 
     {{< copyable "shell-regular" >}}
 
     ```shell
-    docker pull pingcap/dm:v7.1.0
-    docker save -o dm-v7.1.0.tar pingcap/dm:v7.1.0
+    docker pull pingcap/dm:v7.1.1
+    docker save -o dm-v7.1.1.tar pingcap/dm:v7.1.1
     ```
 
 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-v7.1.0.tar
+    docker load -i dm-v7.1.1.tar
     ```
 
 After deploying the DM cluster, execute the following command to view the Pod status: