From bd9cac87b4faa3b95870b612c308a6147b779f65 Mon Sep 17 00:00:00 2001 From: wangyelei Date: Tue, 27 Aug 2024 14:49:01 +0800 Subject: [PATCH] chore: add fallback role for backup (#981) --- addons/apecloud-mysql/templates/backuppolicytemplate.yaml | 1 + .../apecloud-mysql/templates/backuppolicytemplateforhscale.yaml | 1 + addons/mogdb/templates/backuppolicytemplate.yaml | 1 + addons/mongodb/templates/backuppolicytemplate.yaml | 1 + addons/mysql/templates/backuppolicytemplate.yaml | 1 + addons/mysql/templates/backuppolicytemplateforhscale.yaml | 1 + addons/postgresql/templates/backuppolicytemplate.yaml | 2 ++ addons/postgresql/templates/componentdefinition-12.yaml | 2 ++ addons/postgresql/templates/componentdefinition-14.yaml | 2 ++ addons/redis/templates/backuppolicytemplate.yaml | 2 ++ addons/zookeeper/templates/backuppolicytemplate.yaml | 1 + 11 files changed, 15 insertions(+) diff --git a/addons/apecloud-mysql/templates/backuppolicytemplate.yaml b/addons/apecloud-mysql/templates/backuppolicytemplate.yaml index 309d11bf3..7a8f4d652 100644 --- a/addons/apecloud-mysql/templates/backuppolicytemplate.yaml +++ b/addons/apecloud-mysql/templates/backuppolicytemplate.yaml @@ -14,6 +14,7 @@ spec: - {{ include "apecloud-mysql.componentDefName" . }} target: role: follower + fallbackRole: leader account: root backupMethods: - name: xtrabackup diff --git a/addons/apecloud-mysql/templates/backuppolicytemplateforhscale.yaml b/addons/apecloud-mysql/templates/backuppolicytemplateforhscale.yaml index 89cf4d13c..4c37313ef 100644 --- a/addons/apecloud-mysql/templates/backuppolicytemplateforhscale.yaml +++ b/addons/apecloud-mysql/templates/backuppolicytemplateforhscale.yaml @@ -13,6 +13,7 @@ spec: - {{ include "apecloud-mysql.componentDefName" . }} target: role: follower + fallbackRole: leader account: root backupMethods: - name: volume-snapshot diff --git a/addons/mogdb/templates/backuppolicytemplate.yaml b/addons/mogdb/templates/backuppolicytemplate.yaml index 78d5d7a02..e57e05761 100644 --- a/addons/mogdb/templates/backuppolicytemplate.yaml +++ b/addons/mogdb/templates/backuppolicytemplate.yaml @@ -9,6 +9,7 @@ spec: - componentDefs: [mogdb-5] target: role: secondary + fallbackRole: primary account: root backupMethods: - name: mogdb-basebackup diff --git a/addons/mongodb/templates/backuppolicytemplate.yaml b/addons/mongodb/templates/backuppolicytemplate.yaml index 769a06385..415c6a1b2 100644 --- a/addons/mongodb/templates/backuppolicytemplate.yaml +++ b/addons/mongodb/templates/backuppolicytemplate.yaml @@ -11,6 +11,7 @@ spec: - componentDefs: [mongodb] target: role: secondary + fallbackRole: primary account: root backupMethods: - name: dump diff --git a/addons/mysql/templates/backuppolicytemplate.yaml b/addons/mysql/templates/backuppolicytemplate.yaml index 1314ba4d4..d8d32eb32 100644 --- a/addons/mysql/templates/backuppolicytemplate.yaml +++ b/addons/mysql/templates/backuppolicytemplate.yaml @@ -12,6 +12,7 @@ spec: - componentDefs: [mysql-5.7.44-orc, mysql-5.7.44, mysql-8.0.33-orc, mysql-8.0.33] target: role: secondary + fallbackRole: primary account: root backupMethods: - name: xtrabackup diff --git a/addons/mysql/templates/backuppolicytemplateforhscale.yaml b/addons/mysql/templates/backuppolicytemplateforhscale.yaml index 95a987e45..6b8ed17e0 100644 --- a/addons/mysql/templates/backuppolicytemplateforhscale.yaml +++ b/addons/mysql/templates/backuppolicytemplateforhscale.yaml @@ -11,6 +11,7 @@ spec: - componentDefs: [mysql-5.7.44-orc, mysql-5.7.44, mysql-8.0.33-orc, mysql-8.0.33] target: role: secondary + fallbackRole: primary backupMethods: - name: xtrabackup snapshotVolumes: false diff --git a/addons/postgresql/templates/backuppolicytemplate.yaml b/addons/postgresql/templates/backuppolicytemplate.yaml index ffa2aee21..44ca85f0d 100644 --- a/addons/postgresql/templates/backuppolicytemplate.yaml +++ b/addons/postgresql/templates/backuppolicytemplate.yaml @@ -23,6 +23,7 @@ spec: - componentDefs: [postgresql-14, postgresql-12] target: role: secondary + fallbackRole: primary account: postgres backupMethods: - name: pg-basebackup @@ -60,6 +61,7 @@ spec: - name: wal-g target: role: secondary + fallbackRole: primary account: postgres actionSetName: postgres-wal-g snapshotVolumes: false diff --git a/addons/postgresql/templates/componentdefinition-12.yaml b/addons/postgresql/templates/componentdefinition-12.yaml index 94309130b..4853db650 100644 --- a/addons/postgresql/templates/componentdefinition-12.yaml +++ b/addons/postgresql/templates/componentdefinition-12.yaml @@ -11,6 +11,7 @@ spec: serviceVersion: {{ .Values.componentServiceVersion.postgresql12 }} serviceRefDeclarations: - name: etcd + optional: true serviceRefDeclarationSpecs: - serviceKind: etcd serviceVersion: "^*" @@ -84,6 +85,7 @@ spec: serviceRefVarRef: name: etcd endpoint: Required + optional: true - name: POSTGRES_USER valueFrom: credentialVarRef: diff --git a/addons/postgresql/templates/componentdefinition-14.yaml b/addons/postgresql/templates/componentdefinition-14.yaml index 8273a89d0..ce254a003 100644 --- a/addons/postgresql/templates/componentdefinition-14.yaml +++ b/addons/postgresql/templates/componentdefinition-14.yaml @@ -11,6 +11,7 @@ spec: serviceVersion: {{ .Values.componentServiceVersion.postgresql14 }} serviceRefDeclarations: - name: etcd + optional: true serviceRefDeclarationSpecs: - serviceKind: etcd serviceVersion: "^*" @@ -84,6 +85,7 @@ spec: serviceRefVarRef: name: etcd endpoint: Required + optional: true - name: POSTGRES_USER valueFrom: credentialVarRef: diff --git a/addons/redis/templates/backuppolicytemplate.yaml b/addons/redis/templates/backuppolicytemplate.yaml index edf322ff0..142863e5b 100644 --- a/addons/redis/templates/backuppolicytemplate.yaml +++ b/addons/redis/templates/backuppolicytemplate.yaml @@ -13,6 +13,7 @@ spec: - {{ include "redis.componentDefName" . }} target: role: secondary + fallbackRole: primary account: default backupMethods: - name: datafile @@ -40,6 +41,7 @@ spec: - {{ include "redis-cluster.componentDefName" . }} target: role: secondary + fallbackRole: primary account: default backupMethods: - name: datafile diff --git a/addons/zookeeper/templates/backuppolicytemplate.yaml b/addons/zookeeper/templates/backuppolicytemplate.yaml index e5793834f..297ae464f 100644 --- a/addons/zookeeper/templates/backuppolicytemplate.yaml +++ b/addons/zookeeper/templates/backuppolicytemplate.yaml @@ -12,6 +12,7 @@ spec: - componentDefs: [zookeeper] target: role: follower + fallbackRole: leader backupMethods: - name: zoocreeper snapshotVolumes: false