Adds KUTTL_PG_UPGRADE_TO_VERSION parameter

A new parameter is added to decouple settings
between operator tests and upgrade tests.

Issue: [sc-17416]

Author: tony-landreth

Makefile

@@ -221,6 +221,7 @@ check-kuttl:
 
 .PHONY: generate-kuttl
 generate-kuttl: export KUTTL_PG_UPGRADE_FROM_VERSION ?= 13
+generate-kuttl: export KUTTL_PG_UPGRADE_TO_VERSION ?= 14
 generate-kuttl: export KUTTL_PG_VERSION ?= 14
 generate-kuttl: export KUTTL_POSTGIS_VERSION ?= 3.1
 generate-kuttl: export KUTTL_PSQL_IMAGE ?= registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.6-2
@@ -235,7 +236,7 @@ generate-kuttl:
 	12 ) export KUTTL_BITNAMI_IMAGE_TAG=12.12.0-debian-11-r40 ;; \
 	11 ) export KUTTL_BITNAMI_IMAGE_TAG=11.17.0-debian-11-r39 ;; \
 	esac; \
-	render() { envsubst '"'"'$$KUTTL_PG_UPGRADE_FROM_VERSION $$KUTTL_PG_VERSION $$KUTTL_POSTGIS_VERSION $$KUTTL_PSQL_IMAGE $$KUTTL_BITNAMI_IMAGE_TAG'"'"'; }; \
+	render() { envsubst '"'"'$$KUTTL_PG_UPGRADE_FROM_VERSION $$KUTTL_PG_UPGRADE_TO_VERSION $$KUTTL_PG_VERSION $$KUTTL_POSTGIS_VERSION $$KUTTL_PSQL_IMAGE $$KUTTL_BITNAMI_IMAGE_TAG'"'"'; }; \
 	while [ $$# -gt 0 ]; do \
 		source="$${1}" target="$${1/e2e/e2e-generated}"; \
 		mkdir -p "$${target%/*}"; render < "$${source}" > "$${target}"; \

testing/kuttl/e2e/major-upgrade/02--valid-upgrade.yaml

@@ -6,5 +6,5 @@ metadata:
   name: major-upgrade-do-it
 spec:
   fromPostgresVersion: ${KUTTL_PG_UPGRADE_FROM_VERSION}
-  toPostgresVersion: ${KUTTL_PG_VERSION}
+  toPostgresVersion: ${KUTTL_PG_UPGRADE_TO_VERSION}
   postgresClusterName: major-upgrade

testing/kuttl/e2e/major-upgrade/10--already-updated-cluster.yaml

@@ -5,7 +5,7 @@ kind: PostgresCluster
 metadata:
   name: major-upgrade
 spec:
-  postgresVersion: ${KUTTL_PG_VERSION}
+  postgresVersion: ${KUTTL_PG_UPGRADE_TO_VERSION}
   instances:
     - dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
   backups:

testing/kuttl/e2e/major-upgrade/33-assert.yaml

@@ -19,4 +19,4 @@ kind: PostgresCluster
 metadata:
   name: major-upgrade
 status:
-  postgresVersion: ${KUTTL_PG_VERSION}
+  postgresVersion: ${KUTTL_PG_UPGRADE_TO_VERSION}

testing/kuttl/e2e/major-upgrade/34--restart-cluster.yaml

@@ -6,5 +6,5 @@ kind: PostgresCluster
 metadata:
   name: major-upgrade
 spec:
-  postgresVersion: ${KUTTL_PG_VERSION}
+  postgresVersion: ${KUTTL_PG_UPGRADE_TO_VERSION}
   shutdown: false

testing/kuttl/e2e/major-upgrade/34-assert.yaml

@@ -5,7 +5,7 @@ kind: PostgresCluster
 metadata:
   name: major-upgrade
 status:
-  postgresVersion: ${KUTTL_PG_VERSION}
+  postgresVersion: ${KUTTL_PG_UPGRADE_TO_VERSION}
   instances:
     - name: '00'
       replicas: 3

testing/kuttl/e2e/major-upgrade/36--check-data-and-version.yaml

@@ -34,7 +34,7 @@ spec:
             - |
               DO $$$$
               BEGIN
-                ASSERT current_setting('server_version_num') LIKE '${KUTTL_PG_VERSION}%',
+                ASSERT current_setting('server_version_num') LIKE '${KUTTL_PG_UPGRADE_TO_VERSION}%',
                   format('got %L', current_setting('server_version_num'));
               END $$$$;
             - --command
@@ -94,7 +94,7 @@ spec:
             - |
               DO $$$$
               BEGIN
-                ASSERT current_setting('server_version_num') LIKE '${KUTTL_PG_VERSION}%',
+              ASSERT current_setting('server_version_num') LIKE '${KUTTL_PG_UPGRADE_TO_VERSION}%',
                   format('got %L', current_setting('server_version_num'));
               END $$$$;
             - --command

testing/kuttl/e2e/wal-pvc-pgupgrade/00--create-resources.yaml

@@ -24,5 +24,5 @@ metadata:
   name: wal-pvc-pgupgrade-do-it
 spec:
   fromPostgresVersion: ${KUTTL_PG_UPGRADE_FROM_VERSION}
-  toPostgresVersion: ${KUTTL_PG_VERSION}
+  toPostgresVersion: ${KUTTL_PG_UPGRADE_TO_VERSION}
   postgresClusterName: wal-pvc-pgupgrade

testing/kuttl/e2e/wal-pvc-pgupgrade/03-assert.yaml

@@ -19,4 +19,4 @@ kind: PostgresCluster
 metadata:
   name: wal-pvc-pgupgrade
 status:
-  postgresVersion: ${KUTTL_PG_VERSION}
+  postgresVersion: ${KUTTL_PG_UPGRADE_TO_VERSION}

testing/kuttl/e2e/wal-pvc-pgupgrade/04--restart-cluster.yaml

@@ -6,5 +6,5 @@ kind: PostgresCluster
 metadata:
   name: wal-pvc-pgupgrade
 spec:
-  postgresVersion: ${KUTTL_PG_VERSION}
+  postgresVersion: ${KUTTL_PG_UPGRADE_TO_VERSION}
   shutdown: false