From bb7f07dc37cc8fd5825a6cba4bd5929310e625d7 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Mon, 26 Aug 2024 16:16:27 +0800 Subject: [PATCH] chore: remove spec.from for Backup and spec.to for Restore in example (#5718) Co-authored-by: csuzhangxc --- examples/backup/backup-azblob.yaml | 6 ------ examples/backup/backup-ebs-local.yaml | 6 ------ examples/backup/backup-ebs-minio.yaml | 6 ------ examples/backup/backup-local.yaml | 6 ------ examples/backup/backup-nfs.yaml | 6 ------ examples/backup/backup-schedule-azblob.yaml | 6 ------ examples/backup/backup-schedule-nfs.yaml | 6 ------ examples/backup/restore-azblob.yaml | 6 ------ examples/backup/restore-ebs-minio.yaml | 6 ------ examples/backup/restore-local.yaml | 6 ------ examples/backup/restore-nfs.yaml | 6 ------ manifests/backup/backup-aws-s3-br.yaml | 6 ------ manifests/backup/backup-gcs-br.yaml | 6 ------ manifests/backup/backup-s3-br.yaml | 6 ------ manifests/backup/backup-schedule-aws-s3-br.yaml | 6 ------ manifests/backup/backup-schedule-gcs-br.yaml | 6 ------ manifests/backup/backup-schedule-s3-br.yaml | 6 ------ manifests/backup/restore-aws-s3-br.yaml | 6 ------ manifests/backup/restore-gcs-br.yaml | 6 ------ manifests/backup/restore-s3-br.yaml | 6 ------ 20 files changed, 120 deletions(-) diff --git a/examples/backup/backup-azblob.yaml b/examples/backup/backup-azblob.yaml index 03637ebe3d..e211bf12f5 100644 --- 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 index a6d6de03c1..8bc38985b3 100644 --- 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 index 0ea3bb37d8..db55b0084b 100644 --- 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 index 0e2022c73a..5889bdc51b 100644 --- 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 index 6d83f184a9..0c58383cbc 100644 --- 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 index 734df81fa0..4cf7854015 100644 --- 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 index 7175b75921..def3ead460 100644 --- 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 index 500ccf2098..34e5a2127b 100644 --- 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 index a6164bb59d..3f208930e8 100644 --- 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 index 011cefb671..d4b1e058b6 100644 --- 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 index d5dc6fad92..c8da926fb1 100644 --- 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 index dfafde4449..72b04eb9a3 100644 --- a/manifests/backup/backup-aws-s3-br.yaml +++ b/manifests/backup/backup-aws-s3-br.yaml @@ -21,12 +21,6 @@ spec: # timeAgo: