K8SPG-651: fix scheduled-backup (#1058)

Author: eleo007

e2e-tests/tests/scheduled-backup/07-add-sleep.yaml

@@ -0,0 +1,8 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      set -o errexit
+      set -o xtrace
+
+      sleep 2

e2e-tests/tests/scheduled-backup/07-assert.yaml

@@ -2,39 +2,29 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 600
 ---
-kind: Job
-apiVersion: batch/v1
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGBackup
 metadata:
-  labels:
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo3
-  ownerReferences:
-    - apiVersion: pgv2.percona.com/v2
-      kind: PerconaPGBackup
-      controller: true
-      blockOwnerDeletion: true
-status:
-  succeeded: 1
+  generation: 1
+spec:
+  pgCluster: scheduled-backup
+  repoName: repo3
 ---
-kind: Job
-apiVersion: batch/v1
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGBackup
 metadata:
-  labels:
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo2
-  ownerReferences:
-    - apiVersion: pgv2.percona.com/v2
-      kind: PerconaPGBackup
-      controller: true
-      blockOwnerDeletion: true
-status:
-  succeeded: 1
+  generation: 1
+spec:
+  pgCluster: scheduled-backup
+  repoName: repo2
 ---
 apiVersion: pgv2.percona.com/v2
 kind: PerconaPGBackup
 metadata:
   generation: 1
 spec:
   pgCluster: scheduled-backup
-  repoName: repo3
+  repoName: repo1
 status:
   backupType: full
   state: Succeeded
@@ -45,15 +35,8 @@ metadata:
   generation: 1
 spec:
   pgCluster: scheduled-backup
-  repoName: repo2
+  repoName: repo1
 status:
   backupType: full
   state: Succeeded
----
-apiVersion: postgres-operator.crunchydata.com/v1beta1
-kind: PostgresCluster
-metadata:
-  name: scheduled-backup
-  generation: 9
-status:
-  observedGeneration: 9
+

e2e-tests/tests/scheduled-backup/08-assert.yaml

@@ -1,17 +1,59 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 30
+timeout: 600
 ---
-kind: ConfigMap
-apiVersion: v1
+kind: Job
+apiVersion: batch/v1
 metadata:
-  name: pitr-target
+  labels:
+    postgres-operator.crunchydata.com/pgbackrest-repo: repo3
+  ownerReferences:
+    - apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGBackup
+      controller: true
+      blockOwnerDeletion: true
+status:
+  succeeded: 1
 ---
-kind: ConfigMap
-apiVersion: v1
+kind: Job
+apiVersion: batch/v1
 metadata:
-  name: 09-add-more-data
-data:
-  data: |2-
-     100500
-     100501
+  labels:
+    postgres-operator.crunchydata.com/pgbackrest-repo: repo2
+  ownerReferences:
+    - apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGBackup
+      controller: true
+      blockOwnerDeletion: true
+status:
+  succeeded: 1
+---
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGBackup
+metadata:
+  generation: 1
+spec:
+  pgCluster: scheduled-backup
+  repoName: repo3
+status:
+  backupType: full
+  state: Succeeded
+---
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGBackup
+metadata:
+  generation: 1
+spec:
+  pgCluster: scheduled-backup
+  repoName: repo2
+status:
+  backupType: full
+  state: Succeeded
+---
+apiVersion: postgres-operator.crunchydata.com/v1beta1
+kind: PostgresCluster
+metadata:
+  name: scheduled-backup
+  generation: 9
+status:
+  observedGeneration: 9

…ts/scheduled-backup/07-engage-azure.yaml …ts/scheduled-backup/08-engage-azure.yamle2e-tests/tests/scheduled-backup/07-engage-azure.yaml renamed to e2e-tests/tests/scheduled-backup/08-engage-azure.yaml e2e-tests/tests/scheduled-backup/07-engage-azure.yaml renamed to e2e-tests/tests/scheduled-backup/08-engage-azure.yaml

@@ -1,48 +1,17 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 380
+timeout: 30
 ---
-apiVersion: postgres-operator.crunchydata.com/v1beta1
-kind: PostgresCluster
+kind: ConfigMap
+apiVersion: v1
 metadata:
-  name: scheduled-backup
-  generation: 11
-  ownerReferences:
-    - apiVersion: pgv2.percona.com/v2
-      kind: PerconaPGCluster
-      name: scheduled-backup
-      controller: true
-      blockOwnerDeletion: true
-  finalizers:
-    - postgres-operator.crunchydata.com/finalizer
-status:
-  instances:
-    - name: instance1
-      readyReplicas: 3
-      replicas: 3
-      updatedReplicas: 3
-  observedGeneration: 11
-  pgbackrest:
-    repos:
-      - name: repo1
-        replicaCreateBackupComplete: true
-        stanzaCreated: true
-      - name: repo2
-        stanzaCreated: true
-      - name: repo3
-        stanzaCreated: true
-    restore:
-      finished: true
-      id: s3-restore
-      succeeded: 1
-  proxy:
-    pgBouncer:
-      readyReplicas: 3
-      replicas: 3
+  name: pitr-target
 ---
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
+kind: ConfigMap
+apiVersion: v1
 metadata:
-  name: s3-restore
-status:
-  state: Succeeded
+  name: 09-add-more-data
+data:
+  data: |2-
+     100500
+     100501

e2e-tests/tests/scheduled-backup/09-assert.yaml

@@ -1,10 +1,48 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 30
+timeout: 380
 ---
-kind: ConfigMap
-apiVersion: v1
+apiVersion: postgres-operator.crunchydata.com/v1beta1
+kind: PostgresCluster
 metadata:
-  name: 11-verify-restored-data
-data:
-  data: ' 100500'
+  name: scheduled-backup
+  generation: 11
+  ownerReferences:
+    - apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGCluster
+      name: scheduled-backup
+      controller: true
+      blockOwnerDeletion: true
+  finalizers:
+    - postgres-operator.crunchydata.com/finalizer
+status:
+  instances:
+    - name: instance1
+      readyReplicas: 3
+      replicas: 3
+      updatedReplicas: 3
+  observedGeneration: 11
+  pgbackrest:
+    repos:
+      - name: repo1
+        replicaCreateBackupComplete: true
+        stanzaCreated: true
+      - name: repo2
+        stanzaCreated: true
+      - name: repo3
+        stanzaCreated: true
+    restore:
+      finished: true
+      id: s3-restore
+      succeeded: 1
+  proxy:
+    pgBouncer:
+      readyReplicas: 3
+      replicas: 3
+---
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGRestore
+metadata:
+  name: s3-restore
+status:
+  state: Succeeded