zh,en: remove spec.from for Backup and spec.to for Restore (#2614) (#…

…2616)
pingcap · Aug 27, 2024 · af2b580 · af2b580
1 parent 98b4452
commit af2b580
Show file tree

Hide file tree

Showing 20 changed files with 17 additions and 481 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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