Merge branch 'master' into azure-sas

pingcap · Aug 27, 2024 · c03faac · c03faac
2 parents 9d6ec1b + bdd4395
commit c03faac
Show file tree

Hide file tree

Showing 20 changed files with 0 additions and 120 deletions.
diff --git a/examples/backup/backup-azblob.yaml b/examples/backup/backup-azblob.yaml
@@ -6,12 +6,6 @@ metadata:
 spec:
   cleanPolicy: Delete
   # backupType: full
-  # Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
-  # from:
-  #   host: ${tidb-host}
-  #   port: ${tidb-port}
-  #   user: ${tidb-user}
-  #   secretName: backup-basic-tidb-secret
   br:
     cluster: basic
     clusterNamespace: default

diff --git a/examples/backup/backup-ebs-local.yaml b/examples/backup/backup-ebs-local.yaml
@@ -7,12 +7,6 @@ spec:
   cleanPolicy: Delete
   backupType: full
   backupMode: volume-snapshot
-  # Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
-  # from:
-  #   host: ${tidb-host}
-  #   port: ${tidb-port}
-  #   user: ${tidb-user}
-  #   secretName: backup-basic-tidb-secret
   toolImage: localhost:5000/pingcap/br:latest
   br:
     cluster: basic

diff --git a/examples/backup/backup-ebs-minio.yaml b/examples/backup/backup-ebs-minio.yaml
@@ -7,12 +7,6 @@ spec:
   cleanPolicy: Delete
   backupType: full
   backupMode: volume-snapshot
-  # Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
-  # from:
-  #   host: ${tidb-host}
-  #   port: ${tidb-port}
-  #   user: ${tidb-user}
-  #   secretName: backup-basic-tidb-secret
   toolImage: localhost:5000/pingcap/br:latest
   br:
     cluster: basic

diff --git a/examples/backup/backup-local.yaml b/examples/backup/backup-local.yaml
@@ -6,12 +6,6 @@ metadata:
 spec:
   cleanPolicy: Delete
   # backupType: full
-  # Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
-  # from:
-  #   host: ${tidb-host}
-  #   port: ${tidb-port}
-  #   user: ${tidb-user}
-  #   secretName: backup-basic-tidb-secret
   br:
     cluster: basic
     clusterNamespace: default

diff --git a/examples/backup/backup-nfs.yaml b/examples/backup/backup-nfs.yaml
@@ -6,12 +6,6 @@ metadata:
 spec:
   cleanPolicy: Delete
   # backupType: full
-  # Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
-  # from:
-  #   host: ${tidb-host}
-  #   port: ${tidb-port}
-  #   user: ${tidb-user}
-  #   secretName: backup-basic-tidb-secret
   br:
     cluster: basic
     clusterNamespace: default

diff --git a/examples/backup/backup-schedule-azblob.yaml b/examples/backup/backup-schedule-azblob.yaml
@@ -9,12 +9,6 @@ spec:
   # maxReservedTime: "2m"
   schedule: "*/1 * * * *"
   backupTemplate:
-    # Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
-    # from:
-    #   host: ${tidb_host}
-    #   port: ${tidb_port}
-    #   user: ${tidb_user}
-    #   secretName: backup-demo1-tidb-secret
     cleanPolicy: Delete
     br:
       cluster: basic

diff --git a/examples/backup/backup-schedule-nfs.yaml b/examples/backup/backup-schedule-nfs.yaml
@@ -9,12 +9,6 @@ spec:
   # maxReservedTime: "2m"
   schedule: "*/1 * * * *"
   backupTemplate:
-    # Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
-    # from:
-    #   host: ${tidb_host}
-    #   port: ${tidb_port}
-    #   user: ${tidb_user}
-    #   secretName: backup-demo1-tidb-secret
     cleanPolicy: Delete
     br:
       cluster: basic

diff --git a/examples/backup/restore-azblob.yaml b/examples/backup/restore-azblob.yaml
@@ -5,12 +5,6 @@ metadata:
   namespace: default
 spec:
   # backupType: full
-  # Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
-  # to:
-  #   host: ${tidb_host}
-  #   port: ${tidb_port}
-  #   user: ${tidb_user}
-  #   secretName: restore-demo2-tidb-secret
   br:
     cluster: basic
     clusterNamespace: default

diff --git a/examples/backup/restore-ebs-minio.yaml b/examples/backup/restore-ebs-minio.yaml
@@ -6,12 +6,6 @@ metadata:
 spec:
   backupType: full
   backupMode: volume-snapshot
-  # Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
-  # from:
-  #   host: ${tidb-host}
-  #   port: ${tidb-port}
-  #   user: ${tidb-user}
-  #   secretName: backup-basic-tidb-secret
   toolImage: localhost:5000/pingcap/br:latest
   br:
     cluster: basic

diff --git a/examples/backup/restore-local.yaml b/examples/backup/restore-local.yaml
@@ -5,12 +5,6 @@ metadata:
   namespace: default
 spec:
   # backupType: full
-  # Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
-  # from:
-  #   host: ${tidb-host}
-  #   port: ${tidb-port}
-  #   user: ${tidb-user}
-  #   secretName: backup-basic-tidb-secret
   br:
     cluster: basic
     clusterNamespace: default

diff --git a/examples/backup/restore-nfs.yaml b/examples/backup/restore-nfs.yaml
@@ -5,12 +5,6 @@ metadata:
   namespace: default
 spec:
   # backupType: full
-  # Only needed for TiDB Operator < v1.1.7 or TiDB < v4.0.8
-  # to:
-  #   host: ${tidb_host}
-  #   port: ${tidb_port}
-  #   user: ${tidb_user}
-  #   secretName: restore-demo2-tidb-secret
   br:
     cluster: basic
     clusterNamespace: default

diff --git a/manifests/backup/backup-aws-s3-br.yaml b/manifests/backup/backup-aws-s3-br.yaml
@@ -21,12 +21,6 @@ spec:
     # timeAgo: <time>
     # checksum: true
     # sendCredToTikv: true
-  from:
-    host: 172.30.6.56
-    secretName: mySecret
-    # port: 4000
-    # user: root
-    # tlsClientSecretName: <backup-tls-secretname>
   s3:
     provider: aws
     region: us-west-2

diff --git a/manifests/backup/backup-gcs-br.yaml b/manifests/backup/backup-gcs-br.yaml
@@ -18,12 +18,6 @@ spec:
     # rateLimit: 0
     # timeAgo: <time>
     # checksum: true
-  from:
-    host: 172.30.6.56
-    secretName: my-secret
-    # port: 4000
-    # user: root
-    # tlsClientSecretName: <backup-tls-secretname>
   gcs:
     projectId: gcp
     location: us-west2

diff --git a/manifests/backup/backup-s3-br.yaml b/manifests/backup/backup-s3-br.yaml
@@ -27,12 +27,6 @@ spec:
     # timeAgo: <time>
     # checksum: true
     # sendCredToTikv: true
-  from:
-    host: 172.30.6.56
-    secretName: mySecret
-    # port: 4000
-    # user: root
-    # tlsClientSecretName: <backup-tls-secretname>
   s3:
     provider: ceph
     endpoint: http://10.233.57.220

diff --git a/manifests/backup/backup-schedule-aws-s3-br.yaml b/manifests/backup/backup-schedule-aws-s3-br.yaml
@@ -26,12 +26,6 @@ spec:
       # timeAgo: <time>
       # checksum: true
       # sendCredToTikv: true
-    from:
-      host:         172.30.6.56
-      secretName:   mysecret
-      # port:         4000
-      # user:         root
-      # tlsClientSecretName: <backup-tls-secretname>
     s3:
       provider: aws
       region: us-west-2

diff --git a/manifests/backup/backup-schedule-gcs-br.yaml b/manifests/backup/backup-schedule-gcs-br.yaml
@@ -23,12 +23,6 @@ spec:
       # rateLimit: 0
       # timeAgo: <time>
       # checksum: true
-    from:
-      host:         172.30.6.56
-      secretName:   mysecret
-      # port:         4000
-      # user:         root
-      # tlsClientSecretName: <backup-tls-secretname>
     gcs:
       provider: gcp
       region: us-west-2

diff --git a/manifests/backup/backup-schedule-s3-br.yaml b/manifests/backup/backup-schedule-s3-br.yaml
@@ -26,12 +26,6 @@ spec:
       # timeAgo: <time>
       # checksum: true
       # sendCredToTikv: true
-    from:
-      host:         172.30.6.56
-      secretName:   mysecret
-      # port:         4000
-      # user:         root
-      # tlsClientSecretName: <backup-tls-secretname>
     s3:
       provider: ceph
       endpoint: http://10.233.57.220

diff --git a/manifests/backup/restore-aws-s3-br.yaml b/manifests/backup/restore-aws-s3-br.yaml
@@ -22,12 +22,6 @@ spec:
     # timeAgo: <time>
     # checksum: true
     # sendCredToTikv: true
-  to:
-    host: 172.30.6.56
-    secretName: mySecret
-    # port: 4000
-    # user: root
-    # tlsClientSecretName: <restore-tls-secretname>
   s3:
     provider: aws
     region: us-west-2

diff --git a/manifests/backup/restore-gcs-br.yaml b/manifests/backup/restore-gcs-br.yaml
@@ -18,12 +18,6 @@ spec:
     # rateLimit: 0
     # timeAgo: <time>
     # checksum: true
-  to:
-    host: 172.30.6.56
-    secretName: mySecret
-    # port: 4000
-    # user: root
-    # tlsClientSecretName: <restore-tls-secretname>
   gcs:
     projectId: gcp
     location: us-west2

diff --git a/manifests/backup/restore-s3-br.yaml b/manifests/backup/restore-s3-br.yaml
@@ -28,12 +28,6 @@ spec:
     # timeAgo: <time>
     # checksum: true
     # sendCredToTikv: true
-  to:
-    host: 172.30.6.56
-    secretName: mySecret
-    # port: 4000
-    # user: root
-    # tlsClientSecretName: <restore-tls-secretname>
   s3:
     provider: ceph
     endpoint: http://10.233.57.220