Skip to content

Commit b2c542d

Browse files
shanshanyingwangyelei
authored andcommitted
chore: remove ENCRYPTED-SYSTEM-ACCOUNTS from examples (#2355)
1 parent c7c6cba commit b2c542d

File tree

23 files changed

+14
-150
lines changed

23 files changed

+14
-150
lines changed

addons/apecloud-mysql/README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -690,14 +690,6 @@ spec:
690690
691691
To restore a new cluster from a Backup:
692692
693-
1. Get the list of accounts and their passwords from the backup:
694-
695-
```bash
696-
kubectl get backup acmysql-cluster-backup -ojsonpath='{.metadata.annotations.kubeblocks\.io/encrypted-system-accounts}' -n demo
697-
```
698-
699-
1. Update `examples/apecloud-mysql/restore.yaml` and set placeholder `<ENCRYPTED-SYSTEM-ACCOUNTS>` with your own settings and apply it.
700-
701693
```yaml
702694
# cat examples/apecloud-mysql/restore.yaml
703695
apiVersion: apps.kubeblocks.io/v1
@@ -706,7 +698,7 @@ metadata:
706698
name: acmysql-cluster-restore
707699
namespace: demo
708700
annotations:
709-
kubeblocks.io/restore-from-backup: '{"mysql":{"encryptedSystemAccounts":"<ENCRYPTED-SYSTEM-ACCOUNTS>","name":"acmysql-cluster-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
701+
kubeblocks.io/restore-from-backup: '{"mysql":{"name":"acmysql-cluster-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
710702
spec:
711703
terminationPolicy: Delete
712704
clusterDef: apecloud-mysql

addons/falkordb/README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -746,14 +746,6 @@ spec:
746746

747747
To restore a new cluster from a Backup:
748748

749-
1. Get the list of accounts and their passwords from the backup:
750-
751-
```bash
752-
kubectl get backup -n demo acmysql-cluster-backup -ojsonpath='{.metadata.annotations.kubeblocks\.io/encrypted-system-accounts}'
753-
```
754-
755-
1. Update `examples/falkordb/restore.yaml` and set placeholder `<ENCRYPTED-SYSTEM-ACCOUNTS>` with your own settings and apply it.
756-
757749
```yaml
758750
# cat examples/falkordb/restore.yaml
759751
apiVersion: apps.kubeblocks.io/v1

addons/mongodb/README.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -663,14 +663,6 @@ Alternatively, you can update the `BackupSchedule` to enable the method `xtrabac
663663

664664
Restore a new cluster from a backup
665665

666-
1. Get the list of accounts and their passwords from the backup:
667-
668-
```bash
669-
kubectl get backup -n demo mongo-cluster-backup -ojsonpath='{.metadata.annotations.kubeblocks\.io/encrypted-system-accounts}'
670-
```
671-
672-
1. Update `examples/mongodb/restore.yaml` and set placeholder `<ENCRYPTED-SYSTEM-ACCOUNTS>` with your own settings and apply it.
673-
674666
```yaml
675667
# cat examples/mongodb/restore.yaml
676668
apiVersion: apps.kubeblocks.io/v1
@@ -679,8 +671,7 @@ metadata:
679671
name: mongo-cluster-restore
680672
namespace: demo
681673
annotations:
682-
# e.g. set "encryptedSystemAccounts": {\"root\":\"ENCRYPTEDPASSWORD\"}
683-
kubeblocks.io/restore-from-backup: '{"mongodb":{"encryptedSystemAccounts":"<ENCRYPTED-SYSTEM-ACCOUNTS>","name":"mongo-cluster-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
674+
kubeblocks.io/restore-from-backup: '{"mongodb":{"name":"mongo-cluster-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
684675
spec:
685676
terminationPolicy: Delete
686677
clusterDef: mongodb

addons/mysql/README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -572,14 +572,6 @@ kubectl apply -f examples/mysql/backup.yaml
572572

573573
To restore a new cluster from a Backup:
574574

575-
1. Get the list of accounts and their passwords from the backup:
576-
577-
```bash
578-
kubectl get backup -n demo mysql-cluster-backup -ojsonpath='{.metadata.annotations.kubeblocks\.io/encrypted-system-accounts}'
579-
```
580-
581-
1. Update `examples/mysql/restore.yaml` and set placeholder `<ENCRYPTED-SYSTEM-ACCOUNTS>` with your own settings and apply it.
582-
583575
```yaml
584576
# cat examples/mysql/restore.yaml
585577
apiVersion: apps.kubeblocks.io/v1
@@ -588,7 +580,7 @@ metadata:
588580
name: mysql-cluster-restore
589581
namespace: demo
590582
annotations:
591-
kubeblocks.io/restore-from-backup: '{"mysql":{"encryptedSystemAccounts":"<ENCRYPTED-SYSTEM-ACCOUNTS>","name":"mysql-cluster-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
583+
kubeblocks.io/restore-from-backup: '{"mysql":{"name":"mysql-cluster-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
592584
spec:
593585
terminationPolicy: Delete
594586
componentSpecs:

addons/oceanbase-ce/README.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -531,14 +531,6 @@ spec:
531531
532532
To restore a new cluster from a `Backup`, you can apply the following yaml file:
533533

534-
1. Get the list of accounts and their passwords from the backup:
535-
536-
```bash
537-
kubectl get backup -n demo ob-cluster-backup -ojsonpath='{.metadata.annotations.kubeblocks\.io/encrypted-system-accounts}'
538-
```
539-
540-
1. Update `examples/oceanbase-ce/restore.yaml` and set fields quoted with `<ENCRYPTED-SYSTEM-ACCOUNTS>` to your own settings and apply it.
541-
542534
```yaml
543535
# cat examples/oceanbase-ce/restore.yaml
544536
apiVersion: apps.kubeblocks.io/v1
@@ -547,8 +539,7 @@ metadata:
547539
name: oceanbase-cluster-restore
548540
namespace: demo
549541
annotations:
550-
# NOTE: replace <ENCRYPTED-SYSTEM-ACCOUNTS> with the accounts info from you backup
551-
kubeblocks.io/restore-from-backup: '{"postgresql":{"encryptedSystemAccounts":"<ENCRYPTED-SYSTEM-ACCOUNTS>","name":"ob-cluster-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
542+
kubeblocks.io/restore-from-backup: '{"oceanbase":{"name":"ob-cluster-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
552543
spec:
553544
terminationPolicy: Delete
554545
clusterDef: oceanbase-ce

addons/postgresql/README.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -770,14 +770,6 @@ kubectl apply -f examples/postgresql/backup-wal-g.yaml
770770

771771
To restore a new cluster from a Backup:
772772

773-
1. Get the list of accounts and their passwords from the backup:
774-
775-
```bash
776-
kubectl get backup -n demo pg-cluster-pg-basebackup -ojsonpath='{.metadata.annotations.kubeblocks\.io/encrypted-system-accounts}'
777-
```
778-
779-
1. Update `examples/postgresql/restore.yaml` and set placeholder `<ENCRYPTED-SYSTEM-ACCOUNTS>` with your own settings and apply it.
780-
781773
```yaml
782774
# cat examples/postgresql/restore.yaml
783775
apiVersion: apps.kubeblocks.io/v1
@@ -786,8 +778,7 @@ metadata:
786778
name: pg-restore
787779
namespace: demo
788780
annotations:
789-
# NOTE: replace <ENCRYPTED-SYSTEM-ACCOUNTS> with the accounts info from you backup
790-
kubeblocks.io/restore-from-backup: '{"postgresql":{"encryptedSystemAccounts":"<ENCRYPTED-SYSTEM-ACCOUNTS>","name":"pg-cluster-pg-basebackup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
781+
kubeblocks.io/restore-from-backup: '{"postgresql":{"name":"pg-cluster-pg-basebackup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
791782
spec:
792783
terminationPolicy: Delete
793784
clusterDef: postgresql

addons/redis/README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -747,14 +747,6 @@ spec:
747747

748748
To restore a new cluster from a Backup:
749749

750-
1. Get the list of accounts and their passwords from the backup:
751-
752-
```bash
753-
kubectl get backup -n demo acmysql-cluster-backup -ojsonpath='{.metadata.annotations.kubeblocks\.io/encrypted-system-accounts}'
754-
```
755-
756-
1. Update `examples/redis/restore.yaml` and set placeholder `<ENCRYPTED-SYSTEM-ACCOUNTS>` with your own settings and apply it.
757-
758750
```yaml
759751
# cat examples/redis/restore.yaml
760752
apiVersion: apps.kubeblocks.io/v1
@@ -763,7 +755,7 @@ metadata:
763755
name: redis-replication-restore
764756
namespace: demo
765757
annotations:
766-
kubeblocks.io/restore-from-backup: '{"redis":{"encryptedSystemAccounts":"<ENCRYPTED-SYSTEM-ACCOUNTS>","name":"redis-replication-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
758+
kubeblocks.io/restore-from-backup: '{"redis":{"name":"redis-replication-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
767759
spec:
768760
terminationPolicy: Delete
769761
clusterDef: redis

addons/vanilla-postgresql/README.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -566,14 +566,6 @@ Alternatively, you can update the `BackupSchedule` to enable the method `vanilla
566566

567567
To restore a new cluster from a Backup:
568568

569-
Get the list of accounts and their passwords from the backup:
570-
571-
```bash
572-
kubectl get backup -n demo vanpg-cluster-pg-basebackup -ojsonpath='{.metadata.annotations.kubeblocks\.io/encrypted-system-accounts}'
573-
```
574-
575-
Update `examples/vanilla-postgresql/restore.yaml` and set fields quoted with `<<ENCRYPTED-SYSTEM-ACCOUNTS>` to your own settings and apply it.
576-
577569
```yaml
578570
# cat examples/vanilla-postgresql/restore.yaml
579571
apiVersion: apps.kubeblocks.io/v1
@@ -582,8 +574,7 @@ metadata:
582574
name: vanpg-restore
583575
namespace: demo
584576
annotations:
585-
# NOTE: replace <ENCRYPTED-SYSTEM-ACCOUNTS> with the accounts info from you backup
586-
kubeblocks.io/restore-from-backup: '{"postgresql":{"encryptedSystemAccounts":"<ENCRYPTED-SYSTEM-ACCOUNTS>","name":"vanpg-cluster-pg-basebackup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
577+
kubeblocks.io/restore-from-backup: '{"postgresql":{"name":"vanpg-cluster-pg-basebackup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
587578
spec:
588579
terminationPolicy: Delete
589580
clusterDef: vanilla-postgresql

examples/apecloud-mysql/README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -389,14 +389,6 @@ spec:
389389
390390
To restore a new cluster from a Backup:
391391
392-
1. Get the list of accounts and their passwords from the backup:
393-
394-
```bash
395-
kubectl get backup acmysql-cluster-backup -ojsonpath='{.metadata.annotations.kubeblocks\.io/encrypted-system-accounts}' -n demo
396-
```
397-
398-
1. Update `examples/apecloud-mysql/restore.yaml` and set placeholder `<ENCRYPTED-SYSTEM-ACCOUNTS>` with your own settings and apply it.
399-
400392
```bash
401393
kubectl apply -f examples/apecloud-mysql/restore.yaml
402394
```

examples/apecloud-mysql/restore.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: acmysql-cluster-restore
55
namespace: demo
66
annotations:
7-
kubeblocks.io/restore-from-backup: '{"mysql":{"encryptedSystemAccounts":"<ENCRYPTED-SYSTEM-ACCOUNTS>","name":"acmysql-cluster-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
7+
kubeblocks.io/restore-from-backup: '{"mysql":{"name":"acmysql-cluster-backup","namespace":"demo","volumeRestorePolicy":"Parallel"}}'
88
spec:
99
terminationPolicy: Delete
1010
clusterDef: apecloud-mysql

0 commit comments

Comments
 (0)