K8SPG-643: Fix stanza-upgrade after major upgrade (#911)

* K8SPG-643: Fix stanza-upgrade after major upgrade

* fix test ¯\_(ツ)_/¯

* increase timeouts

Author: egegunes

…sts/tests/major-upgrade/04-12-to-13.yaml …sts/tests/major-upgrade/10-12-to-13.yamle2e-tests/tests/major-upgrade/04-12-to-13.yaml renamed to e2e-tests/tests/major-upgrade/10-12-to-13.yaml e2e-tests/tests/major-upgrade/04-12-to-13.yaml renamed to e2e-tests/tests/major-upgrade/10-12-to-13.yaml

@@ -7,7 +7,7 @@ kind: PerconaPGCluster
 metadata:
   name: major-upgrade
 spec:
-  postgresVersion: 16
+  postgresVersion: 13
 status:
   pgbouncer:
     ready: 3

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

@@ -1,10 +1,31 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 30
+timeout: 660
 ---
-kind: ConfigMap
-apiVersion: v1
+kind: Job
+apiVersion: batch/v1
 metadata:
-  name: 11-read-from-primary
-data:
-  data: ' 100500'
+  annotations:
+    postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-12-to-13
+  labels:
+    postgres-operator.crunchydata.com/pgbackrest-backup: manual
+    postgres-operator.crunchydata.com/pgbackrest-repo: repo1
+  ownerReferences:
+    - apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGBackup
+      controller: true
+      blockOwnerDeletion: true
+status:
+  succeeded: 1
+---
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGBackup
+metadata:
+  name: backup-after-12-to-13
+spec:
+  pgCluster: major-upgrade
+  repoName: repo1
+  options:
+    - --type=full
+status:
+  state: Succeeded

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

@@ -0,0 +1,9 @@
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGBackup
+metadata:
+  name: backup-after-12-to-13
+spec:
+  pgCluster: major-upgrade
+  repoName: repo1
+  options:
+    - --type=full

e2e-tests/tests/major-upgrade/11-run-backup.yaml

@@ -0,0 +1,30 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 720
+---
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGRestore
+metadata:
+  name: restore-after-12-to-13
+spec:
+  pgCluster: major-upgrade
+  repoName: repo1
+status:
+  state: Succeeded
+---
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGCluster
+metadata:
+  name: major-upgrade
+status:
+  pgbouncer:
+    ready: 3
+    size: 3
+  postgres:
+    instances:
+    - name: instance1
+      ready: 3
+      size: 3
+    ready: 3
+    size: 3
+  state: ready

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

@@ -0,0 +1,7 @@
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGRestore
+metadata:
+  name: restore-after-12-to-13
+spec:
+  pgCluster: major-upgrade
+  repoName: repo1

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

@@ -9,4 +9,4 @@ commands:
       source ../../functions
       data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)")
 
-      kubectl create configmap -n "${NAMESPACE}" 05-read-from-primary --from-literal=data="${data}"
+      kubectl create configmap -n "${NAMESPACE}" 05-read-from-primary --from-literal=data="${data}"