Revert "Add ability to easily choose the PostgresCluster API version in the kuttl/chainsaw tests"

This reverts commit 46a613d.

Author: tjmoore4

Makefile

@@ -201,7 +201,6 @@ check-kuttl: ## example command: make check-kuttl KUTTL_TEST='
 		--config testing/kuttl/kuttl-test.yaml
 
 .PHONY: generate-kuttl
-generate-kuttl: export KUTTL_PGCLUSTER_API_VERSION ?= v1
 generate-kuttl: export KUTTL_PG_UPGRADE_FROM_VERSION ?= 16
 generate-kuttl: export KUTTL_PG_UPGRADE_TO_VERSION ?= 17
 generate-kuttl: export KUTTL_PG_VERSION ?= 16
@@ -212,7 +211,6 @@ generate-kuttl: ## Generate kuttl tests
 	[ ! -d testing/kuttl/e2e-generated ] || rm -r testing/kuttl/e2e-generated
 	bash -ceu ' \
 	render() { envsubst '"'"' \
-		$$KUTTL_PGCLUSTER_API_VERSION \
 		$$KUTTL_PG_UPGRADE_FROM_VERSION $$KUTTL_PG_UPGRADE_TO_VERSION \
 		$$KUTTL_PG_VERSION $$KUTTL_POSTGIS_VERSION $$KUTTL_PSQL_IMAGE \
 		$$KUTTL_TEST_DELETE_NAMESPACE'"'"'; }; \

testing/chainsaw/e2e/pgbackrest-restore/chainsaw-test.yaml

@@ -19,10 +19,6 @@ spec:
     - name: volume
       value: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
 
-    - name: postgrescluster
-      value:
-        apiVersion: (join('', ['postgres-operator.crunchydata.com/', $values.versions.postgrescluster]))
-
   steps:
     - name: 'Create Cluster with replica, tablespace'
       use:
@@ -89,7 +85,7 @@ spec:
             deletionPropagationPolicy: Background
             expect: [{ check: { (`true`): true } }]
             ref:
-              apiVersion: ($postgrescluster.apiVersion)
+              apiVersion: postgres-operator.crunchydata.com/v1beta1
               kind: PostgresCluster
               name: clone-one
 
@@ -166,7 +162,7 @@ spec:
             deletionPropagationPolicy: Background
             expect: [{ check: { (`true`): true } }]
             ref:
-              apiVersion: ($postgrescluster.apiVersion)
+              apiVersion: postgres-operator.crunchydata.com/v1beta1
               kind: PostgresCluster
               name: clone-two
 

testing/chainsaw/e2e/pgbackrest-restore/templates/change-parameters.yaml

@@ -52,7 +52,7 @@ spec:
         Update the cluster with parameters that require attention during recovery
       patch:
         resource:
-          apiVersion: ($postgrescluster.apiVersion)
+          apiVersion: postgres-operator.crunchydata.com/v1beta1
           kind: PostgresCluster
           metadata:
             name: original

testing/chainsaw/e2e/pgbackrest-restore/templates/clone-cluster.yaml

@@ -13,7 +13,7 @@ spec:
         Clone the cluster using a pgBackRest restore
       apply:
         resource:
-          apiVersion: ($postgrescluster.apiVersion)
+          apiVersion: postgres-operator.crunchydata.com/v1beta1
           kind: PostgresCluster
           metadata:
             name: ($name)
@@ -39,7 +39,7 @@ spec:
         Wait for the cluster to come online
       assert:
         resource:
-          apiVersion: ($postgrescluster.apiVersion)
+          apiVersion: postgres-operator.crunchydata.com/v1beta1
           kind: PostgresCluster
           metadata:
             name: ($name)

testing/chainsaw/e2e/pgbackrest-restore/templates/create-backup.yaml

@@ -12,7 +12,7 @@ spec:
         Annotate the cluster to trigger a backup
       patch:
         resource:
-          apiVersion: ($postgrescluster.apiVersion)
+          apiVersion: postgres-operator.crunchydata.com/v1beta1
           kind: PostgresCluster
           metadata:
             name: original

testing/chainsaw/e2e/pgbackrest-restore/templates/create-cluster.yaml

@@ -10,7 +10,7 @@ spec:
         and some parameters that require attention during PostgreSQL recovery
       apply:
         resource:
-          apiVersion: ($postgrescluster.apiVersion)
+          apiVersion: postgres-operator.crunchydata.com/v1beta1
           kind: PostgresCluster
           metadata:
             name: original
@@ -40,7 +40,7 @@ spec:
         Wait for the replica backup to complete
       assert:
         resource:
-          apiVersion: ($postgrescluster.apiVersion)
+          apiVersion: postgres-operator.crunchydata.com/v1beta1
           kind: PostgresCluster
           metadata:
             name: original

testing/chainsaw/e2e/pgbackrest-restore/templates/point-in-time-restore.yaml

@@ -25,7 +25,7 @@ spec:
         Trigger an in-place point-in-time restore (PITR)
       patch:
         resource:
-          apiVersion: ($postgrescluster.apiVersion)
+          apiVersion: postgres-operator.crunchydata.com/v1beta1
           kind: PostgresCluster
           metadata:
             name: original
@@ -46,7 +46,7 @@ spec:
         Wait for the restore to complete and the cluster to come online
       assert:
         resource:
-          apiVersion: ($postgrescluster.apiVersion)
+          apiVersion: postgres-operator.crunchydata.com/v1beta1
           kind: PostgresCluster
           metadata:
             name: original

testing/chainsaw/e2e/values.yaml

@@ -1,6 +1,5 @@
 versions:
   postgres: '17'
-  postgrescluster: 'v1'
 
 images:
   psql: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.6-2542'

testing/kuttl/e2e/cluster-pause/files/00-cluster-created.yaml

@@ -1,4 +1,4 @@
-apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION}
+apiVersion: postgres-operator.crunchydata.com/v1beta1
 kind: PostgresCluster
 metadata:
   name: cluster-pause

testing/kuttl/e2e/cluster-pause/files/00-create-cluster.yaml

@@ -1,4 +1,4 @@
-apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION}
+apiVersion: postgres-operator.crunchydata.com/v1beta1
 kind: PostgresCluster
 metadata:
   name: cluster-pause