add BACKUP_NAME and RESTORE_NAME param

Author: yanboer

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

@@ -161,6 +161,10 @@ spec:
                     type: string
                   PATH:
                     type: string
+                  BACKUP_NAME:
+                    type: string
+                  RESTORE_NAME:
+                    type: string
               services:
                 type: array
                 items:

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

@@ -164,6 +164,8 @@ spec:
     ENDPOINT: "http://s3.pek3.qingstor.com/"
     BUCKET: "postgresql"
     PATH: "test/backup"
+#    BACKUP_NAME: "postgresql-backup"
+#    RESTORE_NAME: "postgresql-backup"
 #  backupCluster:
 #    manual:
 #      trigger-id: 2

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

@@ -153,6 +153,8 @@
 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,6 +152,8 @@
     SPEC_S3_ENDPOINT,
     SPEC_S3_BUCKET,
     SPEC_S3_PATH,
+    SPEC_S3_BACKUP_NAME,
+    SPEC_S3_RESTORE_NAME,
     SPEC_BACKUP,
     SPEC_BACKUP_MANUAL,
     SPEC_BACKUP_TRIGGER_ID,
@@ -295,6 +297,7 @@
 BARMAN_BACKUP_END = "end_time"
 BARMAN_BACKUP_ID = "backup_id"
 BARMAN_BACKUP_SIZE = "size"
+BARMAN_BACKUP_NAME = "BARMAN_BACKUPNAME"
 BARMAN_STATUS_DEFAULT_NEED_FIELD = ["backup_id", "begin_time", "end_time", "begin_xlog", "end_xlog"]
 BARMAN_TIME_FORMAT = "%a %b %d %H:%M:%S %Y"
 ### end
@@ -1610,9 +1613,17 @@ def get_oldest_backupid(backup_info: TypedDict) -> str:
     return backupid
 
 
-def get_s3_env(s3: TypedDict) -> List:
+def get_s3_env(meta: kopf.Meta, s3: TypedDict) -> 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 + '"')
+
     # use SPEC_S3 prefix replace S3 key (must use S3_ prefix)
     for k in list(s3.keys()):
         old = k
@@ -1668,7 +1679,8 @@ def restore_postgresql_froms3(
 
     # add s3 env by pgtools -e
     s3 = spec[SPEC_S3].copy()
-    s3_info = get_s3_env(s3)
+    s3.pop(SPEC_S3_BACKUP_NAME, None)
+    s3_info = get_s3_env(meta, s3)
 
     tmpconns: InstanceConnections = InstanceConnections()
     tmpconns.add(conn)
@@ -1901,7 +1913,8 @@ def backup_postgresql_to_s3(
 
     # add s3 env by pgtools
     s3 = spec[SPEC_S3].copy()
-    s3_list = get_s3_env(s3)
+    s3.pop(SPEC_S3_RESTORE_NAME, None)
+    s3_list = get_s3_env(meta, s3)
 
     backup_policy = spec.get(SPEC_BACKUP, {}).get(SPEC_BACKUP_POLICY, {})
     policy_list = get_policy_env(backup_policy)
@@ -3579,7 +3592,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(s3)
+        s3_info = get_s3_env(meta, s3)
         readwrite_conns = connections(spec, meta, patch,
                                       get_field(POSTGRESQL, READWRITEINSTANCE),
                                       False, None, logger, None, status, False)