From b0707789b4e724ec20b9ad2564b0836a3192d836 Mon Sep 17 00:00:00 2001 From: Drew Sessler Date: Wed, 12 Nov 2025 19:27:30 -0800 Subject: [PATCH 1/2] refactor TestPostgresConfigParametersV1beta1 --- .../postgrescluster/postgres_config_test.go | 118 ++++++------------ 1 file changed, 38 insertions(+), 80 deletions(-) diff --git a/internal/crd/validation/postgrescluster/postgres_config_test.go b/internal/crd/validation/postgrescluster/postgres_config_test.go index 83b46e2437..1971d71155 100644 --- a/internal/crd/validation/postgrescluster/postgres_config_test.go +++ b/internal/crd/validation/postgrescluster/postgres_config_test.go @@ -71,43 +71,24 @@ func TestPostgresConfigParametersV1beta1(t *testing.T) { }) }) - t.Run("ssl_groups and ssl_ecdh_curve", func(t *testing.T) { - t.Run("ssl_groups not allowed for pg17", func(t *testing.T) { + t.Run("SSL Settings", func(t *testing.T) { + t.Run("Allowed", func(t *testing.T) { for _, tt := range []struct { - key string - value any + key string + value any + postgresVersion int }{ - {key: "ssl_groups", value: "anything"}, - } { - t.Run(tt.key, func(t *testing.T) { - cluster := u.DeepCopy() - require.UnmarshalIntoField(t, cluster, - require.Value(yaml.Marshal(17)), - "spec", "postgresVersion") - require.UnmarshalIntoField(t, cluster, - require.Value(yaml.Marshal(tt.value)), - "spec", "config", "parameters", tt.key) + // ssl_ecdh_curve is allowed for all supported Postgres versions + {key: "ssl_ecdh_curve", value: "anything", postgresVersion: 17}, + {key: "ssl_ecdh_curve", value: "anything", postgresVersion: 18}, - err := cc.Create(ctx, cluster, client.DryRunAll) - assert.Assert(t, apierrors.IsInvalid(err)) - - details := require.StatusErrorDetails(t, err) - assert.Assert(t, cmp.Len(details.Causes, 1)) - }) - } - }) - - t.Run("ssl_groups allowed for pg18", func(t *testing.T) { - for _, tt := range []struct { - key string - value any - }{ - {key: "ssl_groups", value: "anything"}, + // ssl_groups is only supported for Postgres 18 and greater + {key: "ssl_groups", value: "anything", postgresVersion: 18}, } { t.Run(tt.key, func(t *testing.T) { cluster := u.DeepCopy() require.UnmarshalIntoField(t, cluster, - require.Value(yaml.Marshal(18)), + require.Value(yaml.Marshal(tt.postgresVersion)), "spec", "postgresVersion") require.UnmarshalIntoField(t, cluster, require.Value(yaml.Marshal(tt.value)), @@ -118,48 +99,39 @@ func TestPostgresConfigParametersV1beta1(t *testing.T) { } }) - t.Run("ssl_ecdh_curve allowed for both", func(t *testing.T) { + t.Run("Not Allowed", func(t *testing.T) { for _, tt := range []struct { - key string - value any + key string + value any + postgresVersion int }{ - {key: "ssl_ecdh_curve", value: "anything"}, + // setting "ssl" is not allowed for any Postgres version + {key: "ssl", value: "anything", postgresVersion: 17}, + {key: "ssl", value: "anything", postgresVersion: 18}, + + // setting any parameter with an "ssl_" prefix that is not + // "ssl_ecdh_curve" or "ssl_groups" is not allowed for any version + {key: "ssl_anything", value: "anything", postgresVersion: 17}, + {key: "ssl_anything", value: "anything", postgresVersion: 18}, + + // setting "ssl_ecdh_curve" with any additional suffix is not + // allowed for any version + {key: "ssl_ecdh_curve_bad", value: "anything", postgresVersion: 17}, + {key: "ssl_ecdh_curve_bad", value: "anything", postgresVersion: 18}, + + // setting "ssl_groups" is not allowed for Postgres versions 17 + // or earlier + {key: "ssl_groups", value: "anything", postgresVersion: 17}, + + // setting "ssl_groups" with any additional suffix is not + // allowed for any version + {key: "ssl_groups_bad", value: "anything", postgresVersion: 17}, + {key: "ssl_groups_bad", value: "anything", postgresVersion: 18}, } { t.Run(tt.key, func(t *testing.T) { cluster := u.DeepCopy() require.UnmarshalIntoField(t, cluster, - require.Value(yaml.Marshal(17)), - "spec", "postgresVersion") - require.UnmarshalIntoField(t, cluster, - require.Value(yaml.Marshal(tt.value)), - "spec", "config", "parameters", tt.key) - - assert.NilError(t, cc.Create(ctx, cluster, client.DryRunAll)) - - cluster2 := u.DeepCopy() - require.UnmarshalIntoField(t, cluster2, - require.Value(yaml.Marshal(18)), - "spec", "postgresVersion") - require.UnmarshalIntoField(t, cluster2, - require.Value(yaml.Marshal(tt.value)), - "spec", "config", "parameters", tt.key) - - assert.NilError(t, cc.Create(ctx, cluster2, client.DryRunAll)) - }) - } - }) - - t.Run("other ssl_* parameters not allowed for any pg version", func(t *testing.T) { - for _, tt := range []struct { - key string - value any - }{ - {key: "ssl_anything", value: "anything"}, - } { - t.Run(tt.key, func(t *testing.T) { - cluster := u.DeepCopy() - require.UnmarshalIntoField(t, cluster, - require.Value(yaml.Marshal(17)), + require.Value(yaml.Marshal(tt.postgresVersion)), "spec", "postgresVersion") require.UnmarshalIntoField(t, cluster, require.Value(yaml.Marshal(tt.value)), @@ -170,20 +142,6 @@ func TestPostgresConfigParametersV1beta1(t *testing.T) { details := require.StatusErrorDetails(t, err) assert.Assert(t, cmp.Len(details.Causes, 1)) - - cluster1 := u.DeepCopy() - require.UnmarshalIntoField(t, cluster1, - require.Value(yaml.Marshal(18)), - "spec", "postgresVersion") - require.UnmarshalIntoField(t, cluster1, - require.Value(yaml.Marshal(tt.value)), - "spec", "config", "parameters", tt.key) - - err = cc.Create(ctx, cluster1, client.DryRunAll) - assert.Assert(t, apierrors.IsInvalid(err)) - - details = require.StatusErrorDetails(t, err) - assert.Assert(t, cmp.Len(details.Causes, 1)) }) } }) From fd41088acdb49b289575901a0b6225cc8bb15d72 Mon Sep 17 00:00:00 2001 From: Drew Sessler Date: Thu, 13 Nov 2025 11:57:41 -0800 Subject: [PATCH 2/2] Add ability to easily choose the PostgresCluster API version in the kuttl/chainsaw tests --- Makefile | 2 ++ .../chainsaw/e2e/pgbackrest-restore/chainsaw-test.yaml | 8 ++++++-- .../pgbackrest-restore/templates/change-parameters.yaml | 2 +- .../e2e/pgbackrest-restore/templates/clone-cluster.yaml | 4 ++-- .../e2e/pgbackrest-restore/templates/create-backup.yaml | 2 +- .../e2e/pgbackrest-restore/templates/create-cluster.yaml | 4 ++-- .../templates/point-in-time-restore.yaml | 4 ++-- testing/chainsaw/e2e/values.yaml | 1 + .../kuttl/e2e/cluster-pause/files/00-cluster-created.yaml | 2 +- .../kuttl/e2e/cluster-pause/files/00-create-cluster.yaml | 2 +- .../kuttl/e2e/cluster-pause/files/01-cluster-paused.yaml | 2 +- .../kuttl/e2e/cluster-pause/files/01-pause-cluster.yaml | 2 +- .../kuttl/e2e/cluster-pause/files/02-cluster-resumed.yaml | 2 +- .../kuttl/e2e/cluster-pause/files/02-resume-cluster.yaml | 2 +- .../kuttl/e2e/cluster-start/files/00-cluster-created.yaml | 2 +- .../kuttl/e2e/cluster-start/files/00-create-cluster.yaml | 2 +- .../e2e/delete-namespace/files/00-create-cluster.yaml | 2 +- testing/kuttl/e2e/delete-namespace/files/00-created.yaml | 2 +- testing/kuttl/e2e/delete-namespace/files/01-errors.yaml | 2 +- testing/kuttl/e2e/delete/files/00-cluster-created.yaml | 2 +- testing/kuttl/e2e/delete/files/00-create-cluster.yaml | 2 +- testing/kuttl/e2e/delete/files/01-cluster-deleted.yaml | 2 +- .../delete/files/10-cluster-with-replicas-created.yaml | 2 +- .../e2e/delete/files/10-create-cluster-with-replicas.yaml | 2 +- .../delete/files/11-cluster-with-replicas-deleted.yaml | 2 +- .../e2e/delete/files/20-broken-cluster-not-created.yaml | 2 +- .../kuttl/e2e/delete/files/20-create-broken-cluster.yaml | 2 +- .../kuttl/e2e/delete/files/21-broken-cluster-deleted.yaml | 2 +- .../files/exporter-custom-queries-cluster-checks.yaml | 2 +- .../files/exporter-custom-queries-cluster.yaml | 2 +- .../files/exporter-no-tls-cluster-checks.yaml | 2 +- .../exporter-no-tls/files/exporter-no-tls-cluster.yaml | 2 +- .../files/initial-postgrescluster-checks.yaml | 2 +- .../files/initial-postgrescluster.yaml | 2 +- .../exporter-tls/files/exporter-tls-cluster-checks.yaml | 2 +- .../e2e/exporter-tls/files/exporter-tls-cluster.yaml | 2 +- .../e2e/major-upgrade-missing-image/10--cluster.yaml | 2 +- .../major-upgrade-missing-image/11--shutdown-cluster.yaml | 2 +- .../12--start-and-update-version.yaml | 2 +- .../kuttl/e2e/major-upgrade-missing-image/12-assert.yaml | 2 +- .../major-upgrade-missing-image/13--shutdown-cluster.yaml | 2 +- .../major-upgrade-missing-image/14--annotate-cluster.yaml | 2 +- .../kuttl/e2e/major-upgrade-missing-image/14-assert.yaml | 2 +- .../major-upgrade-missing-image/15--start-cluster.yaml | 2 +- .../kuttl/e2e/major-upgrade-missing-image/15-assert.yaml | 2 +- .../e2e/major-upgrade/10--already-updated-cluster.yaml | 2 +- testing/kuttl/e2e/major-upgrade/30--cluster.yaml | 2 +- testing/kuttl/e2e/major-upgrade/30-assert.yaml | 2 +- testing/kuttl/e2e/major-upgrade/32--shutdown-cluster.yaml | 2 +- testing/kuttl/e2e/major-upgrade/33--annotate-cluster.yaml | 2 +- testing/kuttl/e2e/major-upgrade/33-assert.yaml | 2 +- testing/kuttl/e2e/major-upgrade/34--restart-cluster.yaml | 2 +- testing/kuttl/e2e/major-upgrade/34-assert.yaml | 2 +- testing/kuttl/e2e/optional-backups/00--cluster.yaml | 2 +- testing/kuttl/e2e/optional-backups/00-assert.yaml | 2 +- testing/kuttl/e2e/optional-backups/04--cluster.yaml | 2 +- testing/kuttl/e2e/optional-backups/10--cluster.yaml | 2 +- testing/kuttl/e2e/optional-backups/10-assert.yaml | 2 +- testing/kuttl/e2e/optional-backups/20-assert.yaml | 2 +- testing/kuttl/e2e/optional-backups/23-assert.yaml | 2 +- .../files/00--create-cluster.yaml | 2 +- .../files/00-cluster-created.yaml | 2 +- .../files/01--add-instrumentation.yaml | 2 +- .../files/01-instrumentation-added.yaml | 2 +- .../files/03--annotate-cluster.yaml | 2 +- .../files/07-instrumentation-added.yaml | 2 +- .../files/09--add-custom-queries.yaml | 2 +- .../files/09-custom-queries-added.yaml | 2 +- .../files/11--add-per-db-metrics.yaml | 2 +- .../files/13--add-per-db-metrics.yaml | 2 +- .../files/15--remove-per-db-metrics.yaml | 2 +- .../files/17--add-custom-queries-per-db.yaml | 2 +- .../files/17-custom-queries-per-db-added.yaml | 2 +- .../files/19--add-logs-metrics-exporter.yaml | 2 +- .../files/19-logs-metrics-exporter-added.yaml | 2 +- .../files/21--create-cluster.yaml | 2 +- .../files/21-cluster-created.yaml | 2 +- .../otel-logging-and-metrics/files/23--add-backups.yaml | 2 +- .../otel-logging-and-metrics/files/23-backups-added.yaml | 2 +- .../files/25-backups-removed.yaml | 2 +- testing/kuttl/e2e/password-change/00--cluster.yaml | 2 +- testing/kuttl/e2e/password-change/00-assert.yaml | 2 +- testing/kuttl/e2e/password-change/04--secret.yaml | 2 +- testing/kuttl/e2e/password-change/06--cluster.yaml | 2 +- testing/kuttl/e2e/password-change/06-assert.yaml | 2 +- .../kuttl/e2e/pgbackrest-backup-standby/00--cluster.yaml | 2 +- .../kuttl/e2e/pgbackrest-backup-standby/00-assert.yaml | 2 +- .../kuttl/e2e/pgbackrest-backup-standby/02--cluster.yaml | 2 +- .../kuttl/e2e/pgbackrest-backup-standby/02-assert.yaml | 2 +- testing/kuttl/e2e/pgbackrest-init/00--cluster.yaml | 2 +- testing/kuttl/e2e/pgbackrest-init/00-assert.yaml | 2 +- testing/kuttl/e2e/pgbackrest-init/04--cluster.yaml | 2 +- testing/kuttl/e2e/pgbackrest-init/04-assert.yaml | 2 +- testing/kuttl/e2e/pgbouncer/00--cluster.yaml | 2 +- testing/kuttl/e2e/pgbouncer/00-assert.yaml | 2 +- testing/kuttl/e2e/replica-read/00--cluster.yaml | 2 +- testing/kuttl/e2e/replica-read/00-assert.yaml | 2 +- testing/kuttl/e2e/root-cert-ownership/00--cluster.yaml | 4 ++-- testing/kuttl/e2e/root-cert-ownership/00-assert.yaml | 4 ++-- testing/kuttl/e2e/root-cert-ownership/02-assert.yaml | 2 +- testing/kuttl/e2e/root-cert-ownership/02-errors.yaml | 2 +- testing/kuttl/e2e/root-cert-ownership/04-errors.yaml | 4 ++-- testing/kuttl/e2e/scaledown/00--create-cluster.yaml | 2 +- testing/kuttl/e2e/scaledown/00-assert.yaml | 2 +- testing/kuttl/e2e/scaledown/01--update-cluster.yaml | 2 +- testing/kuttl/e2e/scaledown/01-assert.yaml | 2 +- testing/kuttl/e2e/scaledown/10--create-cluster.yaml | 2 +- testing/kuttl/e2e/scaledown/10-assert.yaml | 2 +- testing/kuttl/e2e/scaledown/12--update-cluster.yaml | 2 +- testing/kuttl/e2e/scaledown/12-assert.yaml | 2 +- testing/kuttl/e2e/scaledown/20--create-cluster.yaml | 2 +- testing/kuttl/e2e/scaledown/20-assert.yaml | 2 +- testing/kuttl/e2e/scaledown/21--update-cluster.yaml | 2 +- testing/kuttl/e2e/scaledown/21-assert.yaml | 2 +- testing/kuttl/e2e/security-context/00--cluster.yaml | 2 +- testing/kuttl/e2e/security-context/00-assert.yaml | 2 +- .../standalone-pgadmin-db-uri/files/00-cluster-check.yaml | 2 +- .../e2e/standalone-pgadmin-db-uri/files/00-cluster.yaml | 2 +- .../kuttl/e2e/streaming-standby/01--primary-cluster.yaml | 2 +- testing/kuttl/e2e/streaming-standby/01-assert.yaml | 2 +- .../kuttl/e2e/streaming-standby/03--standby-cluster.yaml | 2 +- testing/kuttl/e2e/streaming-standby/03-assert.yaml | 2 +- testing/kuttl/e2e/switchover/01--cluster.yaml | 2 +- testing/kuttl/e2e/switchover/01-assert.yaml | 2 +- testing/kuttl/e2e/switchover/03-assert.yaml | 2 +- testing/kuttl/e2e/tablespace-enabled/00--cluster.yaml | 2 +- testing/kuttl/e2e/tablespace-enabled/00-assert.yaml | 2 +- .../kuttl/e2e/wal-pvc-pgupgrade/00--create-resources.yaml | 2 +- testing/kuttl/e2e/wal-pvc-pgupgrade/00-assert.yaml | 2 +- .../kuttl/e2e/wal-pvc-pgupgrade/02--shutdown-cluster.yaml | 2 +- .../kuttl/e2e/wal-pvc-pgupgrade/03--annotate-cluster.yaml | 2 +- testing/kuttl/e2e/wal-pvc-pgupgrade/03-assert.yaml | 2 +- .../kuttl/e2e/wal-pvc-pgupgrade/04--restart-cluster.yaml | 2 +- testing/kuttl/e2e/wal-pvc-pgupgrade/04-assert.yaml | 2 +- 134 files changed, 146 insertions(+), 139 deletions(-) diff --git a/Makefile b/Makefile index aa6509f4cd..2f15b07b6e 100644 --- a/Makefile +++ b/Makefile @@ -201,6 +201,7 @@ 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 @@ -211,6 +212,7 @@ 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'"'"'; }; \ diff --git a/testing/chainsaw/e2e/pgbackrest-restore/chainsaw-test.yaml b/testing/chainsaw/e2e/pgbackrest-restore/chainsaw-test.yaml index 18a19553bb..a79dc6a193 100644 --- a/testing/chainsaw/e2e/pgbackrest-restore/chainsaw-test.yaml +++ b/testing/chainsaw/e2e/pgbackrest-restore/chainsaw-test.yaml @@ -19,6 +19,10 @@ 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: @@ -85,7 +89,7 @@ spec: deletionPropagationPolicy: Background expect: [{ check: { (`true`): true } }] ref: - apiVersion: postgres-operator.crunchydata.com/v1beta1 + apiVersion: ($postgrescluster.apiVersion) kind: PostgresCluster name: clone-one @@ -162,7 +166,7 @@ spec: deletionPropagationPolicy: Background expect: [{ check: { (`true`): true } }] ref: - apiVersion: postgres-operator.crunchydata.com/v1beta1 + apiVersion: ($postgrescluster.apiVersion) kind: PostgresCluster name: clone-two diff --git a/testing/chainsaw/e2e/pgbackrest-restore/templates/change-parameters.yaml b/testing/chainsaw/e2e/pgbackrest-restore/templates/change-parameters.yaml index b8650de471..04b5a85e86 100644 --- a/testing/chainsaw/e2e/pgbackrest-restore/templates/change-parameters.yaml +++ b/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: postgres-operator.crunchydata.com/v1beta1 + apiVersion: ($postgrescluster.apiVersion) kind: PostgresCluster metadata: name: original diff --git a/testing/chainsaw/e2e/pgbackrest-restore/templates/clone-cluster.yaml b/testing/chainsaw/e2e/pgbackrest-restore/templates/clone-cluster.yaml index a768fa2abd..193e7495c4 100644 --- a/testing/chainsaw/e2e/pgbackrest-restore/templates/clone-cluster.yaml +++ b/testing/chainsaw/e2e/pgbackrest-restore/templates/clone-cluster.yaml @@ -13,7 +13,7 @@ spec: Clone the cluster using a pgBackRest restore apply: resource: - apiVersion: postgres-operator.crunchydata.com/v1beta1 + apiVersion: ($postgrescluster.apiVersion) kind: PostgresCluster metadata: name: ($name) @@ -39,7 +39,7 @@ spec: Wait for the cluster to come online assert: resource: - apiVersion: postgres-operator.crunchydata.com/v1beta1 + apiVersion: ($postgrescluster.apiVersion) kind: PostgresCluster metadata: name: ($name) diff --git a/testing/chainsaw/e2e/pgbackrest-restore/templates/create-backup.yaml b/testing/chainsaw/e2e/pgbackrest-restore/templates/create-backup.yaml index 8f71a915f7..6279f29248 100644 --- a/testing/chainsaw/e2e/pgbackrest-restore/templates/create-backup.yaml +++ b/testing/chainsaw/e2e/pgbackrest-restore/templates/create-backup.yaml @@ -12,7 +12,7 @@ spec: Annotate the cluster to trigger a backup patch: resource: - apiVersion: postgres-operator.crunchydata.com/v1beta1 + apiVersion: ($postgrescluster.apiVersion) kind: PostgresCluster metadata: name: original diff --git a/testing/chainsaw/e2e/pgbackrest-restore/templates/create-cluster.yaml b/testing/chainsaw/e2e/pgbackrest-restore/templates/create-cluster.yaml index 295ba9590d..89a72282ef 100644 --- a/testing/chainsaw/e2e/pgbackrest-restore/templates/create-cluster.yaml +++ b/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: postgres-operator.crunchydata.com/v1beta1 + apiVersion: ($postgrescluster.apiVersion) kind: PostgresCluster metadata: name: original @@ -40,7 +40,7 @@ spec: Wait for the replica backup to complete assert: resource: - apiVersion: postgres-operator.crunchydata.com/v1beta1 + apiVersion: ($postgrescluster.apiVersion) kind: PostgresCluster metadata: name: original diff --git a/testing/chainsaw/e2e/pgbackrest-restore/templates/point-in-time-restore.yaml b/testing/chainsaw/e2e/pgbackrest-restore/templates/point-in-time-restore.yaml index 3b842f5ebc..b832cec5ae 100644 --- a/testing/chainsaw/e2e/pgbackrest-restore/templates/point-in-time-restore.yaml +++ b/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: postgres-operator.crunchydata.com/v1beta1 + apiVersion: ($postgrescluster.apiVersion) 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: postgres-operator.crunchydata.com/v1beta1 + apiVersion: ($postgrescluster.apiVersion) kind: PostgresCluster metadata: name: original diff --git a/testing/chainsaw/e2e/values.yaml b/testing/chainsaw/e2e/values.yaml index 9dc2157b85..02fce2dc14 100644 --- a/testing/chainsaw/e2e/values.yaml +++ b/testing/chainsaw/e2e/values.yaml @@ -1,5 +1,6 @@ versions: postgres: '17' + postgrescluster: 'v1' images: psql: 'registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.6-2542' diff --git a/testing/kuttl/e2e/cluster-pause/files/00-cluster-created.yaml b/testing/kuttl/e2e/cluster-pause/files/00-cluster-created.yaml index a5fe982b1a..d5f1e7db9d 100644 --- a/testing/kuttl/e2e/cluster-pause/files/00-cluster-created.yaml +++ b/testing/kuttl/e2e/cluster-pause/files/00-cluster-created.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: cluster-pause diff --git a/testing/kuttl/e2e/cluster-pause/files/00-create-cluster.yaml b/testing/kuttl/e2e/cluster-pause/files/00-create-cluster.yaml index 9f687a1dfa..980304d60f 100644 --- a/testing/kuttl/e2e/cluster-pause/files/00-create-cluster.yaml +++ b/testing/kuttl/e2e/cluster-pause/files/00-create-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: cluster-pause diff --git a/testing/kuttl/e2e/cluster-pause/files/01-cluster-paused.yaml b/testing/kuttl/e2e/cluster-pause/files/01-cluster-paused.yaml index 6776fc542b..ec96f76a43 100644 --- a/testing/kuttl/e2e/cluster-pause/files/01-cluster-paused.yaml +++ b/testing/kuttl/e2e/cluster-pause/files/01-cluster-paused.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: cluster-pause diff --git a/testing/kuttl/e2e/cluster-pause/files/01-pause-cluster.yaml b/testing/kuttl/e2e/cluster-pause/files/01-pause-cluster.yaml index 6a21b00b22..9b689502d6 100644 --- a/testing/kuttl/e2e/cluster-pause/files/01-pause-cluster.yaml +++ b/testing/kuttl/e2e/cluster-pause/files/01-pause-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: cluster-pause diff --git a/testing/kuttl/e2e/cluster-pause/files/02-cluster-resumed.yaml b/testing/kuttl/e2e/cluster-pause/files/02-cluster-resumed.yaml index 82062fb908..e411b0d959 100644 --- a/testing/kuttl/e2e/cluster-pause/files/02-cluster-resumed.yaml +++ b/testing/kuttl/e2e/cluster-pause/files/02-cluster-resumed.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: cluster-pause diff --git a/testing/kuttl/e2e/cluster-pause/files/02-resume-cluster.yaml b/testing/kuttl/e2e/cluster-pause/files/02-resume-cluster.yaml index 2f5665e146..1e2b7e2b09 100644 --- a/testing/kuttl/e2e/cluster-pause/files/02-resume-cluster.yaml +++ b/testing/kuttl/e2e/cluster-pause/files/02-resume-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: cluster-pause diff --git a/testing/kuttl/e2e/cluster-start/files/00-cluster-created.yaml b/testing/kuttl/e2e/cluster-start/files/00-cluster-created.yaml index 4eebece89e..900afb1d3a 100644 --- a/testing/kuttl/e2e/cluster-start/files/00-cluster-created.yaml +++ b/testing/kuttl/e2e/cluster-start/files/00-cluster-created.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: cluster-start diff --git a/testing/kuttl/e2e/cluster-start/files/00-create-cluster.yaml b/testing/kuttl/e2e/cluster-start/files/00-create-cluster.yaml index 713cd14eb3..5687e5482a 100644 --- a/testing/kuttl/e2e/cluster-start/files/00-create-cluster.yaml +++ b/testing/kuttl/e2e/cluster-start/files/00-create-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: cluster-start diff --git a/testing/kuttl/e2e/delete-namespace/files/00-create-cluster.yaml b/testing/kuttl/e2e/delete-namespace/files/00-create-cluster.yaml index fe6392d75a..f775eb9680 100644 --- a/testing/kuttl/e2e/delete-namespace/files/00-create-cluster.yaml +++ b/testing/kuttl/e2e/delete-namespace/files/00-create-cluster.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: delete-namespace diff --git a/testing/kuttl/e2e/delete-namespace/files/00-created.yaml b/testing/kuttl/e2e/delete-namespace/files/00-created.yaml index 3d2c7ec936..82699adaa0 100644 --- a/testing/kuttl/e2e/delete-namespace/files/00-created.yaml +++ b/testing/kuttl/e2e/delete-namespace/files/00-created.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: delete-namespace diff --git a/testing/kuttl/e2e/delete-namespace/files/01-errors.yaml b/testing/kuttl/e2e/delete-namespace/files/01-errors.yaml index ee6f31178c..9d3e0f9277 100644 --- a/testing/kuttl/e2e/delete-namespace/files/01-errors.yaml +++ b/testing/kuttl/e2e/delete-namespace/files/01-errors.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: namespace: ${KUTTL_TEST_DELETE_NAMESPACE} diff --git a/testing/kuttl/e2e/delete/files/00-cluster-created.yaml b/testing/kuttl/e2e/delete/files/00-cluster-created.yaml index 6130475c07..f4ccb037b3 100644 --- a/testing/kuttl/e2e/delete/files/00-cluster-created.yaml +++ b/testing/kuttl/e2e/delete/files/00-cluster-created.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: delete diff --git a/testing/kuttl/e2e/delete/files/00-create-cluster.yaml b/testing/kuttl/e2e/delete/files/00-create-cluster.yaml index 0dbcb08204..0a8a2a1224 100644 --- a/testing/kuttl/e2e/delete/files/00-create-cluster.yaml +++ b/testing/kuttl/e2e/delete/files/00-create-cluster.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: delete diff --git a/testing/kuttl/e2e/delete/files/01-cluster-deleted.yaml b/testing/kuttl/e2e/delete/files/01-cluster-deleted.yaml index 091bc96b7b..db203233eb 100644 --- a/testing/kuttl/e2e/delete/files/01-cluster-deleted.yaml +++ b/testing/kuttl/e2e/delete/files/01-cluster-deleted.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: delete diff --git a/testing/kuttl/e2e/delete/files/10-cluster-with-replicas-created.yaml b/testing/kuttl/e2e/delete/files/10-cluster-with-replicas-created.yaml index 1940fc680a..e9f4114c38 100644 --- a/testing/kuttl/e2e/delete/files/10-cluster-with-replicas-created.yaml +++ b/testing/kuttl/e2e/delete/files/10-cluster-with-replicas-created.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: delete-with-replica diff --git a/testing/kuttl/e2e/delete/files/10-create-cluster-with-replicas.yaml b/testing/kuttl/e2e/delete/files/10-create-cluster-with-replicas.yaml index 53c4fc434d..05a2a419e6 100644 --- a/testing/kuttl/e2e/delete/files/10-create-cluster-with-replicas.yaml +++ b/testing/kuttl/e2e/delete/files/10-create-cluster-with-replicas.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: delete-with-replica diff --git a/testing/kuttl/e2e/delete/files/11-cluster-with-replicas-deleted.yaml b/testing/kuttl/e2e/delete/files/11-cluster-with-replicas-deleted.yaml index cc14b60d3d..27f1d5bc32 100644 --- a/testing/kuttl/e2e/delete/files/11-cluster-with-replicas-deleted.yaml +++ b/testing/kuttl/e2e/delete/files/11-cluster-with-replicas-deleted.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: delete-with-replica diff --git a/testing/kuttl/e2e/delete/files/20-broken-cluster-not-created.yaml b/testing/kuttl/e2e/delete/files/20-broken-cluster-not-created.yaml index f910fa9811..9bab1f05a5 100644 --- a/testing/kuttl/e2e/delete/files/20-broken-cluster-not-created.yaml +++ b/testing/kuttl/e2e/delete/files/20-broken-cluster-not-created.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: delete-not-running diff --git a/testing/kuttl/e2e/delete/files/20-create-broken-cluster.yaml b/testing/kuttl/e2e/delete/files/20-create-broken-cluster.yaml index 2b7d34f3f6..ebf3381731 100644 --- a/testing/kuttl/e2e/delete/files/20-create-broken-cluster.yaml +++ b/testing/kuttl/e2e/delete/files/20-create-broken-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: delete-not-running diff --git a/testing/kuttl/e2e/delete/files/21-broken-cluster-deleted.yaml b/testing/kuttl/e2e/delete/files/21-broken-cluster-deleted.yaml index 4527a3659d..1ef98e1c99 100644 --- a/testing/kuttl/e2e/delete/files/21-broken-cluster-deleted.yaml +++ b/testing/kuttl/e2e/delete/files/21-broken-cluster-deleted.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: delete-not-running diff --git a/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster-checks.yaml b/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster-checks.yaml index ed6fd22b7c..0f50ffced9 100644 --- a/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster-checks.yaml +++ b/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster-checks.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: exporter-custom-queries diff --git a/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster.yaml b/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster.yaml index 5356b83be9..482b9c86b9 100644 --- a/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster.yaml +++ b/testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: exporter-custom-queries diff --git a/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster-checks.yaml b/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster-checks.yaml index eab02c6888..12eec3074c 100644 --- a/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster-checks.yaml +++ b/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster-checks.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: exporter-no-tls diff --git a/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster.yaml b/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster.yaml index 690d5b505d..cb9a23db69 100644 --- a/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster.yaml +++ b/testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: exporter-no-tls diff --git a/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster-checks.yaml b/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster-checks.yaml index 19887a0e10..e1820e7ead 100644 --- a/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster-checks.yaml +++ b/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster-checks.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: exporter-password-change diff --git a/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster.yaml b/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster.yaml index d16c898ac2..a62577de92 100644 --- a/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster.yaml +++ b/testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: exporter-password-change diff --git a/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster-checks.yaml b/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster-checks.yaml index e192191fcd..41821919d4 100644 --- a/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster-checks.yaml +++ b/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster-checks.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: exporter-tls diff --git a/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster.yaml b/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster.yaml index 4fa420664a..be550c5433 100644 --- a/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster.yaml +++ b/testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: exporter-tls diff --git a/testing/kuttl/e2e/major-upgrade-missing-image/10--cluster.yaml b/testing/kuttl/e2e/major-upgrade-missing-image/10--cluster.yaml index 8a0e57bab6..8435bad7f7 100644 --- a/testing/kuttl/e2e/major-upgrade-missing-image/10--cluster.yaml +++ b/testing/kuttl/e2e/major-upgrade-missing-image/10--cluster.yaml @@ -1,7 +1,7 @@ --- # Create the cluster we will do an actual upgrade on, but set the postgres version # to '10' to force a missing image scenario -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade-empty-image diff --git a/testing/kuttl/e2e/major-upgrade-missing-image/11--shutdown-cluster.yaml b/testing/kuttl/e2e/major-upgrade-missing-image/11--shutdown-cluster.yaml index 316f3a5472..76c3b02ee1 100644 --- a/testing/kuttl/e2e/major-upgrade-missing-image/11--shutdown-cluster.yaml +++ b/testing/kuttl/e2e/major-upgrade-missing-image/11--shutdown-cluster.yaml @@ -1,6 +1,6 @@ --- # Shutdown the cluster -- but without the annotation. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade-empty-image diff --git a/testing/kuttl/e2e/major-upgrade-missing-image/12--start-and-update-version.yaml b/testing/kuttl/e2e/major-upgrade-missing-image/12--start-and-update-version.yaml index fcdf4f62e3..f4cf125329 100644 --- a/testing/kuttl/e2e/major-upgrade-missing-image/12--start-and-update-version.yaml +++ b/testing/kuttl/e2e/major-upgrade-missing-image/12--start-and-update-version.yaml @@ -1,6 +1,6 @@ --- # Update the postgres version and restart the cluster. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade-empty-image diff --git a/testing/kuttl/e2e/major-upgrade-missing-image/12-assert.yaml b/testing/kuttl/e2e/major-upgrade-missing-image/12-assert.yaml index 14c33cccfe..1f2b717cf2 100644 --- a/testing/kuttl/e2e/major-upgrade-missing-image/12-assert.yaml +++ b/testing/kuttl/e2e/major-upgrade-missing-image/12-assert.yaml @@ -1,7 +1,7 @@ --- # Wait for the instances to be ready and the replica backup to complete # by waiting for the status to signal pods ready and pgbackrest stanza created -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade-empty-image diff --git a/testing/kuttl/e2e/major-upgrade-missing-image/13--shutdown-cluster.yaml b/testing/kuttl/e2e/major-upgrade-missing-image/13--shutdown-cluster.yaml index 316f3a5472..76c3b02ee1 100644 --- a/testing/kuttl/e2e/major-upgrade-missing-image/13--shutdown-cluster.yaml +++ b/testing/kuttl/e2e/major-upgrade-missing-image/13--shutdown-cluster.yaml @@ -1,6 +1,6 @@ --- # Shutdown the cluster -- but without the annotation. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade-empty-image diff --git a/testing/kuttl/e2e/major-upgrade-missing-image/14--annotate-cluster.yaml b/testing/kuttl/e2e/major-upgrade-missing-image/14--annotate-cluster.yaml index 2fa2c949a9..f9fe8a20a8 100644 --- a/testing/kuttl/e2e/major-upgrade-missing-image/14--annotate-cluster.yaml +++ b/testing/kuttl/e2e/major-upgrade-missing-image/14--annotate-cluster.yaml @@ -1,6 +1,6 @@ --- # Annotate the cluster for an upgrade. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade-empty-image diff --git a/testing/kuttl/e2e/major-upgrade-missing-image/14-assert.yaml b/testing/kuttl/e2e/major-upgrade-missing-image/14-assert.yaml index bd828180f4..97350a6a04 100644 --- a/testing/kuttl/e2e/major-upgrade-missing-image/14-assert.yaml +++ b/testing/kuttl/e2e/major-upgrade-missing-image/14-assert.yaml @@ -14,7 +14,7 @@ status: - type: "Succeeded" status: "True" --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade-empty-image diff --git a/testing/kuttl/e2e/major-upgrade-missing-image/15--start-cluster.yaml b/testing/kuttl/e2e/major-upgrade-missing-image/15--start-cluster.yaml index e5f270fb2f..b53caab52b 100644 --- a/testing/kuttl/e2e/major-upgrade-missing-image/15--start-cluster.yaml +++ b/testing/kuttl/e2e/major-upgrade-missing-image/15--start-cluster.yaml @@ -1,7 +1,7 @@ --- # Once the pgupgrade is finished, update the version and set shutdown to false # in the postgres cluster -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade-empty-image diff --git a/testing/kuttl/e2e/major-upgrade-missing-image/15-assert.yaml b/testing/kuttl/e2e/major-upgrade-missing-image/15-assert.yaml index dfcbd4c819..99ac652193 100644 --- a/testing/kuttl/e2e/major-upgrade-missing-image/15-assert.yaml +++ b/testing/kuttl/e2e/major-upgrade-missing-image/15-assert.yaml @@ -1,6 +1,6 @@ --- # Wait for the instances to be ready with the target Postgres version. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade-empty-image diff --git a/testing/kuttl/e2e/major-upgrade/10--already-updated-cluster.yaml b/testing/kuttl/e2e/major-upgrade/10--already-updated-cluster.yaml index 0591645221..0e493b51ed 100644 --- a/testing/kuttl/e2e/major-upgrade/10--already-updated-cluster.yaml +++ b/testing/kuttl/e2e/major-upgrade/10--already-updated-cluster.yaml @@ -1,6 +1,6 @@ --- # Create a cluster that is already at the correct version -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade diff --git a/testing/kuttl/e2e/major-upgrade/30--cluster.yaml b/testing/kuttl/e2e/major-upgrade/30--cluster.yaml index 07546c384e..8b96d7cdfd 100644 --- a/testing/kuttl/e2e/major-upgrade/30--cluster.yaml +++ b/testing/kuttl/e2e/major-upgrade/30--cluster.yaml @@ -1,6 +1,6 @@ --- # Create the cluster we will do an actual upgrade on -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade diff --git a/testing/kuttl/e2e/major-upgrade/30-assert.yaml b/testing/kuttl/e2e/major-upgrade/30-assert.yaml index 1db8ec257d..3ebbe65b62 100644 --- a/testing/kuttl/e2e/major-upgrade/30-assert.yaml +++ b/testing/kuttl/e2e/major-upgrade/30-assert.yaml @@ -1,7 +1,7 @@ --- # Wait for the instances to be ready and the replica backup to complete # by waiting for the status to signal pods ready and pgbackrest stanza created -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade diff --git a/testing/kuttl/e2e/major-upgrade/32--shutdown-cluster.yaml b/testing/kuttl/e2e/major-upgrade/32--shutdown-cluster.yaml index 9e4a575a3a..06bee8a99c 100644 --- a/testing/kuttl/e2e/major-upgrade/32--shutdown-cluster.yaml +++ b/testing/kuttl/e2e/major-upgrade/32--shutdown-cluster.yaml @@ -1,6 +1,6 @@ --- # Shutdown the cluster -- but without the annotation. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade diff --git a/testing/kuttl/e2e/major-upgrade/33--annotate-cluster.yaml b/testing/kuttl/e2e/major-upgrade/33--annotate-cluster.yaml index 35cd269035..a8ace3049c 100644 --- a/testing/kuttl/e2e/major-upgrade/33--annotate-cluster.yaml +++ b/testing/kuttl/e2e/major-upgrade/33--annotate-cluster.yaml @@ -1,6 +1,6 @@ --- # Annotate the cluster for an upgrade. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade diff --git a/testing/kuttl/e2e/major-upgrade/33-assert.yaml b/testing/kuttl/e2e/major-upgrade/33-assert.yaml index aadb5e3bb1..ebb1896d7e 100644 --- a/testing/kuttl/e2e/major-upgrade/33-assert.yaml +++ b/testing/kuttl/e2e/major-upgrade/33-assert.yaml @@ -14,7 +14,7 @@ status: - type: "Succeeded" status: "True" --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade diff --git a/testing/kuttl/e2e/major-upgrade/34--restart-cluster.yaml b/testing/kuttl/e2e/major-upgrade/34--restart-cluster.yaml index ee674151ca..af6573706d 100644 --- a/testing/kuttl/e2e/major-upgrade/34--restart-cluster.yaml +++ b/testing/kuttl/e2e/major-upgrade/34--restart-cluster.yaml @@ -1,7 +1,7 @@ --- # Once the pgupgrade is finished, update the version and set shutdown to false # in the postgres cluster -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade diff --git a/testing/kuttl/e2e/major-upgrade/34-assert.yaml b/testing/kuttl/e2e/major-upgrade/34-assert.yaml index aba583f74c..46aa2fa022 100644 --- a/testing/kuttl/e2e/major-upgrade/34-assert.yaml +++ b/testing/kuttl/e2e/major-upgrade/34-assert.yaml @@ -1,6 +1,6 @@ --- # Wait for the instances to be ready with the target Postgres version. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: major-upgrade diff --git a/testing/kuttl/e2e/optional-backups/00--cluster.yaml b/testing/kuttl/e2e/optional-backups/00--cluster.yaml index 7b927831e0..3140e8c7a5 100644 --- a/testing/kuttl/e2e/optional-backups/00--cluster.yaml +++ b/testing/kuttl/e2e/optional-backups/00--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: created-without-backups diff --git a/testing/kuttl/e2e/optional-backups/00-assert.yaml b/testing/kuttl/e2e/optional-backups/00-assert.yaml index 86392d0308..253688c8db 100644 --- a/testing/kuttl/e2e/optional-backups/00-assert.yaml +++ b/testing/kuttl/e2e/optional-backups/00-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: created-without-backups diff --git a/testing/kuttl/e2e/optional-backups/04--cluster.yaml b/testing/kuttl/e2e/optional-backups/04--cluster.yaml index fc39ff6ebe..458ecef772 100644 --- a/testing/kuttl/e2e/optional-backups/04--cluster.yaml +++ b/testing/kuttl/e2e/optional-backups/04--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: created-without-backups diff --git a/testing/kuttl/e2e/optional-backups/10--cluster.yaml b/testing/kuttl/e2e/optional-backups/10--cluster.yaml index 6da85c93f9..1e13b403bb 100644 --- a/testing/kuttl/e2e/optional-backups/10--cluster.yaml +++ b/testing/kuttl/e2e/optional-backups/10--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: created-without-backups diff --git a/testing/kuttl/e2e/optional-backups/10-assert.yaml b/testing/kuttl/e2e/optional-backups/10-assert.yaml index 7b740b310d..d9c626a92f 100644 --- a/testing/kuttl/e2e/optional-backups/10-assert.yaml +++ b/testing/kuttl/e2e/optional-backups/10-assert.yaml @@ -1,5 +1,5 @@ # It should be possible to turn backups back on. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: created-without-backups diff --git a/testing/kuttl/e2e/optional-backups/20-assert.yaml b/testing/kuttl/e2e/optional-backups/20-assert.yaml index b469e277f8..1dd366f4e9 100644 --- a/testing/kuttl/e2e/optional-backups/20-assert.yaml +++ b/testing/kuttl/e2e/optional-backups/20-assert.yaml @@ -1,5 +1,5 @@ # It should be possible to turn backups back on. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: created-without-backups diff --git a/testing/kuttl/e2e/optional-backups/23-assert.yaml b/testing/kuttl/e2e/optional-backups/23-assert.yaml index 8748ea015c..814d9174ad 100644 --- a/testing/kuttl/e2e/optional-backups/23-assert.yaml +++ b/testing/kuttl/e2e/optional-backups/23-assert.yaml @@ -1,5 +1,5 @@ # It should be possible to turn backups back on. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: created-without-backups diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/00--create-cluster.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/00--create-cluster.yaml index 3345bef5f9..eabb86847f 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/00--create-cluster.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/00--create-cluster.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/00-cluster-created.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/00-cluster-created.yaml index 97bd3e2b97..5b11b4bda0 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/00-cluster-created.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/00-cluster-created.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/01--add-instrumentation.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/01--add-instrumentation.yaml index ebde9f7caa..651f5fa14e 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/01--add-instrumentation.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/01--add-instrumentation.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/01-instrumentation-added.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/01-instrumentation-added.yaml index 672bdd2d1d..1dc292fad5 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/01-instrumentation-added.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/01-instrumentation-added.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/03--annotate-cluster.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/03--annotate-cluster.yaml index 1133b7fe15..437b328eae 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/03--annotate-cluster.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/03--annotate-cluster.yaml @@ -1,6 +1,6 @@ --- # Annotate the cluster to trigger a backup. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/07-instrumentation-added.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/07-instrumentation-added.yaml index 858b78ff83..ce5c6a938b 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/07-instrumentation-added.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/07-instrumentation-added.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/09--add-custom-queries.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/09--add-custom-queries.yaml index ed133fc26a..d5a2089e3a 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/09--add-custom-queries.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/09--add-custom-queries.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/09-custom-queries-added.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/09-custom-queries-added.yaml index 1a756b7a73..ba93e37f8c 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/09-custom-queries-added.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/09-custom-queries-added.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/11--add-per-db-metrics.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/11--add-per-db-metrics.yaml index 1cf4c28a83..47c3d17edc 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/11--add-per-db-metrics.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/11--add-per-db-metrics.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/13--add-per-db-metrics.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/13--add-per-db-metrics.yaml index c383238be9..d231188202 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/13--add-per-db-metrics.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/13--add-per-db-metrics.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/15--remove-per-db-metrics.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/15--remove-per-db-metrics.yaml index 4421de8482..aaef4a4dbe 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/15--remove-per-db-metrics.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/15--remove-per-db-metrics.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/17--add-custom-queries-per-db.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/17--add-custom-queries-per-db.yaml index 92360a4a9a..c71c52c337 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/17--add-custom-queries-per-db.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/17--add-custom-queries-per-db.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/17-custom-queries-per-db-added.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/17-custom-queries-per-db-added.yaml index 5bd9cec286..7cdadefe6c 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/17-custom-queries-per-db-added.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/17-custom-queries-per-db-added.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/19--add-logs-metrics-exporter.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/19--add-logs-metrics-exporter.yaml index 67926505c0..a0ed2e3263 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/19--add-logs-metrics-exporter.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/19--add-logs-metrics-exporter.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/19-logs-metrics-exporter-added.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/19-logs-metrics-exporter-added.yaml index f730898692..2fae632304 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/19-logs-metrics-exporter-added.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/19-logs-metrics-exporter-added.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/21--create-cluster.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/21--create-cluster.yaml index 3983405b34..b66b0cee99 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/21--create-cluster.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/21--create-cluster.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster-no-backups diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/21-cluster-created.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/21-cluster-created.yaml index c9aad7ec25..1cad988aff 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/21-cluster-created.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/21-cluster-created.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster-no-backups diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/23--add-backups.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/23--add-backups.yaml index bb7c70ea37..fdc193ebca 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/23--add-backups.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/23--add-backups.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster-no-backups diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/23-backups-added.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/23-backups-added.yaml index 52221d2349..34f3b2b161 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/23-backups-added.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/23-backups-added.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster-no-backups diff --git a/testing/kuttl/e2e/otel-logging-and-metrics/files/25-backups-removed.yaml b/testing/kuttl/e2e/otel-logging-and-metrics/files/25-backups-removed.yaml index c9aad7ec25..1cad988aff 100644 --- a/testing/kuttl/e2e/otel-logging-and-metrics/files/25-backups-removed.yaml +++ b/testing/kuttl/e2e/otel-logging-and-metrics/files/25-backups-removed.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: otel-cluster-no-backups diff --git a/testing/kuttl/e2e/password-change/00--cluster.yaml b/testing/kuttl/e2e/password-change/00--cluster.yaml index d7b7019b62..df6806647f 100644 --- a/testing/kuttl/e2e/password-change/00--cluster.yaml +++ b/testing/kuttl/e2e/password-change/00--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: password-change diff --git a/testing/kuttl/e2e/password-change/00-assert.yaml b/testing/kuttl/e2e/password-change/00-assert.yaml index bfedc0b25e..af183b5aaf 100644 --- a/testing/kuttl/e2e/password-change/00-assert.yaml +++ b/testing/kuttl/e2e/password-change/00-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: password-change diff --git a/testing/kuttl/e2e/password-change/04--secret.yaml b/testing/kuttl/e2e/password-change/04--secret.yaml index 5f312e9bf1..162e0e640c 100644 --- a/testing/kuttl/e2e/password-change/04--secret.yaml +++ b/testing/kuttl/e2e/password-change/04--secret.yaml @@ -10,7 +10,7 @@ stringData: uri: "" --- # Enable authenticating with MD5 passwords -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: password-change diff --git a/testing/kuttl/e2e/password-change/06--cluster.yaml b/testing/kuttl/e2e/password-change/06--cluster.yaml index 4cb70defdd..73357ea1cc 100644 --- a/testing/kuttl/e2e/password-change/06--cluster.yaml +++ b/testing/kuttl/e2e/password-change/06--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: password-change diff --git a/testing/kuttl/e2e/password-change/06-assert.yaml b/testing/kuttl/e2e/password-change/06-assert.yaml index bfedc0b25e..af183b5aaf 100644 --- a/testing/kuttl/e2e/password-change/06-assert.yaml +++ b/testing/kuttl/e2e/password-change/06-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: password-change diff --git a/testing/kuttl/e2e/pgbackrest-backup-standby/00--cluster.yaml b/testing/kuttl/e2e/pgbackrest-backup-standby/00--cluster.yaml index 9665fac665..30e9edb9ba 100644 --- a/testing/kuttl/e2e/pgbackrest-backup-standby/00--cluster.yaml +++ b/testing/kuttl/e2e/pgbackrest-backup-standby/00--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: pgbackrest-backup-standby diff --git a/testing/kuttl/e2e/pgbackrest-backup-standby/00-assert.yaml b/testing/kuttl/e2e/pgbackrest-backup-standby/00-assert.yaml index d69a3c68b5..805943d763 100644 --- a/testing/kuttl/e2e/pgbackrest-backup-standby/00-assert.yaml +++ b/testing/kuttl/e2e/pgbackrest-backup-standby/00-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: pgbackrest-backup-standby diff --git a/testing/kuttl/e2e/pgbackrest-backup-standby/02--cluster.yaml b/testing/kuttl/e2e/pgbackrest-backup-standby/02--cluster.yaml index c986f4a9de..7d8fc1682c 100644 --- a/testing/kuttl/e2e/pgbackrest-backup-standby/02--cluster.yaml +++ b/testing/kuttl/e2e/pgbackrest-backup-standby/02--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: pgbackrest-backup-standby diff --git a/testing/kuttl/e2e/pgbackrest-backup-standby/02-assert.yaml b/testing/kuttl/e2e/pgbackrest-backup-standby/02-assert.yaml index 92f7b12f5a..820cc1b0d5 100644 --- a/testing/kuttl/e2e/pgbackrest-backup-standby/02-assert.yaml +++ b/testing/kuttl/e2e/pgbackrest-backup-standby/02-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: pgbackrest-backup-standby diff --git a/testing/kuttl/e2e/pgbackrest-init/00--cluster.yaml b/testing/kuttl/e2e/pgbackrest-init/00--cluster.yaml index 03391359a1..e21f90e63d 100644 --- a/testing/kuttl/e2e/pgbackrest-init/00--cluster.yaml +++ b/testing/kuttl/e2e/pgbackrest-init/00--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: init-pgbackrest diff --git a/testing/kuttl/e2e/pgbackrest-init/00-assert.yaml b/testing/kuttl/e2e/pgbackrest-init/00-assert.yaml index 5181c95993..9078eb9783 100644 --- a/testing/kuttl/e2e/pgbackrest-init/00-assert.yaml +++ b/testing/kuttl/e2e/pgbackrest-init/00-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: init-pgbackrest diff --git a/testing/kuttl/e2e/pgbackrest-init/04--cluster.yaml b/testing/kuttl/e2e/pgbackrest-init/04--cluster.yaml index e732f1fd9a..6669c0d262 100644 --- a/testing/kuttl/e2e/pgbackrest-init/04--cluster.yaml +++ b/testing/kuttl/e2e/pgbackrest-init/04--cluster.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: init-pgbackrest diff --git a/testing/kuttl/e2e/pgbackrest-init/04-assert.yaml b/testing/kuttl/e2e/pgbackrest-init/04-assert.yaml index 04a38ac9f4..89eba23413 100644 --- a/testing/kuttl/e2e/pgbackrest-init/04-assert.yaml +++ b/testing/kuttl/e2e/pgbackrest-init/04-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: init-pgbackrest diff --git a/testing/kuttl/e2e/pgbouncer/00--cluster.yaml b/testing/kuttl/e2e/pgbouncer/00--cluster.yaml index 4699d90171..9a61dccef9 100644 --- a/testing/kuttl/e2e/pgbouncer/00--cluster.yaml +++ b/testing/kuttl/e2e/pgbouncer/00--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: proxied diff --git a/testing/kuttl/e2e/pgbouncer/00-assert.yaml b/testing/kuttl/e2e/pgbouncer/00-assert.yaml index 6c3a33079f..c914e8991e 100644 --- a/testing/kuttl/e2e/pgbouncer/00-assert.yaml +++ b/testing/kuttl/e2e/pgbouncer/00-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: proxied diff --git a/testing/kuttl/e2e/replica-read/00--cluster.yaml b/testing/kuttl/e2e/replica-read/00--cluster.yaml index c62f5418cd..9c79960116 100644 --- a/testing/kuttl/e2e/replica-read/00--cluster.yaml +++ b/testing/kuttl/e2e/replica-read/00--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: replica-read diff --git a/testing/kuttl/e2e/replica-read/00-assert.yaml b/testing/kuttl/e2e/replica-read/00-assert.yaml index 17c2942eb0..f17d7dc0c8 100644 --- a/testing/kuttl/e2e/replica-read/00-assert.yaml +++ b/testing/kuttl/e2e/replica-read/00-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: replica-read diff --git a/testing/kuttl/e2e/root-cert-ownership/00--cluster.yaml b/testing/kuttl/e2e/root-cert-ownership/00--cluster.yaml index 2d23e1e3d3..23f4fb9212 100644 --- a/testing/kuttl/e2e/root-cert-ownership/00--cluster.yaml +++ b/testing/kuttl/e2e/root-cert-ownership/00--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: owner1 @@ -10,7 +10,7 @@ spec: replicas: 1 dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } } --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: owner2 diff --git a/testing/kuttl/e2e/root-cert-ownership/00-assert.yaml b/testing/kuttl/e2e/root-cert-ownership/00-assert.yaml index 406465b691..a1fef98859 100644 --- a/testing/kuttl/e2e/root-cert-ownership/00-assert.yaml +++ b/testing/kuttl/e2e/root-cert-ownership/00-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: owner1 @@ -9,7 +9,7 @@ status: replicas: 1 updatedReplicas: 1 --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: owner2 diff --git a/testing/kuttl/e2e/root-cert-ownership/02-assert.yaml b/testing/kuttl/e2e/root-cert-ownership/02-assert.yaml index 839f6a9b29..84dfaf2de8 100644 --- a/testing/kuttl/e2e/root-cert-ownership/02-assert.yaml +++ b/testing/kuttl/e2e/root-cert-ownership/02-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: owner2 diff --git a/testing/kuttl/e2e/root-cert-ownership/02-errors.yaml b/testing/kuttl/e2e/root-cert-ownership/02-errors.yaml index d8f159d59c..9cb7c13433 100644 --- a/testing/kuttl/e2e/root-cert-ownership/02-errors.yaml +++ b/testing/kuttl/e2e/root-cert-ownership/02-errors.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: owner1 diff --git a/testing/kuttl/e2e/root-cert-ownership/04-errors.yaml b/testing/kuttl/e2e/root-cert-ownership/04-errors.yaml index b117c4561b..2939054a21 100644 --- a/testing/kuttl/e2e/root-cert-ownership/04-errors.yaml +++ b/testing/kuttl/e2e/root-cert-ownership/04-errors.yaml @@ -1,9 +1,9 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: owner1 --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: owner2 diff --git a/testing/kuttl/e2e/scaledown/00--create-cluster.yaml b/testing/kuttl/e2e/scaledown/00--create-cluster.yaml index 50377c2fb6..1e4586e172 100644 --- a/testing/kuttl/e2e/scaledown/00--create-cluster.yaml +++ b/testing/kuttl/e2e/scaledown/00--create-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown diff --git a/testing/kuttl/e2e/scaledown/00-assert.yaml b/testing/kuttl/e2e/scaledown/00-assert.yaml index b5fa5a9051..fb08e124f0 100644 --- a/testing/kuttl/e2e/scaledown/00-assert.yaml +++ b/testing/kuttl/e2e/scaledown/00-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown diff --git a/testing/kuttl/e2e/scaledown/01--update-cluster.yaml b/testing/kuttl/e2e/scaledown/01--update-cluster.yaml index d6409a8fd1..0fce072dc8 100644 --- a/testing/kuttl/e2e/scaledown/01--update-cluster.yaml +++ b/testing/kuttl/e2e/scaledown/01--update-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown diff --git a/testing/kuttl/e2e/scaledown/01-assert.yaml b/testing/kuttl/e2e/scaledown/01-assert.yaml index 45bb0b6d04..b88ea56ca3 100644 --- a/testing/kuttl/e2e/scaledown/01-assert.yaml +++ b/testing/kuttl/e2e/scaledown/01-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown diff --git a/testing/kuttl/e2e/scaledown/10--create-cluster.yaml b/testing/kuttl/e2e/scaledown/10--create-cluster.yaml index 3847e588c0..9af2fd0103 100644 --- a/testing/kuttl/e2e/scaledown/10--create-cluster.yaml +++ b/testing/kuttl/e2e/scaledown/10--create-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown1 diff --git a/testing/kuttl/e2e/scaledown/10-assert.yaml b/testing/kuttl/e2e/scaledown/10-assert.yaml index cf8bcb461a..e1862b9e0d 100644 --- a/testing/kuttl/e2e/scaledown/10-assert.yaml +++ b/testing/kuttl/e2e/scaledown/10-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown1 diff --git a/testing/kuttl/e2e/scaledown/12--update-cluster.yaml b/testing/kuttl/e2e/scaledown/12--update-cluster.yaml index 3b4f62094a..a5cbdddb33 100644 --- a/testing/kuttl/e2e/scaledown/12--update-cluster.yaml +++ b/testing/kuttl/e2e/scaledown/12--update-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown1 diff --git a/testing/kuttl/e2e/scaledown/12-assert.yaml b/testing/kuttl/e2e/scaledown/12-assert.yaml index 079435b67d..a409e60697 100644 --- a/testing/kuttl/e2e/scaledown/12-assert.yaml +++ b/testing/kuttl/e2e/scaledown/12-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown1 diff --git a/testing/kuttl/e2e/scaledown/20--create-cluster.yaml b/testing/kuttl/e2e/scaledown/20--create-cluster.yaml index 796f88db3c..2454897b70 100644 --- a/testing/kuttl/e2e/scaledown/20--create-cluster.yaml +++ b/testing/kuttl/e2e/scaledown/20--create-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown2 diff --git a/testing/kuttl/e2e/scaledown/20-assert.yaml b/testing/kuttl/e2e/scaledown/20-assert.yaml index f65cef60b8..d0392fce99 100644 --- a/testing/kuttl/e2e/scaledown/20-assert.yaml +++ b/testing/kuttl/e2e/scaledown/20-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown2 diff --git a/testing/kuttl/e2e/scaledown/21--update-cluster.yaml b/testing/kuttl/e2e/scaledown/21--update-cluster.yaml index 02d8936d0b..f675d74a4d 100644 --- a/testing/kuttl/e2e/scaledown/21--update-cluster.yaml +++ b/testing/kuttl/e2e/scaledown/21--update-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown2 diff --git a/testing/kuttl/e2e/scaledown/21-assert.yaml b/testing/kuttl/e2e/scaledown/21-assert.yaml index f137a616b8..80ac7ef0df 100644 --- a/testing/kuttl/e2e/scaledown/21-assert.yaml +++ b/testing/kuttl/e2e/scaledown/21-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: scaledown2 diff --git a/testing/kuttl/e2e/security-context/00--cluster.yaml b/testing/kuttl/e2e/security-context/00--cluster.yaml index d754eedec6..0fa6a0881f 100644 --- a/testing/kuttl/e2e/security-context/00--cluster.yaml +++ b/testing/kuttl/e2e/security-context/00--cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: security-context diff --git a/testing/kuttl/e2e/security-context/00-assert.yaml b/testing/kuttl/e2e/security-context/00-assert.yaml index 6df19c6608..032bf5b2ad 100644 --- a/testing/kuttl/e2e/security-context/00-assert.yaml +++ b/testing/kuttl/e2e/security-context/00-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: security-context diff --git a/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster-check.yaml b/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster-check.yaml index 8ae250152f..b47b7f5e22 100644 --- a/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster-check.yaml +++ b/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster-check.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: elephant diff --git a/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster.yaml b/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster.yaml index 5f8678e5e9..05510cd1b3 100644 --- a/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster.yaml +++ b/testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: elephant diff --git a/testing/kuttl/e2e/streaming-standby/01--primary-cluster.yaml b/testing/kuttl/e2e/streaming-standby/01--primary-cluster.yaml index 44d1386b59..7bcc1de3a0 100644 --- a/testing/kuttl/e2e/streaming-standby/01--primary-cluster.yaml +++ b/testing/kuttl/e2e/streaming-standby/01--primary-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: primary-cluster diff --git a/testing/kuttl/e2e/streaming-standby/01-assert.yaml b/testing/kuttl/e2e/streaming-standby/01-assert.yaml index 55c820a116..09e1ed27ab 100644 --- a/testing/kuttl/e2e/streaming-standby/01-assert.yaml +++ b/testing/kuttl/e2e/streaming-standby/01-assert.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: primary-cluster diff --git a/testing/kuttl/e2e/streaming-standby/03--standby-cluster.yaml b/testing/kuttl/e2e/streaming-standby/03--standby-cluster.yaml index ebe382041a..b8a6a90fe2 100644 --- a/testing/kuttl/e2e/streaming-standby/03--standby-cluster.yaml +++ b/testing/kuttl/e2e/streaming-standby/03--standby-cluster.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: standby-cluster diff --git a/testing/kuttl/e2e/streaming-standby/03-assert.yaml b/testing/kuttl/e2e/streaming-standby/03-assert.yaml index 9c3a95c1d3..571a3f5921 100644 --- a/testing/kuttl/e2e/streaming-standby/03-assert.yaml +++ b/testing/kuttl/e2e/streaming-standby/03-assert.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: standby-cluster diff --git a/testing/kuttl/e2e/switchover/01--cluster.yaml b/testing/kuttl/e2e/switchover/01--cluster.yaml index 4c91dd85ec..a4eb33c756 100644 --- a/testing/kuttl/e2e/switchover/01--cluster.yaml +++ b/testing/kuttl/e2e/switchover/01--cluster.yaml @@ -1,6 +1,6 @@ --- # Create a cluster with multiple instances and manual switchover enabled. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: switchover diff --git a/testing/kuttl/e2e/switchover/01-assert.yaml b/testing/kuttl/e2e/switchover/01-assert.yaml index b6b35e8126..a724fb451e 100644 --- a/testing/kuttl/e2e/switchover/01-assert.yaml +++ b/testing/kuttl/e2e/switchover/01-assert.yaml @@ -1,5 +1,5 @@ --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: switchover diff --git a/testing/kuttl/e2e/switchover/03-assert.yaml b/testing/kuttl/e2e/switchover/03-assert.yaml index cad813362f..2bbc350932 100644 --- a/testing/kuttl/e2e/switchover/03-assert.yaml +++ b/testing/kuttl/e2e/switchover/03-assert.yaml @@ -24,7 +24,7 @@ metadata: --- # All instances should be healthy. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: switchover diff --git a/testing/kuttl/e2e/tablespace-enabled/00--cluster.yaml b/testing/kuttl/e2e/tablespace-enabled/00--cluster.yaml index ea69a7264f..0304ead6e0 100644 --- a/testing/kuttl/e2e/tablespace-enabled/00--cluster.yaml +++ b/testing/kuttl/e2e/tablespace-enabled/00--cluster.yaml @@ -7,7 +7,7 @@ data: CREATE TABLESPACE trial OWNER "tablespace-enabled" LOCATION '/tablespaces/library/data'; CREATE TABLESPACE castle OWNER "tablespace-enabled" LOCATION '/tablespaces/user/data'; --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: tablespace-enabled diff --git a/testing/kuttl/e2e/tablespace-enabled/00-assert.yaml b/testing/kuttl/e2e/tablespace-enabled/00-assert.yaml index ad436fc892..8bd0f2f7c5 100644 --- a/testing/kuttl/e2e/tablespace-enabled/00-assert.yaml +++ b/testing/kuttl/e2e/tablespace-enabled/00-assert.yaml @@ -1,4 +1,4 @@ -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: tablespace-enabled diff --git a/testing/kuttl/e2e/wal-pvc-pgupgrade/00--create-resources.yaml b/testing/kuttl/e2e/wal-pvc-pgupgrade/00--create-resources.yaml index 4ec3e7c22b..55062f2f74 100644 --- a/testing/kuttl/e2e/wal-pvc-pgupgrade/00--create-resources.yaml +++ b/testing/kuttl/e2e/wal-pvc-pgupgrade/00--create-resources.yaml @@ -1,6 +1,6 @@ --- # Create the cluster we will do an actual upgrade on -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: wal-pvc-pgupgrade diff --git a/testing/kuttl/e2e/wal-pvc-pgupgrade/00-assert.yaml b/testing/kuttl/e2e/wal-pvc-pgupgrade/00-assert.yaml index b3267d072b..0d6b3a58e3 100644 --- a/testing/kuttl/e2e/wal-pvc-pgupgrade/00-assert.yaml +++ b/testing/kuttl/e2e/wal-pvc-pgupgrade/00-assert.yaml @@ -1,7 +1,7 @@ --- # Wait for the instances to be ready and the replica backup to complete # by waiting for the status to signal pods ready and pgbackrest stanza created -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: wal-pvc-pgupgrade diff --git a/testing/kuttl/e2e/wal-pvc-pgupgrade/02--shutdown-cluster.yaml b/testing/kuttl/e2e/wal-pvc-pgupgrade/02--shutdown-cluster.yaml index 6d44b8b23b..8bd06eb22c 100644 --- a/testing/kuttl/e2e/wal-pvc-pgupgrade/02--shutdown-cluster.yaml +++ b/testing/kuttl/e2e/wal-pvc-pgupgrade/02--shutdown-cluster.yaml @@ -1,6 +1,6 @@ --- # Shutdown the cluster -- but without the annotation. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: wal-pvc-pgupgrade diff --git a/testing/kuttl/e2e/wal-pvc-pgupgrade/03--annotate-cluster.yaml b/testing/kuttl/e2e/wal-pvc-pgupgrade/03--annotate-cluster.yaml index fd9739c9e1..3efce5dbdb 100644 --- a/testing/kuttl/e2e/wal-pvc-pgupgrade/03--annotate-cluster.yaml +++ b/testing/kuttl/e2e/wal-pvc-pgupgrade/03--annotate-cluster.yaml @@ -1,6 +1,6 @@ --- # Annotate the cluster for an upgrade. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: wal-pvc-pgupgrade diff --git a/testing/kuttl/e2e/wal-pvc-pgupgrade/03-assert.yaml b/testing/kuttl/e2e/wal-pvc-pgupgrade/03-assert.yaml index 0e5d8e7c20..be8ae1966c 100644 --- a/testing/kuttl/e2e/wal-pvc-pgupgrade/03-assert.yaml +++ b/testing/kuttl/e2e/wal-pvc-pgupgrade/03-assert.yaml @@ -14,7 +14,7 @@ status: - type: "Succeeded" status: "True" --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: wal-pvc-pgupgrade diff --git a/testing/kuttl/e2e/wal-pvc-pgupgrade/04--restart-cluster.yaml b/testing/kuttl/e2e/wal-pvc-pgupgrade/04--restart-cluster.yaml index 95b122eed3..22bbb7e09a 100644 --- a/testing/kuttl/e2e/wal-pvc-pgupgrade/04--restart-cluster.yaml +++ b/testing/kuttl/e2e/wal-pvc-pgupgrade/04--restart-cluster.yaml @@ -1,7 +1,7 @@ --- # Once the pgupgrade is finished, update the version and set shutdown to false # in the postgres cluster -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: wal-pvc-pgupgrade diff --git a/testing/kuttl/e2e/wal-pvc-pgupgrade/04-assert.yaml b/testing/kuttl/e2e/wal-pvc-pgupgrade/04-assert.yaml index 089d448cbd..0296fd03c6 100644 --- a/testing/kuttl/e2e/wal-pvc-pgupgrade/04-assert.yaml +++ b/testing/kuttl/e2e/wal-pvc-pgupgrade/04-assert.yaml @@ -1,6 +1,6 @@ --- # Wait for the instances to be ready with the target Postgres version. -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: postgres-operator.crunchydata.com/${KUTTL_PGCLUSTER_API_VERSION} kind: PostgresCluster metadata: name: wal-pvc-pgupgrade