Skip to content

Commit f67559b

Browse files
author
github-actions
committed
update MD by dispatch event pingcap/docs-tidb-operator release-2.0
1 parent e92a8c4 commit f67559b

12 files changed

+24
-24
lines changed

‎markdown-pages/en/tidb-in-kubernetes/release-2.0/backup-to-aws-s3-using-br.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ This document provides an example about how to back up the data of the `demo1` T
6262
resources: ["events"]
6363
verbs: ["*"]
6464
- apiGroups: ["br.pingcap.com"]
65-
resources: ["backups", "restores"]
65+
resources: ["*"]
6666
verbs: ["get", "watch", "list", "update"]
6767

6868
---
@@ -1017,9 +1017,9 @@ The steps to prepare for a scheduled snapshot backup are the same as that of [Pr
10171017
```
10181018

10191019
In the preceding example of `integrated-backup-schedule-s3.yaml`, the `backupSchedule` configuration is based on the previous section, with the following additions for `compactBackup`:
1020-
1020+
10211021
* Added the `BackupSchedule.spec.compactInterval` field to specify the interval for log backup compaction. It is recommended not to exceed the interval of scheduled snapshot backups and to keep it between one-half to one-third of the scheduled snapshot backup interval.
1022-
1022+
10231023
* Added the `BackupSchedule.spec.compactBackupTemplate` field. Ensure that the `BackupSchedule.spec.compactBackupTemplate.s3` configuration matches the `BackupSchedule.spec.logBackupTemplate.s3` configuration.
10241024

10251025
For the field description of `backupSchedule`, refer to [BackupSchedule CR fields](backup-restore-cr.md#backupschedule-cr-fields).

‎markdown-pages/en/tidb-in-kubernetes/release-2.0/backup-to-azblob-using-br.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ This document provides an example about how to back up the data of the `demo1` T
5757
resources: ["events"]
5858
verbs: ["*"]
5959
- apiGroups: ["br.pingcap.com"]
60-
resources: ["backups", "restores"]
60+
resources: ["*"]
6161
verbs: ["get", "watch", "list", "update"]
6262
---
6363
kind: ServiceAccount
@@ -293,7 +293,7 @@ demo1-log-backup-azblob log Pause ....
293293
If a log backup task is paused, you can resume it by setting the `logSubcommand` field to `log-start`. The following example shows how to resume the `demo1-log-backup-azblob` CR that was paused in [Pause Log Backup](#pause-log-backup).
294294
295295
> **Note:**
296-
>
296+
>
297297
> This operation applies only to tasks in the `Pause` state. You cannot resume tasks in the `Fail` or `Stopped` state.
298298
299299
```shell
@@ -492,7 +492,7 @@ From the output, you can find the status of the `CompactBackup` CR named `demo1-
492492
493493
```
494494
NAME STATUS PROGRESS MESSAGE
495-
demo1-compact-backup Complete [READ_META(17/17),COMPACT_WORK(1291/1291)]
495+
demo1-compact-backup Complete [READ_META(17/17),COMPACT_WORK(1291/1291)]
496496
```
497497
498498
If the `STATUS` field displays `Complete`, the compact log backup process has finished successfully.
@@ -784,7 +784,7 @@ The steps to prepare for a scheduled snapshot backup are the same as those of [P
784784
785785
```
786786
NAME MODE STATUS ....
787-
integrated-backup-schedule-azblob-2023-03-08t02-48-00 snapshot Complete ....
787+
integrated-backup-schedule-azblob-2023-03-08t02-48-00 snapshot Complete ....
788788
log-integrated-backup-schedule-azblob log Running ....
789789
```
790790
@@ -840,9 +840,9 @@ The steps to prepare for a scheduled snapshot backup are the same as those of [P
840840
```
841841
842842
In the preceding example of `integrated-backup-schedule-azblob.yaml`, the `backupSchedule` configuration is based on the previous section, with the following additions for `compactBackup`:
843-
843+
844844
* Added the `BackupSchedule.spec.compactInterval` field to specify the time interval for log backup compaction. It is recommended not to exceed the interval of scheduled snapshot backups and to keep it between one-half to one-third of the scheduled snapshot backup interval.
845-
845+
846846
* Added the `BackupSchedule.spec.compactBackupTemplate` field. Ensure that the `BackupSchedule.spec.compactBackupTemplate.azblob` configuration matches the `BackupSchedule.spec.logBackupTemplate.azblob` configuration.
847847
848848
For the field description of `backupSchedule`, refer to [BackupSchedule CR fields](backup-restore-cr.md#backupschedule-cr-fields).

‎markdown-pages/en/tidb-in-kubernetes/release-2.0/backup-to-gcs-using-br.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ This document provides an example about how to back up the data of the `demo1` T
6262
resources: ["events"]
6363
verbs: ["*"]
6464
- apiGroups: ["br.pingcap.com"]
65-
resources: ["backups", "restores"]
65+
resources: ["*"]
6666
verbs: ["get", "watch", "list", "update"]
6767

6868
---

‎markdown-pages/en/tidb-in-kubernetes/release-2.0/restore-from-aws-s3-using-br.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Before restoring backup data on an S3-compatible storage to TiDB using BR, take
5252
resources: ["events"]
5353
verbs: ["*"]
5454
- apiGroups: ["br.pingcap.com"]
55-
resources: ["backups", "restores"]
55+
resources: ["*"]
5656
verbs: ["get", "watch", "list", "update"]
5757

5858
---

‎markdown-pages/en/tidb-in-kubernetes/release-2.0/restore-from-azblob-using-br.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Before restoring backup data on Azure Blob Storage to TiDB using BR, take the fo
4747
resources: ["events"]
4848
verbs: ["*"]
4949
- apiGroups: ["br.pingcap.com"]
50-
resources: ["backups", "restores"]
50+
resources: ["*"]
5151
verbs: ["get", "watch", "list", "update"]
5252
---
5353
kind: ServiceAccount

‎markdown-pages/en/tidb-in-kubernetes/release-2.0/restore-from-gcs-using-br.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Before restoring backup data on GCS to TiDB using BR, take the following steps t
5252
resources: ["events"]
5353
verbs: ["*"]
5454
- apiGroups: ["br.pingcap.com"]
55-
resources: ["backups", "restores"]
55+
resources: ["*"]
5656
verbs: ["get", "watch", "list", "update"]
5757

5858
---

‎markdown-pages/zh/tidb-in-kubernetes/release-2.0/backup-to-aws-s3-using-br.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Ad-hoc 备份支持快照备份，也支持[启动](#启动日志备份)和[停
6262
resources: ["events"]
6363
verbs: ["*"]
6464
- apiGroups: ["br.pingcap.com"]
65-
resources: ["backups", "restores"]
65+
resources: ["*"]
6666
verbs: ["get", "watch", "list", "update"]
6767

6868
---

‎markdown-pages/zh/tidb-in-kubernetes/release-2.0/backup-to-azblob-using-br.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Ad-hoc 备份支持快照备份，也支持[启动](#启动日志备份)和[停
5757
resources: ["events"]
5858
verbs: ["*"]
5959
- apiGroups: ["br.pingcap.com"]
60-
resources: ["backups", "restores"]
60+
resources: ["*"]
6161
verbs: ["get", "watch", "list", "update"]
6262
---
6363
kind: ServiceAccount
@@ -293,7 +293,7 @@ demo1-log-backup-azblob log Pause ....
293293
如果日志备份任务已暂停，你可以通过将 `logSubcommand` 字段设置为 `log-start` 来恢复该任务。下面以恢复[暂停日志备份](#暂停日志备份)中已暂停的 `demo1-log-backup-azblob` CR 为例。
294294
295295
> **Note:**
296-
>
296+
>
297297
> 此操作仅适用于处于暂停状态 (`Pause`) 的任务，无法恢复状态为 `Fail` 或 `Stopped` 的任务。
298298
299299
```shell
@@ -492,7 +492,7 @@ kubectl get cpbk -n test1
492492
493493
```
494494
NAME STATUS PROGRESS MESSAGE
495-
demo1-compact-backup Complete [READ_META(17/17),COMPACT_WORK(1291/1291)]
495+
demo1-compact-backup Complete [READ_META(17/17),COMPACT_WORK(1291/1291)]
496496
```
497497
498498
如果 `STATUS` 字段显示为 `Complete` 则代表压缩日志备份已经完成。
@@ -782,7 +782,7 @@ kubectl get backup -l tidb.pingcap.com/backup-schedule=demo1-backup-schedule-azb
782782
783783
```
784784
NAME MODE STATUS ....
785-
integrated-backup-schedule-azblob-2023-03-08t02-48-00 snapshot Complete ....
785+
integrated-backup-schedule-azblob-2023-03-08t02-48-00 snapshot Complete ....
786786
log-integrated-backup-schedule-azblob log Running ....
787787
```
788788
@@ -838,9 +838,9 @@ kubectl get backup -l tidb.pingcap.com/backup-schedule=demo1-backup-schedule-azb
838838
```
839839
840840
以上 `integrated-backup-scheduler-azblob.yaml` 文件配置示例中，`backupSchedule` 配置基于上一节内容，新增了 `compactBackup` 相关设置，主要改动如下：
841-
841+
842842
- 新增 `BackupSchedule.spec.compactInterval` 字段，用于指定日志压缩备份的时间间隔。建议不要超过定时快照备份的间隔，并控制在定时快照备份间隔的二分之一至三分之一之间。
843-
843+
844844
- 新增 `BackupSchedule.spec.compactBackupTemplate` 字段。请确保 `BackupSchedule.spec.compactBackupTemplate.azblob` 配置与 `BackupSchedule.spec.logBackupTemplate.azblob` 保持一致。
845845
846846
关于 `backupSchedule` 配置项具体介绍，请参考 [BackupSchedule CR 字段介绍](backup-restore-cr.md#backupschedule-cr-字段介绍)。

‎markdown-pages/zh/tidb-in-kubernetes/release-2.0/backup-to-gcs-using-br.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Ad-hoc 备份支持快照备份，也支持[启动](#启动日志备份)和[停
6262
resources: ["events"]
6363
verbs: ["*"]
6464
- apiGroups: ["br.pingcap.com"]
65-
resources: ["backups", "restores"]
65+
resources: ["*"]
6666
verbs: ["get", "watch", "list", "update"]
6767

6868
---

‎markdown-pages/zh/tidb-in-kubernetes/release-2.0/restore-from-aws-s3-using-br.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ PITR 全称为 Point-in-time recovery，该功能可以让你在新集群上恢
5252
resources: ["events"]
5353
verbs: ["*"]
5454
- apiGroups: ["br.pingcap.com"]
55-
resources: ["backups", "restores"]
55+
resources: ["*"]
5656
verbs: ["get", "watch", "list", "update"]
5757

5858
---

0 commit comments

Comments
 (0)