From af2b5806766e931b00ab633d4bc4746373ac7941 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Tue, 27 Aug 2024 13:25:45 +0800 Subject: [PATCH] zh,en: remove spec.from for Backup and spec.to for Restore (#2614) (#2616) --- en/backup-to-aws-s3-using-br.md | 60 ----------------------------- en/backup-to-azblob-using-br.md | 42 -------------------- en/backup-to-gcs-using-br.md | 36 ----------------- en/backup-to-pv-using-br.md | 46 +++------------------- en/enable-tls-between-components.md | 10 ----- en/enable-tls-for-mysql-client.md | 22 +++-------- en/restore-from-aws-s3-using-br.md | 18 --------- en/restore-from-azblob-using-br.md | 6 --- en/restore-from-gcs-using-br.md | 6 --- en/restore-from-pv-using-br.md | 6 --- zh/backup-to-aws-s3-using-br.md | 60 ----------------------------- zh/backup-to-azblob-using-br.md | 42 -------------------- zh/backup-to-gcs-using-br.md | 36 ----------------- zh/backup-to-pv-using-br.md | 46 +++------------------- zh/enable-tls-between-components.md | 10 ----- zh/enable-tls-for-mysql-client.md | 16 +------- zh/restore-from-aws-s3-using-br.md | 18 --------- zh/restore-from-azblob-using-br.md | 6 --- zh/restore-from-gcs-using-br.md | 6 --- zh/restore-from-pv-using-br.md | 6 --- 20 files changed, 17 insertions(+), 481 deletions(-) diff --git a/en/backup-to-aws-s3-using-br.md b/en/backup-to-aws-s3-using-br.md index e8370d67d..59ad5b4bb 100644 --- a/en/backup-to-aws-s3-using-br.md +++ b/en/backup-to-aws-s3-using-br.md @@ -109,12 +109,6 @@ Depending on which method you choose to grant permissions to the remote storage # sendCredToTikv: true # options: # - --lastbackupts=420134118382108673 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws secretName: s3-secret @@ -158,12 +152,6 @@ Depending on which method you choose to grant permissions to the remote storage # checksum: true # options: # - --lastbackupts=420134118382108673 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -205,12 +193,6 @@ Depending on which method you choose to grant permissions to the remote storage # checksum: true # options: # - --lastbackupts=420134118382108673 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -458,12 +440,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -494,12 +470,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -530,12 +500,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -568,12 +532,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -633,12 +591,6 @@ Depending on which method you choose to grant permissions to the remote storage, # timeAgo: ${time} # checksum: true # sendCredToTikv: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws secretName: s3-secret @@ -687,12 +639,6 @@ Depending on which method you choose to grant permissions to the remote storage, # rateLimit: 0 # timeAgo: ${time} # checksum: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -739,12 +685,6 @@ Depending on which method you choose to grant permissions to the remote storage, # rateLimit: 0 # timeAgo: ${time} # checksum: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 diff --git a/en/backup-to-azblob-using-br.md b/en/backup-to-azblob-using-br.md index 82175049a..49a7cf8f7 100644 --- a/en/backup-to-azblob-using-br.md +++ b/en/backup-to-azblob-using-br.md @@ -104,12 +104,6 @@ spec: # sendCredToTikv: true # options: # - --lastbackupts=420134118382108673 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret container: my-container @@ -355,12 +349,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container @@ -390,12 +378,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container @@ -425,12 +407,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container @@ -462,12 +438,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container @@ -525,12 +495,6 @@ Depending on which method you choose to grant permissions to the remote storage, # timeAgo: ${time} # checksum: true # sendCredToTikv: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container @@ -573,12 +537,6 @@ Depending on which method you choose to grant permissions to the remote storage, # rateLimit: 0 # timeAgo: ${time} # checksum: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container diff --git a/en/backup-to-gcs-using-br.md b/en/backup-to-gcs-using-br.md index ca86242d8..1ae57c95d 100644 --- a/en/backup-to-gcs-using-br.md +++ b/en/backup-to-gcs-using-br.md @@ -88,12 +88,6 @@ This document provides an example about how to back up the data of the `demo1` T namespace: backup-test spec: # backupType: full - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb-host} - port: ${tidb-port} - user: ${tidb-user} - secretName: backup-demo1-tidb-secret br: cluster: demo1 clusterNamespace: test1 @@ -355,12 +349,6 @@ metadata: namespace: backup-test spec: # backupType: full - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret br: cluster: demo1 clusterNamespace: test1 @@ -390,12 +378,6 @@ metadata: namespace: backup-test spec: # backupType: full - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret tableFilter: - "db1.*" br: @@ -427,12 +409,6 @@ metadata: namespace: backup-test spec: # backupType: full - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret tableFilter: - "db1.table1" br: @@ -464,12 +440,6 @@ metadata: namespace: backup-test spec: # backupType: full - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret tableFilter: - "db1.table1" - "db1.table2" @@ -525,12 +495,6 @@ The steps to prepare for a scheduled snapshot backup are the same as that of [Pr backupTemplate: # Clean outdated backup data based on maxBackups or maxReservedTime. If not configured, the default policy is Retain # cleanPolicy: Delete - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret br: cluster: demo1 clusterNamespace: test1 diff --git a/en/backup-to-pv-using-br.md b/en/backup-to-pv-using-br.md index 28e01ea06..46d42d3ba 100644 --- a/en/backup-to-pv-using-br.md +++ b/en/backup-to-pv-using-br.md @@ -96,13 +96,7 @@ This document provides an example about how to back up the data of the `demo1` T name: demo1-backup-nfs namespace: test1 spec: - # # backupType: full - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret + # backupType: full br: cluster: demo1 clusterNamespace: test1 @@ -158,13 +152,7 @@ metadata: name: demo1-backup-nfs namespace: test1 spec: - # # backupType: full - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret + # backupType: full br: cluster: demo1 clusterNamespace: test1 @@ -195,13 +183,7 @@ metadata: name: demo1-backup-nfs namespace: test1 spec: - # # backupType: full - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret + # backupType: full tableFilter: - "db1.*" br: @@ -234,13 +216,7 @@ metadata: name: demo1-backup-nfs namespace: test1 spec: - # # backupType: full - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret + # backupType: full tableFilter: - "db1.table1" br: @@ -273,13 +249,7 @@ metadata: name: demo1-backup-nfs namespace: test1 spec: - # # backupType: full - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret + # backupType: full tableFilter: - "db1.table1" - "db1.table2" @@ -335,12 +305,6 @@ The steps to prepare for a scheduled snapshot backup are the same as that of [Pr maxReservedTime: "3h" schedule: "*/2 * * * *" backupTemplate: - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret br: cluster: demo1 clusterNamespace: test1 diff --git a/en/enable-tls-between-components.md b/en/enable-tls-between-components.md index 15625e026..22c13ca4e 100644 --- a/en/enable-tls-between-components.md +++ b/en/enable-tls-between-components.md @@ -1559,11 +1559,6 @@ In this step, you need to perform the following operations: cluster: ${cluster_name} clusterNamespace: ${namespace} sendCredToTikv: true - from: - host: ${host} - secretName: ${tidb_secret} - port: 4000 - user: root s3: provider: aws region: ${my_region} @@ -1594,11 +1589,6 @@ In this step, you need to perform the following operations: cluster: ${cluster_name} clusterNamespace: ${namespace} sendCredToTikv: true - to: - host: ${host} - secretName: ${tidb_secret} - port: 4000 - user: root s3: provider: aws region: ${my_region} diff --git a/en/enable-tls-for-mysql-client.md b/en/enable-tls-for-mysql-client.md index a98edfe9a..8f51c1706 100644 --- a/en/enable-tls-for-mysql-client.md +++ b/en/enable-tls-for-mysql-client.md @@ -395,8 +395,8 @@ You can generate multiple sets of client-side certificates. At least one set of - TidbInitializer - PD Dashboard - - Backup - - Restore + - Backup (when using Dumpling) + - Restore (when using TiDB Lightning) If you need to [restore data using TiDB Lightning](restore-data-using-tidb-lightning.md), you need to generate a server-side certificate for the TiDB Lightning component. @@ -607,15 +607,9 @@ In this step, you create a TiDB cluster and perform the following operations: spec: backupType: full br: - cluster: ${cluster_name} - clusterNamespace: ${namespace} - sendCredToTikv: true - from: - host: ${host} - secretName: ${tidb_secret} - port: 4000 - user: root - tlsClientSecretName: ${cluster_name}-backup-client-secret + cluster: ${cluster_name} + clusterNamespace: ${namespace} + sendCredToTikv: true s3: provider: aws region: ${my_region} @@ -638,12 +632,6 @@ In this step, you create a TiDB cluster and perform the following operations: cluster: ${cluster_name} clusterNamespace: ${namespace} sendCredToTikv: true - to: - host: ${host} - secretName: ${tidb_secret} - port: 4000 - user: root - tlsClientSecretName: ${cluster_name}-restore-client-secret s3: provider: aws region: ${my_region} diff --git a/en/restore-from-aws-s3-using-br.md b/en/restore-from-aws-s3-using-br.md index 461a124bf..37747eb76 100644 --- a/en/restore-from-aws-s3-using-br.md +++ b/en/restore-from-aws-s3-using-br.md @@ -96,12 +96,6 @@ Depending on which method you choose to grant permissions to the remote storage # timeAgo: ${time} # checksum: true # sendCredToTikv: true - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # to: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: restore-demo2-tidb-secret s3: provider: aws secretName: s3-secret @@ -140,12 +134,6 @@ Depending on which method you choose to grant permissions to the remote storage # rateLimit: 0 # timeAgo: ${time} # checksum: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - to: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: restore-demo2-tidb-secret s3: provider: aws region: us-west-1 @@ -182,12 +170,6 @@ Depending on which method you choose to grant permissions to the remote storage # rateLimit: 0 # timeAgo: ${time} # checksum: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - to: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: restore-demo2-tidb-secret s3: provider: aws region: us-west-1 diff --git a/en/restore-from-azblob-using-br.md b/en/restore-from-azblob-using-br.md index 75cc79aa3..b5abde36f 100644 --- a/en/restore-from-azblob-using-br.md +++ b/en/restore-from-azblob-using-br.md @@ -92,12 +92,6 @@ spec: # timeAgo: ${time} # checksum: true # sendCredToTikv: true - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # to: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: restore-demo2-tidb-secret azblob: secretName: azblob-secret container: my-container diff --git a/en/restore-from-gcs-using-br.md b/en/restore-from-gcs-using-br.md index 63e11e5cf..e50d42118 100644 --- a/en/restore-from-gcs-using-br.md +++ b/en/restore-from-gcs-using-br.md @@ -92,12 +92,6 @@ Before restoring backup data on GCS to TiDB using BR, take the following steps t # rateLimit: 0 # checksum: true # sendCredToTikv: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # to: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: restore-demo2-tidb-secret gcs: projectId: ${project_id} secretName: gcs-secret diff --git a/en/restore-from-pv-using-br.md b/en/restore-from-pv-using-br.md index 6a20886fd..8037586d7 100644 --- a/en/restore-from-pv-using-br.md +++ b/en/restore-from-pv-using-br.md @@ -75,12 +75,6 @@ Before restoring backup data on PVs to TiDB using BR, take the following steps t # concurrency: 4 # rateLimit: 0 # checksum: true - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # to: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: restore-demo2-tidb-secret local: prefix: backup-nfs volume: diff --git a/zh/backup-to-aws-s3-using-br.md b/zh/backup-to-aws-s3-using-br.md index aabebbd30..14d13fdbb 100644 --- a/zh/backup-to-aws-s3-using-br.md +++ b/zh/backup-to-aws-s3-using-br.md @@ -110,12 +110,6 @@ Ad-hoc 备份支持快照备份，也支持[启动](#启动日志备份)和[停 # sendCredToTikv: true # options: # - --lastbackupts=420134118382108673 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws secretName: s3-secret @@ -157,12 +151,6 @@ Ad-hoc 备份支持快照备份，也支持[启动](#启动日志备份)和[停 # checksum: true # options: # - --lastbackupts=420134118382108673 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -202,12 +190,6 @@ Ad-hoc 备份支持快照备份，也支持[启动](#启动日志备份)和[停 # checksum: true # options: # - --lastbackupts=420134118382108673 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -455,12 +437,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -491,12 +467,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -527,12 +497,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -565,12 +529,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -628,12 +586,6 @@ spec: # timeAgo: ${time} # checksum: true # sendCredToTikv: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws secretName: s3-secret @@ -680,12 +632,6 @@ spec: # rateLimit: 0 # timeAgo: ${time} # checksum: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 @@ -730,12 +676,6 @@ spec: # rateLimit: 0 # timeAgo: ${time} # checksum: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret s3: provider: aws region: us-west-1 diff --git a/zh/backup-to-azblob-using-br.md b/zh/backup-to-azblob-using-br.md index a1663a93d..741626ad9 100644 --- a/zh/backup-to-azblob-using-br.md +++ b/zh/backup-to-azblob-using-br.md @@ -105,12 +105,6 @@ spec: # sendCredToTikv: true # options: # - --lastbackupts=420134118382108673 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret container: my-container @@ -356,12 +350,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container @@ -391,12 +379,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container @@ -426,12 +408,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container @@ -463,12 +439,6 @@ spec: cluster: demo1 sendCredToTikv: false clusterNamespace: test1 - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container @@ -523,12 +493,6 @@ spec: # timeAgo: ${time} # checksum: true # sendCredToTikv: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container @@ -569,12 +533,6 @@ spec: # rateLimit: 0 # timeAgo: ${time} # checksum: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret azblob: secretName: azblob-secret-ad container: my-container diff --git a/zh/backup-to-gcs-using-br.md b/zh/backup-to-gcs-using-br.md index e5699b062..66ddb002b 100644 --- a/zh/backup-to-gcs-using-br.md +++ b/zh/backup-to-gcs-using-br.md @@ -95,12 +95,6 @@ Ad-hoc 备份支持快照备份，也支持[启动](#启动日志备份)和[停 namespace: backup-test spec: # backupType: full - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb-host} - port: ${tidb-port} - user: ${tidb-user} - secretName: backup-demo1-tidb-secret br: cluster: demo1 clusterNamespace: test1 @@ -354,12 +348,6 @@ metadata: namespace: backup-test spec: # backupType: full - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret br: cluster: demo1 clusterNamespace: test1 @@ -389,12 +377,6 @@ metadata: namespace: backup-test spec: # backupType: full - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret tableFilter: - "db1.*" br: @@ -426,12 +408,6 @@ metadata: namespace: backup-test spec: # backupType: full - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret tableFilter: - "db1.table1" br: @@ -463,12 +439,6 @@ metadata: namespace: backup-test spec: # backupType: full - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret tableFilter: - "db1.table1" - "db1.table2" @@ -522,12 +492,6 @@ spec: backupTemplate: # Clean outdated backup data based on maxBackups or maxReservedTime. If not configured, the default policy is Retain # cleanPolicy: Delete - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - from: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: backup-demo1-tidb-secret br: cluster: demo1 clusterNamespace: test1 diff --git a/zh/backup-to-pv-using-br.md b/zh/backup-to-pv-using-br.md index ee54651f0..047b4a772 100644 --- a/zh/backup-to-pv-using-br.md +++ b/zh/backup-to-pv-using-br.md @@ -92,13 +92,7 @@ Ad-hoc 备份支持快照备份与增量备份。Ad-hoc 备份通过创建一个 name: demo1-backup-nfs namespace: test1 spec: - # # backupType: full - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret + # backupType: full br: cluster: demo1 clusterNamespace: test1 @@ -154,13 +148,7 @@ metadata: name: demo1-backup-nfs namespace: test1 spec: - # # backupType: full - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret + # backupType: full br: cluster: demo1 clusterNamespace: test1 @@ -191,13 +179,7 @@ metadata: name: demo1-backup-nfs namespace: test1 spec: - # # backupType: full - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret + # backupType: full tableFilter: - "db1.*" br: @@ -230,13 +212,7 @@ metadata: name: demo1-backup-nfs namespace: test1 spec: - # # backupType: full - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret + # backupType: full tableFilter: - "db1.table1" br: @@ -269,13 +245,7 @@ metadata: name: demo1-backup-nfs namespace: test1 spec: - # # backupType: full - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb-host} - # port: ${tidb-port} - # user: ${tidb-user} - # secretName: backup-demo1-tidb-secret + # backupType: full tableFilter: - "db1.table1" - "db1.table2" @@ -329,12 +299,6 @@ spec: maxReservedTime: "3h" schedule: "*/2 * * * *" backupTemplate: - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # from: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: backup-demo1-tidb-secret br: cluster: demo1 clusterNamespace: test1 diff --git a/zh/enable-tls-between-components.md b/zh/enable-tls-between-components.md index e289a6672..82e2d5864 100644 --- a/zh/enable-tls-between-components.md +++ b/zh/enable-tls-between-components.md @@ -1544,11 +1544,6 @@ summary: 在 Kubernetes 上如何为 TiDB 集群组件间开启 TLS。 cluster: ${cluster_name} clusterNamespace: ${namespace} sendCredToTikv: true - from: - host: ${host} - secretName: ${tidb_secret} - port: 4000 - user: root s3: provider: aws region: ${my_region} @@ -1579,11 +1574,6 @@ summary: 在 Kubernetes 上如何为 TiDB 集群组件间开启 TLS。 cluster: ${cluster_name} clusterNamespace: ${namespace} sendCredToTikv: true - to: - host: ${host} - secretName: ${tidb_secret} - port: 4000 - user: root s3: provider: aws region: ${my_region} diff --git a/zh/enable-tls-for-mysql-client.md b/zh/enable-tls-for-mysql-client.md index 8dc4eba20..7316e430b 100644 --- a/zh/enable-tls-for-mysql-client.md +++ b/zh/enable-tls-for-mysql-client.md @@ -391,8 +391,8 @@ summary: 在 Kubernetes 上如何为 TiDB 集群的 MySQL 客户端开启 TLS。 - TidbInitializer - PD Dashboard - - Backup - - Restore + - Backup（使用 Dumpling 时） + - Restore（使用 TiDB Lightning 时） 如需要[使用 TiDB Lightning 恢复 Kubernetes 上的集群数据](restore-data-using-tidb-lightning.md)，则也可以为其中的 TiDB Lightning 组件生成 Client 端证书。 @@ -606,12 +606,6 @@ summary: 在 Kubernetes 上如何为 TiDB 集群的 MySQL 客户端开启 TLS。 cluster: ${cluster_name} clusterNamespace: ${namespace} sendCredToTikv: true - from: - host: ${host} - secretName: ${tidb_secret} - port: 4000 - user: root - tlsClientSecretName: ${cluster_name}-backup-client-secret s3: provider: aws region: ${my_region} @@ -634,12 +628,6 @@ summary: 在 Kubernetes 上如何为 TiDB 集群的 MySQL 客户端开启 TLS。 cluster: ${cluster_name} clusterNamespace: ${namespace} sendCredToTikv: true - to: - host: ${host} - secretName: ${tidb_secret} - port: 4000 - user: root - tlsClientSecretName: ${cluster_name}-restore-client-secret s3: provider: aws region: ${my_region} diff --git a/zh/restore-from-aws-s3-using-br.md b/zh/restore-from-aws-s3-using-br.md index f5e21ac20..5eacdf498 100644 --- a/zh/restore-from-aws-s3-using-br.md +++ b/zh/restore-from-aws-s3-using-br.md @@ -95,12 +95,6 @@ PITR 全称为 Point-in-time recovery，该功能可以让你在新集群上恢 # timeAgo: ${time} # checksum: true # sendCredToTikv: true - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # to: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: restore-demo2-tidb-secret s3: provider: aws secretName: s3-secret @@ -139,12 +133,6 @@ PITR 全称为 Point-in-time recovery，该功能可以让你在新集群上恢 # rateLimit: 0 # timeAgo: ${time} # checksum: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - to: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: restore-demo2-tidb-secret s3: provider: aws region: us-west-1 @@ -181,12 +169,6 @@ PITR 全称为 Point-in-time recovery，该功能可以让你在新集群上恢 # rateLimit: 0 # timeAgo: ${time} # checksum: true - # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - to: - host: ${tidb_host} - port: ${tidb_port} - user: ${tidb_user} - secretName: restore-demo2-tidb-secret s3: provider: aws region: us-west-1 diff --git a/zh/restore-from-azblob-using-br.md b/zh/restore-from-azblob-using-br.md index cdc121bf6..c9c958165 100644 --- a/zh/restore-from-azblob-using-br.md +++ b/zh/restore-from-azblob-using-br.md @@ -92,12 +92,6 @@ spec: # timeAgo: ${time} # checksum: true # sendCredToTikv: true - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # to: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: restore-demo2-tidb-secret azblob: secretName: azblob-secret container: my-container diff --git a/zh/restore-from-gcs-using-br.md b/zh/restore-from-gcs-using-br.md index d93ca3c0e..8ea3659d8 100644 --- a/zh/restore-from-gcs-using-br.md +++ b/zh/restore-from-gcs-using-br.md @@ -92,12 +92,6 @@ PITR 全称为 Point-in-time recovery，该功能可以让你在新集群上恢 # rateLimit: 0 # checksum: true # sendCredToTikv: true - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # to: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: restore-demo2-tidb-secret gcs: projectId: ${project_id} secretName: gcs-secret diff --git a/zh/restore-from-pv-using-br.md b/zh/restore-from-pv-using-br.md index 73db48ca8..51cd04f52 100644 --- a/zh/restore-from-pv-using-br.md +++ b/zh/restore-from-pv-using-br.md @@ -75,12 +75,6 @@ summary: 介绍如何将存储在持久卷上的备份数据恢复到 TiDB 集 # concurrency: 4 # rateLimit: 0 # checksum: true - # # Only needed for TiDB Operator < v1.1.10 or TiDB < v4.0.8 - # to: - # host: ${tidb_host} - # port: ${tidb_port} - # user: ${tidb_user} - # secretName: restore-demo2-tidb-secret local: prefix: backup-nfs volume: