some adjust by review

Author: yanboer

platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml.template

@@ -161,10 +161,6 @@ spec:
                     type: string
                   PATH:
                     type: string
-                  BACKUP_NAME:
-                    type: string
-                  RESTORE_NAME:
-                    type: string
               services:
                 type: array
                 items:
@@ -361,6 +357,11 @@ spec:
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
                 properties:
+                  backups3:
+                    type: object
+                    properties:
+                      name:
+                        type: string
                   manual:
                     type: object
                     properties:
@@ -414,6 +415,8 @@ spec:
                   froms3:
                     type: object
                     properties:
+                      name:
+                        type: string
                       recovery:
                         type: string
 

platforms/kubernetes/postgres-operator/deploy/postgresql.yaml

@@ -164,9 +164,9 @@ spec:
     ENDPOINT: "http://s3.pek3.qingstor.com/"
     BUCKET: "postgresql"
     PATH: "test/backup"
-#    BACKUP_NAME: "postgresql-backup"
-#    RESTORE_NAME: "postgresql-backup"
 #  backupCluster:
+#    backups3:
+#      name: postgresql-backup
 #    manual:
 #      trigger-id: 2
 #    cron:
@@ -188,6 +188,7 @@ spec:
                                                  # RECOVERY WINDOW OF value {DAYS | WEEKS | MONTHS}: keep backup time. eg: RECOVERY WINDOW OF 60 DAYS
 #  restore:
 #    froms3:
+##      name: postgresql-backup
 #      recovery: latest                      # backupid or recovery_time or macro variable
                                                 # eg:
                                                       # recovery: 20221011T143943 means recovering full data from 20221011T143943 backup

platforms/kubernetes/postgres-operator/postgres/constants.py

@@ -50,6 +50,8 @@
 SPEC_POSTGRESQL_USERS_USER_PASSWORD = "password"
 SPEC_POSTGRESQL_USERS_USER_NAME = "name"
 SPEC_BACKUP = "backupCluster"
+SPEC_BACKUP_BACKUPS3 = "backups3"
+SPEC_BACKUP_BACKUPS3_NAME = "name"
 SPEC_BACKUP_MANUAL = "manual"
 SPEC_BACKUP_TRIGGER_ID = "trigger-id"
 SPEC_BACKUP_CRON = "cron"
@@ -70,6 +72,7 @@
 RESTORE_FROMSSH_ADDRESS = "address"
 RESTORE_FROMSSH_LOCAL = "local"
 RESTORE_FROMS3 = "froms3"
+RESTORE_FROMS3_NAME = "name"
 RESTORE_FROMS3_RECOVERY = "recovery"
 RESTORE_FROMS3_RECOVERY_LATEST = "latest"
 RESTORE_FROMS3_RECOVERY_LATEST_FULL = "latest-full"
@@ -153,8 +156,6 @@
 SPEC_S3_ENDPOINT = "ENDPOINT"
 SPEC_S3_BUCKET = "BUCKET"
 SPEC_S3_PATH = "PATH"
-SPEC_S3_BACKUP_NAME = "BACKUP_NAME"
-SPEC_S3_RESTORE_NAME = "RESTORE_NAME"
 
 # pod PriorityClass
 SPEC_POD_PRIORITY_CLASS = "priorityClassName"

platforms/kubernetes/postgres-operator/postgres/handle.py

@@ -152,9 +152,9 @@
     SPEC_S3_ENDPOINT,
     SPEC_S3_BUCKET,
     SPEC_S3_PATH,
-    SPEC_S3_BACKUP_NAME,
-    SPEC_S3_RESTORE_NAME,
     SPEC_BACKUP,
+    SPEC_BACKUP_BACKUPS3,
+    SPEC_BACKUP_BACKUPS3_NAME,
     SPEC_BACKUP_MANUAL,
     SPEC_BACKUP_TRIGGER_ID,
     SPEC_BACKUP_CRON,
@@ -170,6 +170,7 @@
     SPEC_BACKUP_POLICY_RETENTION,
     SPEC_BACKUP_POLICY_RETENTION_DEFAULT_VALUE,
     RESTORE_FROMS3,
+    RESTORE_FROMS3_NAME,
     RESTORE_FROMS3_RECOVERY,
     CLUSTER_STATUS_BACKUP,
     CLUSTER_STATUS_ARCHIVE,
@@ -1613,16 +1614,21 @@ def get_oldest_backupid(backup_info: TypedDict) -> str:
     return backupid
 
 
-def get_s3_env(meta: kopf.Meta, s3: TypedDict) -> List:
+def get_backup_name_env(meta: kopf.Meta, name: str = None) -> List:
     res = list()
 
-    name = meta["name"]
-    if SPEC_S3_BACKUP_NAME in s3:
-        name = s3.pop(SPEC_S3_BACKUP_NAME)
-    if SPEC_S3_RESTORE_NAME in s3:
-        name = s3.pop(SPEC_S3_RESTORE_NAME)
-    res.append("-e")
-    res.append(BARMAN_BACKUP_NAME + '="' + name + '"')
+    if name is None:
+        name = meta['name']
+
+    env = BARMAN_BACKUP_NAME + '="' + name + '"'
+    res.append('-e')
+    res.append(env)
+
+    return res
+
+
+def get_s3_env(s3: TypedDict) -> List:
+    res = list()
 
     # use SPEC_S3 prefix replace S3 key (must use S3_ prefix)
     for k in list(s3.keys()):
@@ -1676,11 +1682,13 @@ def restore_postgresql_froms3(
     recovery_time = None
 
     recovery = spec[RESTORE][RESTORE_FROMS3].get(RESTORE_FROMS3_RECOVERY, None)
+    name = spec[RESTORE][RESTORE_FROMS3].get(RESTORE_FROMS3_NAME, None)
 
     # add s3 env by pgtools -e
     s3 = spec[SPEC_S3].copy()
-    s3.pop(SPEC_S3_BACKUP_NAME, None)
-    s3_info = get_s3_env(meta, s3)
+    s3_list = get_s3_env(s3)
+    name_list = get_backup_name_env(meta, name)
+    s3_info = [*s3_list, *name_list]
 
     tmpconns: InstanceConnections = InstanceConnections()
     tmpconns.add(conn)
@@ -1913,13 +1921,15 @@ def backup_postgresql_to_s3(
 
     # add s3 env by pgtools
     s3 = spec[SPEC_S3].copy()
-    s3.pop(SPEC_S3_RESTORE_NAME, None)
-    s3_list = get_s3_env(meta, s3)
+    s3_list = get_s3_env(s3)
 
     backup_policy = spec.get(SPEC_BACKUP, {}).get(SPEC_BACKUP_POLICY, {})
     policy_list = get_policy_env(backup_policy)
 
-    s3_info = [*s3_list, *policy_list]
+    name = spec[SPEC_BACKUP].get(SPEC_BACKUP_BACKUPS3, {}).get(SPEC_BACKUP_BACKUPS3_NAME, None)
+    name_list = get_backup_name_env(meta, name)
+
+    s3_info = [*s3_list, *policy_list, *name_list]
 
     cmd = ["pgtools", "-b"] + s3_info
     logging.warning(f"backup_postgresql_to_s3 execute {cmd} to backup cluster on readwrite node")
@@ -3592,7 +3602,7 @@ def correct_s3_profile(
 ) -> None:
     if is_s3_manual_backup_mode(meta, spec, patch, status, logger) or is_s3_cron_backup_mode(meta, spec, patch, status, logger):
         s3 = spec[SPEC_S3].copy()
-        s3_info = get_s3_env(meta, s3)
+        s3_info = get_s3_env(s3)
         readwrite_conns = connections(spec, meta, patch,
                                       get_field(POSTGRESQL, READWRITEINSTANCE),
                                       False, None, logger, None, status, False)