fix

Author: egegunes

e2e-tests/tests/major-upgrade/01-create-cluster.yaml

@@ -13,6 +13,7 @@ commands:
           .spec.postgresVersion = 13 |
           .spec.image = "perconalab/percona-postgresql-operator:main-ppg13-postgres" |
           .spec.instances[0].dataVolumeClaimSpec.resources.requests.storage = "3Gi" |
+          .spec.patroni.createReplicaMethods = ["basebackup","pgbackrest"] |
           .spec.proxy.pgBouncer.image = "perconalab/percona-postgresql-operator:main-ppg13-pgbouncer" |
           .spec.backups.pgbackrest.image = "perconalab/percona-postgresql-operator:main-ppg13-pgbackrest"' \
         | kubectl -n "${NAMESPACE}" apply -f -

e2e-tests/tests/major-upgrade/21-wait-and-write-data.yaml

@@ -19,6 +19,6 @@ commands:
       done
 
       run_psql_local \
-        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100502)' \
+        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100501)' \
         "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"
 

e2e-tests/tests/major-upgrade/28-run-restore.yaml

@@ -1,21 +1,7 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - timeout: 600
-    script: |-
-      set -o errexit
-      set -o xtrace
-
-      backup_name=$(kubectl -n ${NAMESPACE} get pg-backup backup-after-13-to-14 -o jsonpath={.status.backupName})
-
-      cat <<-EOF | kubectl -n ${NAMESPACE} apply -f -
-      apiVersion: pgv2.percona.com/v2
-      kind: PerconaPGRestore
-      metadata:
-        name: restore-after-13-to-14
-      spec:
-        pgCluster: major-upgrade
-        repoName: repo1
-        options:
-        - --set=${backup_name}
-      EOF
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGRestore
+metadata:
+  name: restore-after-13-to-14
+spec:
+  pgCluster: major-upgrade
+  repoName: repo1

e2e-tests/tests/major-upgrade/29-assert.yaml

@@ -10,4 +10,3 @@ data:
   data: |2-
      100500
      100501
-     100502

e2e-tests/tests/major-upgrade/31-wait-and-write-data.yaml

@@ -19,6 +19,6 @@ commands:
       done
 
       run_psql_local \
-        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100503)' \
+        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100502)' \
         "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"
 

e2e-tests/tests/major-upgrade/38-run-restore.yaml

@@ -1,21 +1,7 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - timeout: 600
-    script: |-
-      set -o errexit
-      set -o xtrace
-
-      backup_name=$(kubectl -n ${NAMESPACE} get pg-backup backup-after-14-to-15 -o jsonpath={.status.backupName})
-
-      cat <<-EOF | kubectl -n ${NAMESPACE} apply -f -
-      apiVersion: pgv2.percona.com/v2
-      kind: PerconaPGRestore
-      metadata:
-        name: restore-after-14-to-15
-      spec:
-        pgCluster: major-upgrade
-        repoName: repo1
-        options:
-        - --set=${backup_name}
-      EOF
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGRestore
+metadata:
+  name: restore-after-14-to-15
+spec:
+  pgCluster: major-upgrade
+  repoName: repo1

e2e-tests/tests/major-upgrade/39-assert.yaml

@@ -11,4 +11,3 @@ data:
      100500
      100501
      100502
-     100503

e2e-tests/tests/major-upgrade/41-wait-and-write-data.yaml

@@ -19,6 +19,6 @@ commands:
       done
 
       run_psql_local \
-        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100504)' \
+        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100503)' \
         "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"
 

e2e-tests/tests/major-upgrade/48-run-restore.yaml

@@ -1,21 +1,7 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - timeout: 600
-    script: |-
-      set -o errexit
-      set -o xtrace
-
-      backup_name=$(kubectl -n ${NAMESPACE} get pg-backup backup-after-15-to-16 -o jsonpath={.status.backupName})
-
-      cat <<-EOF | kubectl -n ${NAMESPACE} apply -f -
-      apiVersion: pgv2.percona.com/v2
-      kind: PerconaPGRestore
-      metadata:
-        name: restore-after-15-to-16
-      spec:
-        pgCluster: major-upgrade
-        repoName: repo1
-        options:
-        - --set=${backup_name}
-      EOF
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGRestore
+metadata:
+  name: restore-after-15-to-16
+spec:
+  pgCluster: major-upgrade
+  repoName: repo1

e2e-tests/tests/major-upgrade/49-assert.yaml

@@ -12,4 +12,3 @@ data:
      100501
      100502
      100503
-     100504