From d8ed84293209608ade78097ad32d7f82f81e5bff Mon Sep 17 00:00:00 2001 From: july2993 Date: Fri, 16 Oct 2020 14:28:16 +0800 Subject: [PATCH] en, zh: bump tidb version to 4.0.7 (#769) --- en/access-dashboard.md | 2 +- en/access-tidb.md | 2 +- en/advanced-statefulset.md | 6 +-- en/configure-a-tidb-cluster.md | 16 +++---- en/deploy-heterogeneous-tidb-cluster.md | 6 +-- en/deploy-on-general-kubernetes.md | 58 ++++++++++++------------- en/deploy-tidb-binlog.md | 8 ++-- en/deploy-tidb-enterprise-edition.md | 4 +- en/enable-tls-between-components.md | 4 +- en/enable-tls-for-mysql-client.md | 2 +- en/monitor-using-tidbmonitor.md | 10 ++--- en/notes-tidb-operator-v1.1.md | 2 +- en/pd-recover.md | 2 +- en/restart-a-tidb-cluster.md | 2 +- en/restore-data-using-tidb-lightning.md | 2 +- en/upgrade-a-tidb-cluster.md | 4 +- zh/access-dashboard.md | 2 +- zh/access-tidb.md | 2 +- zh/advanced-statefulset.md | 6 +-- zh/configure-a-tidb-cluster.md | 16 +++---- zh/deploy-heterogeneous-tidb-cluster.md | 6 +-- zh/deploy-on-gcp-gke.md | 2 +- zh/deploy-on-general-kubernetes.md | 58 ++++++++++++------------- zh/deploy-tidb-binlog.md | 8 ++-- zh/deploy-tidb-enterprise-edition.md | 4 +- zh/enable-tls-between-components.md | 4 +- zh/enable-tls-for-mysql-client.md | 2 +- zh/monitor-using-tidbmonitor.md | 12 ++--- zh/notes-tidb-operator-v1.1.md | 2 +- zh/pd-recover.md | 2 +- zh/restart-a-tidb-cluster.md | 2 +- zh/restore-data-using-tidb-lightning.md | 2 +- zh/upgrade-a-tidb-cluster.md | 4 +- 33 files changed, 132 insertions(+), 132 deletions(-) diff --git a/en/access-dashboard.md b/en/access-dashboard.md index e2919904c3..2da6d9ff55 100644 --- 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.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete pd: diff --git a/en/access-tidb.md b/en/access-tidb.md index c6781b3050..46ffda4820 100644 --- a/en/access-tidb.md +++ b/en/access-tidb.md @@ -86,7 +86,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v4.0.6 + version: v4.0.7 pvReclaimPolicy: Retain discovery: {} pd: diff --git a/en/advanced-statefulset.md b/en/advanced-statefulset.md index 0b58970e3f..90e712f0f1 100644 --- a/en/advanced-statefulset.md +++ b/en/advanced-statefulset.md @@ -79,7 +79,7 @@ kind: TidbCluster metadata: name: asts spec: - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete pd: @@ -128,7 +128,7 @@ metadata: tikv.tidb.pingcap.com/delete-slots: '[1]' name: asts spec: - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete pd: @@ -179,7 +179,7 @@ metadata: tikv.tidb.pingcap.com/delete-slots: '[]' name: asts spec: - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete pd: diff --git a/en/configure-a-tidb-cluster.md b/en/configure-a-tidb-cluster.md index e0e953e3b9..8de5c27868 100644 --- 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..baseImage` and `spec.version`, if you need to configure different versions for different components, you can configure `spec..version`. Here are the formats of the parameters: -- `spec.version`: the format is `imageTag`, such as `v4.0.6` +- `spec.version`: the format is `imageTag`, such as `v4.0.7` - `spec..baseImage`: the format is `imageName`, such as `pingcap/tidb` -- `spec..version`: the format is `imageTag`, such as `v4.0.6` +- `spec..version`: the format is `imageTag`, such as `v4.0.7` ### Recommended configuration @@ -184,7 +184,7 @@ metadata: spec: .... tidb: - image: pingcap/tidb:v4.0.6 + image: pingcap/tidb:v4.0.7 imagePullPolicy: IfNotPresent replicas: 1 service: @@ -206,7 +206,7 @@ metadata: spec: .... tidb: - image: pingcap/tidb:v4.0.6 + image: pingcap/tidb:v4.0.7 imagePullPolicy: IfNotPresent replicas: 1 service: @@ -238,7 +238,7 @@ metadata: spec: .... tikv: - image: pingcap/tikv:v4.0.6 + image: pingcap/tikv:v4.0.7 config: log-level: "info" slow-log-threshold: "1s" @@ -257,7 +257,7 @@ metadata: spec: .... tikv: - image: pingcap/tikv:v4.0.6 + image: pingcap/tikv:v4.0.7 config: | # [storage] # reserve-space = "2MB" @@ -286,7 +286,7 @@ metadata: spec: ..... pd: - image: pingcap/pd:v4.0.6 + image: pingcap/pd:v4.0.7 config: lease: 3 enable-prevote: true @@ -302,7 +302,7 @@ metadata: spec: ..... pd: - image: pingcap/pd:v4.0.6 + image: pingcap/pd:v4.0.7 config: | lease = 3 enable-prevote = true diff --git a/en/deploy-heterogeneous-tidb-cluster.md b/en/deploy-heterogeneous-tidb-cluster.md index ece0d6a622..eb96e6acd8 100644 --- 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.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete discovery: {} @@ -92,7 +92,7 @@ spec: version: 6.1.6 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.6 + version: v4.0.7 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 @@ -133,7 +133,7 @@ spec: tlsCluster: enabled: true configUpdateStrategy: RollingUpdate - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/en/deploy-on-general-kubernetes.md b/en/deploy-on-general-kubernetes.md index 762e49f381..126cc40b2a 100644 --- 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.6): + To deploy a TiDB cluster, you need the following Docker images (assuming the version of the TiDB cluster is v4.0.7): ```shell - pingcap/pd:v4.0.6 - pingcap/tikv:v4.0.6 - pingcap/tidb:v4.0.6 - pingcap/tidb-binlog:v4.0.6 - pingcap/ticdc:v4.0.6 - pingcap/tiflash:v4.0.6 + pingcap/pd:v4.0.7 + pingcap/tikv:v4.0.7 + pingcap/tidb:v4.0.7 + pingcap/tidb-binlog:v4.0.7 + pingcap/ticdc:v4.0.7 + pingcap/tiflash:v4.0.7 pingcap/tidb-monitor-reloader:v1.0.1 - pingcap/tidb-monitor-initializer:v4.0.6 + pingcap/tidb-monitor-initializer:v4.0.7 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.6 - docker pull pingcap/tikv:v4.0.6 - docker pull pingcap/tidb:v4.0.6 - docker pull pingcap/tidb-binlog:v4.0.6 - docker pull pingcap/ticdc:v4.0.6 - docker pull pingcap/tiflash:v4.0.6 + docker pull pingcap/pd:v4.0.7 + docker pull pingcap/tikv:v4.0.7 + docker pull pingcap/tidb:v4.0.7 + docker pull pingcap/tidb-binlog:v4.0.7 + docker pull pingcap/ticdc:v4.0.7 + docker pull pingcap/tiflash:v4.0.7 docker pull pingcap/tidb-monitor-reloader:v1.0.1 - docker pull pingcap/tidb-monitor-initializer:v4.0.6 + docker pull pingcap/tidb-monitor-initializer:v4.0.7 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.6.tar pingcap/pd:v4.0.6 - docker save -o tikv-v4.0.6.tar pingcap/tikv:v4.0.6 - docker save -o tidb-v4.0.6.tar pingcap/tidb:v4.0.6 - docker save -o tidb-binlog-v4.0.6.tar pingcap/tidb-binlog:v4.0.6 - docker save -o ticdc-v4.0.6.tar pingcap/ticdc:v4.0.6 - docker save -o tiflash-v4.0.6.tar pingcap/tiflash:v4.0.6 + docker save -o pd-v4.0.7.tar pingcap/pd:v4.0.7 + docker save -o tikv-v4.0.7.tar pingcap/tikv:v4.0.7 + docker save -o tidb-v4.0.7.tar pingcap/tidb:v4.0.7 + docker save -o tidb-binlog-v4.0.7.tar pingcap/tidb-binlog:v4.0.7 + docker save -o ticdc-v4.0.7.tar pingcap/ticdc:v4.0.7 + docker save -o tiflash-v4.0.7.tar pingcap/tiflash:v4.0.7 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.6.tar pingcap/tidb-monitor-initializer:v4.0.6 + docker save -o tidb-monitor-initializer-v4.0.7.tar pingcap/tidb-monitor-initializer:v4.0.7 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.6.tar - docker load -i tikv-v4.0.6.tar - docker load -i tidb-v4.0.6.tar - docker load -i tidb-binlog-v4.0.6.tar - docker load -i ticdc-v4.0.6.tar - docker load -i tiflash-v4.0.6.tar + docker load -i pd-v4.0.7.tar + docker load -i tikv-v4.0.7.tar + docker load -i tidb-v4.0.7.tar + docker load -i tidb-binlog-v4.0.7.tar + docker load -i ticdc-v4.0.7.tar + docker load -i tiflash-v4.0.7.tar docker load -i tidb-monitor-reloader-v1.0.1.tar - docker load -i tidb-monitor-initializer-v4.0.6.tar + docker load -i tidb-monitor-initializer-v4.0.7.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 index 6ab6c8aa1c..e562674583 100644 --- 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.6 + version: v4.0.7 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.6 + version: v4.0.7 replicas: 1 storageClassName: local-storage requests: @@ -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.6 + clusterVersion: v4.0.7 baseImage:pingcap/tidb-binlog storageClassName: local-storage storage: 10Gi @@ -228,7 +228,7 @@ To deploy multiple drainers using the `tidb-drainer` Helm chart for a TiDB clust ```yaml ... - clusterVersion: v4.0.6 + clusterVersion: v4.0.7 baseImage: pingcap/tidb-binlog-enterprise ... ``` diff --git a/en/deploy-tidb-enterprise-edition.md b/en/deploy-tidb-enterprise-edition.md index 8cdc324065..073c7b80d1 100644 --- 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.6 + version: v4.0.7 ... pd: baseImage: pingcap/pd-enterprise @@ -57,7 +57,7 @@ spec: ```yaml spec: - version: v4.0.6 + version: v4.0.7 ... pd: baseImage: pingcap/pd diff --git a/en/enable-tls-between-components.md b/en/enable-tls-between-components.md index d375275e74..57e417e521 100644 --- 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.6 + version: v4.0.7 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.6 + version: v4.0.7 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 index 6d2fb13c1d..89bfc54af1 100644 --- 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.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Retain pd: diff --git a/en/monitor-using-tidbmonitor.md b/en/monitor-using-tidbmonitor.md index 33bfebb780..ac22db4cff 100644 --- a/en/monitor-using-tidbmonitor.md +++ b/en/monitor-using-tidbmonitor.md @@ -49,7 +49,7 @@ spec: version: 6.0.1 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.6 + version: v4.0.7 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.6 + version: v4.0.7 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.6 + version: v4.0.7 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.6 + version: v4.0.7 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.6 + version: v4.0.7 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 index d7a7f02717..585a444844 100644 --- 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.6 + version: v4.0.7 replicas: 1 storageClassName: local-storage requests: diff --git a/en/pd-recover.md b/en/pd-recover.md index b6d53f0936..18054b1cc4 100644 --- a/en/pd-recover.md +++ b/en/pd-recover.md @@ -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.6`. + In the command above, `${version}` is the version of the TiDB cluster, such as `v4.0.7`. 2. Unpack the TiDB package for installation: diff --git a/en/restart-a-tidb-cluster.md b/en/restart-a-tidb-cluster.md index 77843d033e..ca25e3d3e8 100644 --- a/en/restart-a-tidb-cluster.md +++ b/en/restart-a-tidb-cluster.md @@ -26,7 +26,7 @@ If you find that the memory leak occurs in a Pod during use, you need to restart metadata: name: basic spec: - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete pd: diff --git a/en/restore-data-using-tidb-lightning.md b/en/restore-data-using-tidb-lightning.md index 225fc1e90d..bb9c34d9e3 100644 --- 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.6 + image: pingcap/tidb-lightning:v4.0.7 imagePullPolicy: IfNotPresent storageClassName: local-storage storage: 20Gi diff --git a/en/upgrade-a-tidb-cluster.md b/en/upgrade-a-tidb-cluster.md index 772e6e695b..5d4b98f74d 100644 --- a/en/upgrade-a-tidb-cluster.md +++ b/en/upgrade-a-tidb-cluster.md @@ -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.6` + - `spec.version`: the format is `imageTag`, such as `v4.0.7` - `spec..version`: the format is `imageTag`, such as `v3.1.0` @@ -87,7 +87,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 `.image` to the enterprise image. > - > For example, change `pd.image` from `pingcap/pd:v4.0.6` to `pingcap/pd-enterprise:v4.0.6`. + > For example, change `pd.image` from `pingcap/pd:v4.0.7` to `pingcap/pd-enterprise:v4.0.7`. 2. Run the `helm upgrade` command: diff --git a/zh/access-dashboard.md b/zh/access-dashboard.md index acdfacad9d..df99b00076 100644 --- a/zh/access-dashboard.md +++ b/zh/access-dashboard.md @@ -36,7 +36,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete pd: diff --git a/zh/access-tidb.md b/zh/access-tidb.md index 2898a0e044..0cadc4c9dc 100644 --- a/zh/access-tidb.md +++ b/zh/access-tidb.md @@ -85,7 +85,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v4.0.6 + version: v4.0.7 pvReclaimPolicy: Retain discovery: {} pd: diff --git a/zh/advanced-statefulset.md b/zh/advanced-statefulset.md index 58ed4333d4..2d7ae6e557 100644 --- a/zh/advanced-statefulset.md +++ b/zh/advanced-statefulset.md @@ -77,7 +77,7 @@ kind: TidbCluster metadata: name: asts spec: - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete pd: @@ -126,7 +126,7 @@ metadata: tikv.tidb.pingcap.com/delete-slots: '[1]' name: asts spec: - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete pd: @@ -177,7 +177,7 @@ metadata: tikv.tidb.pingcap.com/delete-slots: '[]' name: asts spec: - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete pd: diff --git a/zh/configure-a-tidb-cluster.md b/zh/configure-a-tidb-cluster.md index 9649f9a196..984351a5f6 100644 --- a/zh/configure-a-tidb-cluster.md +++ b/zh/configure-a-tidb-cluster.md @@ -41,9 +41,9 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/configure-a-tidb-cluster/','/zh/tidb- 相关参数的格式如下： -- `spec.version`，格式为 `imageTag`，例如 `v4.0.6` +- `spec.version`，格式为 `imageTag`，例如 `v4.0.7` - `spec..baseImage`，格式为 `imageName`，例如 `pingcap/tidb` -- `spec..version`，格式为 `imageTag`，例如 `v4.0.6` +- `spec..version`，格式为 `imageTag`，例如 `v4.0.7` ### 推荐配置 @@ -176,7 +176,7 @@ metadata: spec: .... tidb: - image: pingcap/tidb:v4.0.6 + image: pingcap/tidb:v4.0.7 imagePullPolicy: IfNotPresent replicas: 1 service: @@ -198,7 +198,7 @@ metadata: spec: .... tidb: - image: pingcap/tidb:v4.0.6 + image: pingcap/tidb:v4.0.7 imagePullPolicy: IfNotPresent replicas: 1 service: @@ -228,7 +228,7 @@ metadata: spec: .... tikv: - image: pingcap/tikv:v4.0.6 + image: pingcap/tikv:v4.0.7 config: {} replicas: 1 requests: @@ -245,7 +245,7 @@ metadata: spec: .... tikv: - image: pingcap/tikv:v4.0.6 + image: pingcap/tikv:v4.0.7 config: | # [storage] # reserve-space = "2MB" @@ -272,7 +272,7 @@ metadata: spec: ..... pd: - image: pingcap/pd:v4.0.6 + image: pingcap/pd:v4.0.7 config: lease: 3 enable-prevote: true @@ -288,7 +288,7 @@ metadata: spec: ..... pd: - image: pingcap/pd:v4.0.6 + image: pingcap/pd:v4.0.7 config: | lease = 3 enable-prevote = true diff --git a/zh/deploy-heterogeneous-tidb-cluster.md b/zh/deploy-heterogeneous-tidb-cluster.md index e92130ec1e..8710f75844 100644 --- a/zh/deploy-heterogeneous-tidb-cluster.md +++ b/zh/deploy-heterogeneous-tidb-cluster.md @@ -30,7 +30,7 @@ metadata: name: ${heterogeneous_cluster_name} spec: configUpdateStrategy: RollingUpdate - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete discovery: {} @@ -94,7 +94,7 @@ spec: version: 6.1.6 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.6 + version: v4.0.7 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 @@ -133,7 +133,7 @@ spec: tlsCluster: enabled: true configUpdateStrategy: RollingUpdate - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/zh/deploy-on-gcp-gke.md b/zh/deploy-on-gcp-gke.md index 68f4c658d9..9f485b9608 100644 --- a/zh/deploy-on-gcp-gke.md +++ b/zh/deploy-on-gcp-gke.md @@ -179,7 +179,7 @@ gcloud compute instances create bastion \ $ mysql -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-v4.0.6 TiDB Server (Apache License 2.0) Community Edition, MySQL 5.7 compatible + Server version: 5.7.25-TiDB-v4.0.7 TiDB Server (Apache License 2.0) Community Edition, MySQL 5.7 compatible Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others. diff --git a/zh/deploy-on-general-kubernetes.md b/zh/deploy-on-general-kubernetes.md index 70dc38af97..5894e88bf6 100644 --- a/zh/deploy-on-general-kubernetes.md +++ b/zh/deploy-on-general-kubernetes.md @@ -43,17 +43,17 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/deploy-on-general-kubernetes/'] 如果服务器没有外网，需要在有外网的机器上将 TiDB 集群用到的 Docker 镜像下载下来并上传到服务器上，然后使用 `docker load` 将 Docker 镜像安装到服务器上。 - 部署一套 TiDB 集群会用到下面这些 Docker 镜像（假设 TiDB 集群的版本是 v4.0.6）： + 部署一套 TiDB 集群会用到下面这些 Docker 镜像（假设 TiDB 集群的版本是 v4.0.7）： ```shell - pingcap/pd:v4.0.6 - pingcap/tikv:v4.0.6 - pingcap/tidb:v4.0.6 - pingcap/tidb-binlog:v4.0.6 - pingcap/ticdc:v4.0.6 - pingcap/tiflash:v4.0.6 + pingcap/pd:v4.0.7 + pingcap/tikv:v4.0.7 + pingcap/tidb:v4.0.7 + pingcap/tidb-binlog:v4.0.7 + pingcap/ticdc:v4.0.7 + pingcap/tiflash:v4.0.7 pingcap/tidb-monitor-reloader:v1.0.1 - pingcap/tidb-monitor-initializer:v4.0.6 + pingcap/tidb-monitor-initializer:v4.0.7 grafana/grafana:6.0.1 prom/prometheus:v2.18.1 busybox:1.26.2 @@ -64,26 +64,26 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/deploy-on-general-kubernetes/'] {{< copyable "shell-regular" >}} ```shell - docker pull pingcap/pd:v4.0.6 - docker pull pingcap/tikv:v4.0.6 - docker pull pingcap/tidb:v4.0.6 - docker pull pingcap/tidb-binlog:v4.0.6 - docker pull pingcap/ticdc:v4.0.6 - docker pull pingcap/tiflash:v4.0.6 + docker pull pingcap/pd:v4.0.7 + docker pull pingcap/tikv:v4.0.7 + docker pull pingcap/tidb:v4.0.7 + docker pull pingcap/tidb-binlog:v4.0.7 + docker pull pingcap/ticdc:v4.0.7 + docker pull pingcap/tiflash:v4.0.7 docker pull pingcap/tidb-monitor-reloader:v1.0.1 - docker pull pingcap/tidb-monitor-initializer:v4.0.6 + docker pull pingcap/tidb-monitor-initializer:v4.0.7 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.6.tar pingcap/pd:v4.0.6 - docker save -o tikv-v4.0.6.tar pingcap/tikv:v4.0.6 - docker save -o tidb-v4.0.6.tar pingcap/tidb:v4.0.6 - docker save -o tidb-binlog-v4.0.6.tar pingcap/tidb-binlog:v4.0.6 - docker save -o ticdc-v4.0.6.tar pingcap/ticdc:v4.0.6 - docker save -o tiflash-v4.0.6.tar pingcap/tiflash:v4.0.6 + docker save -o pd-v4.0.7.tar pingcap/pd:v4.0.7 + docker save -o tikv-v4.0.7.tar pingcap/tikv:v4.0.7 + docker save -o tidb-v4.0.7.tar pingcap/tidb:v4.0.7 + docker save -o tidb-binlog-v4.0.7.tar pingcap/tidb-binlog:v4.0.7 + docker save -o ticdc-v4.0.7.tar pingcap/ticdc:v4.0.7 + docker save -o tiflash-v4.0.7.tar pingcap/tiflash:v4.0.7 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.6.tar pingcap/tidb-monitor-initializer:v4.0.6 + docker save -o tidb-monitor-initializer-v4.0.7.tar pingcap/tidb-monitor-initializer:v4.0.7 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 @@ -94,14 +94,14 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/deploy-on-general-kubernetes/'] {{< copyable "shell-regular" >}} ```shell - docker load -i pd-v4.0.6.tar - docker load -i tikv-v4.0.6.tar - docker load -i tidb-v4.0.6.tar - docker load -i tidb-binlog-v4.0.6.tar - docker load -i ticdc-v4.0.6.tar - docker load -i tiflash-v4.0.6.tar + docker load -i pd-v4.0.7.tar + docker load -i tikv-v4.0.7.tar + docker load -i tidb-v4.0.7.tar + docker load -i tidb-binlog-v4.0.7.tar + docker load -i ticdc-v4.0.7.tar + docker load -i tiflash-v4.0.7.tar docker load -i tidb-monitor-reloader-v1.0.1.tar - docker load -i tidb-monitor-initializer-v4.0.6.tar + docker load -i tidb-monitor-initializer-v4.0.7.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/zh/deploy-tidb-binlog.md b/zh/deploy-tidb-binlog.md index 650e75dca9..992bf5ef99 100644 --- a/zh/deploy-tidb-binlog.md +++ b/zh/deploy-tidb-binlog.md @@ -26,7 +26,7 @@ spec ... pump: baseImage: pingcap/tidb-binlog - version: v4.0.6 + version: v4.0.7 replicas: 1 storageClassName: local-storage requests: @@ -45,7 +45,7 @@ spec ... pump: baseImage: pingcap/tidb-binlog - version: v4.0.6 + version: v4.0.7 replicas: 1 storageClassName: local-storage requests: @@ -192,7 +192,7 @@ spec: ```yaml clusterName: example-tidb - clusterVersion: v4.0.6 + clusterVersion: v4.0.7 baseImage: pingcap/tidb-binlog storageClassName: local-storage storage: 10Gi @@ -222,7 +222,7 @@ spec: ```yaml ... - clusterVersion: v4.0.6 + clusterVersion: v4.0.7 baseImage: pingcap/tidb-binlog-enterprise ... ``` diff --git a/zh/deploy-tidb-enterprise-edition.md b/zh/deploy-tidb-enterprise-edition.md index becf12c6e8..a513403aed 100644 --- a/zh/deploy-tidb-enterprise-edition.md +++ b/zh/deploy-tidb-enterprise-edition.md @@ -21,7 +21,7 @@ summary: 了解如何在 Kubernetes 上部署 TiDB 企业版。 ```yaml spec: - version: v4.0.6 + version: v4.0.7 ... pd: baseImage: pingcap/pd-enterprise @@ -55,7 +55,7 @@ TiDB Operator 会自动通过滚动升级的方式将集群镜像更新为企业 ```yaml spec: - version: v4.0.6 + version: v4.0.7 ... pd: baseImage: pingcap/pd diff --git a/zh/enable-tls-between-components.md b/zh/enable-tls-between-components.md index abe335be83..303fa6184f 100644 --- a/zh/enable-tls-between-components.md +++ b/zh/enable-tls-between-components.md @@ -1090,7 +1090,7 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/enable-tls-between-components/'] spec: tlsCluster: enabled: true - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Retain pd: @@ -1146,7 +1146,7 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/enable-tls-between-components/'] version: 6.0.1 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.6 + version: v4.0.7 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/zh/enable-tls-for-mysql-client.md b/zh/enable-tls-for-mysql-client.md index 7b3b73f8b2..e49de57464 100644 --- a/zh/enable-tls-for-mysql-client.md +++ b/zh/enable-tls-for-mysql-client.md @@ -497,7 +497,7 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/enable-tls-for-mysql-client/'] name: ${cluster_name} namespace: ${namespace} spec: - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Retain pd: diff --git a/zh/monitor-using-tidbmonitor.md b/zh/monitor-using-tidbmonitor.md index aa657a90ef..4db012ef7a 100644 --- a/zh/monitor-using-tidbmonitor.md +++ b/zh/monitor-using-tidbmonitor.md @@ -47,7 +47,7 @@ spec: version: 6.0.1 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.6 + version: v4.0.7 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 @@ -120,7 +120,7 @@ spec: type: NodePort initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.6 + version: v4.0.7 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 @@ -163,7 +163,7 @@ spec: type: NodePort initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.6 + version: v4.0.7 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 @@ -213,7 +213,7 @@ spec: foo: "bar" initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.6 + version: v4.0.7 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 @@ -250,7 +250,7 @@ spec: type: ClusterIP initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.6 + version: v4.0.7 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 @@ -302,7 +302,7 @@ spec: type: NodePort initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.6 + version: v4.0.7 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/zh/notes-tidb-operator-v1.1.md b/zh/notes-tidb-operator-v1.1.md index 05c0472b41..ee52fe41d5 100644 --- a/zh/notes-tidb-operator-v1.1.md +++ b/zh/notes-tidb-operator-v1.1.md @@ -65,7 +65,7 @@ spec ... pump: baseImage: pingcap/tidb-binlog - version: v4.0.6 + version: v4.0.7 replicas: 1 storageClassName: local-storage requests: diff --git a/zh/pd-recover.md b/zh/pd-recover.md index d23de39bb4..50b0fde6c6 100644 --- a/zh/pd-recover.md +++ b/zh/pd-recover.md @@ -18,7 +18,7 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/pd-recover/'] wget https://download.pingcap.org/tidb-${version}-linux-amd64.tar.gz ``` - `${version}` 是 TiDB 集群版本，例如，`v4.0.6`。 + `${version}` 是 TiDB 集群版本，例如，`v4.0.7`。 2. 解压安装包： diff --git a/zh/restart-a-tidb-cluster.md b/zh/restart-a-tidb-cluster.md index 3b23f4fcda..01d94bfdd5 100644 --- a/zh/restart-a-tidb-cluster.md +++ b/zh/restart-a-tidb-cluster.md @@ -22,7 +22,7 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/restart-a-tidb-cluster/'] metadata: name: basic spec: - version: v4.0.6 + version: v4.0.7 timezone: UTC pvReclaimPolicy: Delete pd: diff --git a/zh/restore-data-using-tidb-lightning.md b/zh/restore-data-using-tidb-lightning.md index b1e58185ee..64a167e9f9 100644 --- a/zh/restore-data-using-tidb-lightning.md +++ b/zh/restore-data-using-tidb-lightning.md @@ -42,7 +42,7 @@ TiDB Lightning 包含两个组件：tidb-lightning 和 tikv-importer。在 Kuber ```yaml clusterName: demo - image: pingcap/tidb-lightning:v4.0.6 + image: pingcap/tidb-lightning:v4.0.7 imagePullPolicy: IfNotPresent storageClassName: local-storage storage: 20Gi diff --git a/zh/upgrade-a-tidb-cluster.md b/zh/upgrade-a-tidb-cluster.md index 05c259b556..88b1b8953a 100644 --- a/zh/upgrade-a-tidb-cluster.md +++ b/zh/upgrade-a-tidb-cluster.md @@ -26,7 +26,7 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/upgrade-a-tidb-cluster/'] `version` 字段格式如下： - - `spec.version`，格式为 `imageTag`，例如 `v4.0.6` + - `spec.version`，格式为 `imageTag`，例如 `v4.0.7` - `spec..version`，格式为 `imageTag`，例如 `v3.1.0` {{< copyable "shell-regular" >}} @@ -105,7 +105,7 @@ kubectl annotate --overwrite tc ${cluster_name} -n ${namespace} tidb.pingcap.com > > 如果需要升级到企业版，需要把 `.image` 的值改为企业版镜像。 > -> 例如将 `pd.image` 从 `pingcap/pd:v4.0.6` 修改为 `pingcap/pd-enterprise:v4.0.6`。 +> 例如将 `pd.image` 从 `pingcap/pd:v4.0.7` 修改为 `pingcap/pd-enterprise:v4.0.7`。 ### 强制升级 TiDB 集群