From 104ec212882311738f2082b60c098292e96253ec Mon Sep 17 00:00:00 2001 From: George Kechagias Date: Tue, 17 Mar 2026 18:09:57 +0200 Subject: [PATCH 1/2] K8SPG-908 postgis e2e test --- e2e-tests/tests/postgis/00-assert.yaml | 24 ++++ .../tests/postgis/00-deploy-operator.yaml | 13 ++ e2e-tests/tests/postgis/01-assert.yaml | 115 ++++++++++++++++++ .../tests/postgis/01-create-cluster.yaml | 12 ++ e2e-tests/tests/postgis/02-assert.yaml | 28 +++++ .../tests/postgis/02-enable-postgis.yaml | 16 +++ e2e-tests/tests/postgis/03-check-postgis.yaml | 46 +++++++ .../postgis/99-remove-cluster-gracefully.yaml | 22 ++++ e2e-tests/vars.sh | 1 + 9 files changed, 277 insertions(+) create mode 100644 e2e-tests/tests/postgis/00-assert.yaml create mode 100644 e2e-tests/tests/postgis/00-deploy-operator.yaml create mode 100644 e2e-tests/tests/postgis/01-assert.yaml create mode 100644 e2e-tests/tests/postgis/01-create-cluster.yaml create mode 100644 e2e-tests/tests/postgis/02-assert.yaml create mode 100644 e2e-tests/tests/postgis/02-enable-postgis.yaml create mode 100644 e2e-tests/tests/postgis/03-check-postgis.yaml create mode 100644 e2e-tests/tests/postgis/99-remove-cluster-gracefully.yaml diff --git a/e2e-tests/tests/postgis/00-assert.yaml b/e2e-tests/tests/postgis/00-assert.yaml new file mode 100644 index 0000000000..ae5a062d84 --- /dev/null +++ b/e2e-tests/tests/postgis/00-assert.yaml @@ -0,0 +1,24 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +timeout: 120 +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: perconapgclusters.pgv2.percona.com +spec: + group: pgv2.percona.com + names: + kind: PerconaPGCluster + listKind: PerconaPGClusterList + plural: perconapgclusters + singular: perconapgcluster + scope: Namespaced +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +metadata: + name: check-operator-deploy-status +timeout: 120 +commands: + - script: kubectl assert exist-enhanced deployment percona-postgresql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1 diff --git a/e2e-tests/tests/postgis/00-deploy-operator.yaml b/e2e-tests/tests/postgis/00-deploy-operator.yaml new file mode 100644 index 0000000000..1aaca58be2 --- /dev/null +++ b/e2e-tests/tests/postgis/00-deploy-operator.yaml @@ -0,0 +1,13 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +timeout: 10 +commands: + - script: |- + set -o errexit + set -o xtrace + + source ../../functions + init_temp_dir # do this only in the first TestStep + + deploy_operator + deploy_client diff --git a/e2e-tests/tests/postgis/01-assert.yaml b/e2e-tests/tests/postgis/01-assert.yaml new file mode 100644 index 0000000000..ab55fd57fd --- /dev/null +++ b/e2e-tests/tests/postgis/01-assert.yaml @@ -0,0 +1,115 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +timeout: 180 +--- +kind: StatefulSet +apiVersion: apps/v1 +metadata: + name: postgis-repo-host + labels: + postgres-operator.crunchydata.com/cluster: postgis + postgres-operator.crunchydata.com/data: pgbackrest + postgres-operator.crunchydata.com/pgbackrest: '' + postgres-operator.crunchydata.com/pgbackrest-dedicated: '' + ownerReferences: + - apiVersion: postgres-operator.crunchydata.com/v1beta1 + kind: PostgresCluster + name: postgis + controller: true + blockOwnerDeletion: true +status: + observedGeneration: 1 + replicas: 1 + readyReplicas: 1 + currentReplicas: 1 + updatedReplicas: 1 + collisionCount: 0 +--- +kind: StatefulSet +apiVersion: apps/v1 +metadata: + labels: + postgres-operator.crunchydata.com/cluster: postgis + postgres-operator.crunchydata.com/data: postgres + postgres-operator.crunchydata.com/instance-set: instance1 + ownerReferences: + - apiVersion: postgres-operator.crunchydata.com/v1beta1 + kind: PostgresCluster + name: postgis + controller: true + blockOwnerDeletion: true +status: + observedGeneration: 1 + replicas: 1 + readyReplicas: 1 + currentReplicas: 1 + updatedReplicas: 1 + collisionCount: 0 +--- +kind: Deployment +apiVersion: apps/v1 +metadata: + name: postgis-pgbouncer + labels: + postgres-operator.crunchydata.com/cluster: postgis + postgres-operator.crunchydata.com/role: pgbouncer + ownerReferences: + - apiVersion: postgres-operator.crunchydata.com/v1beta1 + kind: PostgresCluster + name: postgis + controller: true + blockOwnerDeletion: true +status: + observedGeneration: 1 + replicas: 3 + updatedReplicas: 3 + readyReplicas: 3 +--- +apiVersion: postgres-operator.crunchydata.com/v1beta1 +kind: PostgresCluster +metadata: + name: postgis + ownerReferences: + - apiVersion: pgv2.percona.com/v2 + kind: PerconaPGCluster + name: postgis + controller: true + blockOwnerDeletion: true + finalizers: + - postgres-operator.crunchydata.com/finalizer +status: + instances: + - name: instance1 + readyReplicas: 3 + replicas: 3 + updatedReplicas: 3 + observedGeneration: 1 + pgbackrest: + repoHost: + apiVersion: apps/v1 + kind: StatefulSet + ready: true + repos: + - bound: true + name: repo1 + proxy: + pgBouncer: + readyReplicas: 3 + replicas: 3 +--- +apiVersion: pgv2.percona.com/v2 +kind: PerconaPGCluster +metadata: + name: postgis +status: + pgbouncer: + ready: 3 + size: 3 + postgres: + instances: + - name: instance1 + ready: 3 + size: 3 + ready: 3 + size: 3 + state: ready diff --git a/e2e-tests/tests/postgis/01-create-cluster.yaml b/e2e-tests/tests/postgis/01-create-cluster.yaml new file mode 100644 index 0000000000..abcf680dfe --- /dev/null +++ b/e2e-tests/tests/postgis/01-create-cluster.yaml @@ -0,0 +1,12 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +timeout: 100 +commands: + - script: |- + set -o errexit + set -o xtrace + + source ../../functions + + # Use the PostGIS-enabled PostgreSQL image + get_cr | yq eval '.spec.image = "'$IMAGE_POSTGIS'"' - | kubectl -n "${NAMESPACE}" apply -f - diff --git a/e2e-tests/tests/postgis/02-assert.yaml b/e2e-tests/tests/postgis/02-assert.yaml new file mode 100644 index 0000000000..e49a83fe17 --- /dev/null +++ b/e2e-tests/tests/postgis/02-assert.yaml @@ -0,0 +1,28 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +timeout: 120 +--- +apiVersion: postgres-operator.crunchydata.com/v1beta1 +kind: PostgresCluster +metadata: + name: postgis +status: + instances: + - name: instance1 + readyReplicas: 3 + replicas: 3 + updatedReplicas: 3 + pgbackrest: + repoHost: + ready: true + proxy: + pgBouncer: + readyReplicas: 3 + replicas: 3 +--- +apiVersion: pgv2.percona.com/v2 +kind: PerconaPGCluster +metadata: + name: postgis +status: + state: ready diff --git a/e2e-tests/tests/postgis/02-enable-postgis.yaml b/e2e-tests/tests/postgis/02-enable-postgis.yaml new file mode 100644 index 0000000000..569760e5bf --- /dev/null +++ b/e2e-tests/tests/postgis/02-enable-postgis.yaml @@ -0,0 +1,16 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +timeout: 100 +commands: + - script: |- + set -o errexit + set -o xtrace + + source ../../functions + + # Patch the underlying PostgresCluster to enable PostGIS. + # The Percona operator does not override postGISVersion on reconcile, + # so this setting is preserved and triggers PostGIS extension installation. + kubectl -n "${NAMESPACE}" patch postgrescluster postgis \ + --type=merge \ + --patch "{\"spec\":{\"postGISVersion\":\"${POSTGIS_VER}\"}}" diff --git a/e2e-tests/tests/postgis/03-check-postgis.yaml b/e2e-tests/tests/postgis/03-check-postgis.yaml new file mode 100644 index 0000000000..be022b2ecc --- /dev/null +++ b/e2e-tests/tests/postgis/03-check-postgis.yaml @@ -0,0 +1,46 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +timeout: 120 +commands: + - script: |- + set -o errexit + set -o xtrace + + source ../../functions + + PSQL_URI="postgres:$(get_psql_user_pass postgis-pguser-postgres)@$(get_psql_user_host postgis-pguser-postgres)/postgres" + + result=$(run_psql_local \ + "SELECT left(postgis_version(),1);" \ + "${PSQL_URI}") + if [[ "${result}" != "${POSTGIS_VER:0:1}" ]]; then + echo "PostGIS version check failed: expected major version ${POSTGIS_VER:0:1}, got ${result}" + exit 1 + fi + + for schema in tiger tiger_data topology; do + result=$(run_psql_local \ + "SELECT nspname FROM pg_catalog.pg_namespace WHERE nspname='${schema}';" \ + "${PSQL_URI}") + if [[ "${result}" != "${schema}" ]]; then + echo "PostGIS schema '${schema}' is missing" + exit 1 + fi + done + + result=$(run_psql_local \ + "SELECT pg_typeof(ST_MakePoint(28.385200,-81.563900));" \ + "${PSQL_URI}") + if [[ "${result}" != "geometry" ]]; then + echo "ST_MakePoint check failed: expected 'geometry', got '${result}'" + exit 1 + fi + + result=$(run_psql_local \ + "SELECT ST_AsGeoJSON('SRID=4326;POINT(-118.4079 33.9434)'::geography);" \ + "${PSQL_URI}") + expected='{"type":"Point","coordinates":[-118.4079,33.9434]}' + if [[ "${result}" != "${expected}" ]]; then + echo "ST_AsGeoJSON check failed: expected '${expected}', got '${result}'" + exit 1 + fi diff --git a/e2e-tests/tests/postgis/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/postgis/99-remove-cluster-gracefully.yaml new file mode 100644 index 0000000000..6c0486bf44 --- /dev/null +++ b/e2e-tests/tests/postgis/99-remove-cluster-gracefully.yaml @@ -0,0 +1,22 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +delete: +- apiVersion: pgv2.percona.com/v2 + kind: PerconaPGCluster + metadata: + name: postgis +- apiVersion: postgres-operator.crunchydata.com/v1beta1 + kind: PostgresCluster + metadata: + name: postgis +commands: + - script: |- + set -o errexit + set -o xtrace + + source ../../functions + + remove_all_finalizers + check_operator_panic + destroy_operator + timeout: 60 diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index 92ea4e92cb..bffb1e71bc 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -33,6 +33,7 @@ fi export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"${IMAGE_BASE}:main-pgbouncer$PG_VER"} export IMAGE_POSTGRESQL=${IMAGE_POSTGRESQL:-"${IMAGE_BASE}:main-ppg$PG_VER-postgres"} export IMAGE_BACKREST=${IMAGE_BACKREST:-"${IMAGE_BASE}:main-pgbackrest$PG_VER"} +export IMAGE_POSTGIS=${s:-"docker.io/percona/percona-postgresql-operator:2.8.1-ppg17.7-postgres-gis3.3.8"} export IMAGE_UPGRADE=${IMAGE_UPGRADE:-"${IMAGE_BASE}:main-upgrade"} export BUCKET=${BUCKET:-"pg-operator-testing"} export PMM_SERVER_VERSION=${PMM_SERVER_VERSION:-"9.9.9"} From f2d84cfbef57b07ba06f5681bf167db0c8d5b91c Mon Sep 17 00:00:00 2001 From: Julio Pasinatto Date: Thu, 6 Aug 2026 13:05:51 -0300 Subject: [PATCH 2/2] Update test with new crds and checks --- e2e-tests/run-pr.csv | 1 + e2e-tests/run-release.csv | 1 + e2e-tests/tests/postgis/01-assert.yaml | 8 +- .../tests/postgis/01-create-cluster.yaml | 4 +- e2e-tests/tests/postgis/02-assert.yaml | 2 +- .../tests/postgis/02-enable-postgis.yaml | 9 +- e2e-tests/tests/postgis/03-assert.yaml | 16 ++++ e2e-tests/tests/postgis/03-check-postgis.yaml | 89 ++++++++++++------- .../postgis/99-remove-cluster-gracefully.yaml | 2 +- e2e-tests/vars.sh | 3 +- 10 files changed, 94 insertions(+), 41 deletions(-) create mode 100644 e2e-tests/tests/postgis/03-assert.yaml diff --git a/e2e-tests/run-pr.csv b/e2e-tests/run-pr.csv index 30ee21675b..1ef4e91b70 100644 --- a/e2e-tests/run-pr.csv +++ b/e2e-tests/run-pr.csv @@ -27,6 +27,7 @@ operator-self-healing pgbouncer-mtls pg-tde pitr +postgis scaling scheduled-backup self-healing diff --git a/e2e-tests/run-release.csv b/e2e-tests/run-release.csv index b2fe977777..1064a15eef 100644 --- a/e2e-tests/run-release.csv +++ b/e2e-tests/run-release.csv @@ -32,6 +32,7 @@ operator-self-healing pgbouncer-mtls pg-tde pitr +postgis scaling scheduled-backup self-healing diff --git a/e2e-tests/tests/postgis/01-assert.yaml b/e2e-tests/tests/postgis/01-assert.yaml index ab55fd57fd..832d4c360f 100644 --- a/e2e-tests/tests/postgis/01-assert.yaml +++ b/e2e-tests/tests/postgis/01-assert.yaml @@ -12,7 +12,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: postgres-operator.crunchydata.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: postgis controller: true @@ -33,7 +33,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: postgres-operator.crunchydata.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: postgis controller: true @@ -54,7 +54,7 @@ metadata: postgres-operator.crunchydata.com/cluster: postgis postgres-operator.crunchydata.com/role: pgbouncer ownerReferences: - - apiVersion: postgres-operator.crunchydata.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: postgis controller: true @@ -65,7 +65,7 @@ status: updatedReplicas: 3 readyReplicas: 3 --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: postgis diff --git a/e2e-tests/tests/postgis/01-create-cluster.yaml b/e2e-tests/tests/postgis/01-create-cluster.yaml index abcf680dfe..7b2effb26d 100644 --- a/e2e-tests/tests/postgis/01-create-cluster.yaml +++ b/e2e-tests/tests/postgis/01-create-cluster.yaml @@ -8,5 +8,5 @@ commands: source ../../functions - # Use the PostGIS-enabled PostgreSQL image - get_cr | yq eval '.spec.image = "'$IMAGE_POSTGIS'"' - | kubectl -n "${NAMESPACE}" apply -f - + postgres_image=$(get_container_image "postgis" "${PG_VER}") + get_cr | yq eval ".spec.image = \"${postgres_image}\"" - | kubectl -n "${NAMESPACE}" apply -f - diff --git a/e2e-tests/tests/postgis/02-assert.yaml b/e2e-tests/tests/postgis/02-assert.yaml index e49a83fe17..24c6cb5931 100644 --- a/e2e-tests/tests/postgis/02-assert.yaml +++ b/e2e-tests/tests/postgis/02-assert.yaml @@ -2,7 +2,7 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert timeout: 120 --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: postgis diff --git a/e2e-tests/tests/postgis/02-enable-postgis.yaml b/e2e-tests/tests/postgis/02-enable-postgis.yaml index 569760e5bf..2d2f802fed 100644 --- a/e2e-tests/tests/postgis/02-enable-postgis.yaml +++ b/e2e-tests/tests/postgis/02-enable-postgis.yaml @@ -1,6 +1,6 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 100 +timeout: 360 commands: - script: |- set -o errexit @@ -8,9 +8,16 @@ commands: source ../../functions + PSQL_URI="postgres:$(get_psql_user_pass postgis-pguser-postgres)@$(get_psql_user_host postgis-pguser-postgres)/postgres" + + # Create a second DB before enable so auto-install covers both databases. + run_psql_local "CREATE DATABASE mygisdata;" "${PSQL_URI}" + # Patch the underlying PostgresCluster to enable PostGIS. # The Percona operator does not override postGISVersion on reconcile, # so this setting is preserved and triggers PostGIS extension installation. kubectl -n "${NAMESPACE}" patch postgrescluster postgis \ --type=merge \ --patch "{\"spec\":{\"postGISVersion\":\"${POSTGIS_VER}\"}}" + + wait_cluster_consistency postgis diff --git a/e2e-tests/tests/postgis/03-assert.yaml b/e2e-tests/tests/postgis/03-assert.yaml new file mode 100644 index 0000000000..31df54b101 --- /dev/null +++ b/e2e-tests/tests/postgis/03-assert.yaml @@ -0,0 +1,16 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +timeout: 30 +--- +kind: ConfigMap +apiVersion: v1 +metadata: + name: 03-check-postgis +data: + extensions_postgres: fuzzystrmatch,postgis,postgis_tiger_geocoder,postgis_topology + extensions_mygisdata: fuzzystrmatch,postgis,postgis_tiger_geocoder,postgis_topology + schemas: tiger,topology + geometry: geometry + geojson: '{"type":"Point","coordinates":[-118.4079,33.9434]}' + version_matches: "true" + image_is_gis: "true" diff --git a/e2e-tests/tests/postgis/03-check-postgis.yaml b/e2e-tests/tests/postgis/03-check-postgis.yaml index be022b2ecc..cc2575f383 100644 --- a/e2e-tests/tests/postgis/03-check-postgis.yaml +++ b/e2e-tests/tests/postgis/03-check-postgis.yaml @@ -1,6 +1,6 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep -timeout: 120 +timeout: 180 commands: - script: |- set -o errexit @@ -8,39 +8,66 @@ commands: source ../../functions - PSQL_URI="postgres:$(get_psql_user_pass postgis-pguser-postgres)@$(get_psql_user_host postgis-pguser-postgres)/postgres" + BASE_URI="postgres:$(get_psql_user_pass postgis-pguser-postgres)@$(get_psql_user_host postgis-pguser-postgres)" - result=$(run_psql_local \ - "SELECT left(postgis_version(),1);" \ - "${PSQL_URI}") - if [[ "${result}" != "${POSTGIS_VER:0:1}" ]]; then - echo "PostGIS version check failed: expected major version ${POSTGIS_VER:0:1}, got ${result}" - exit 1 - fi + select_matching() { + local db=$1 + local sql=$2 + local pattern=$3 + + run_psql_local "${sql}" "${BASE_URI}/${db}" \ + | tr -d '[:blank:]' | grep -E "${pattern}" | sort | paste -sd, - + } + + get_extensions() { + select_matching "$1" \ + "SELECT extname FROM pg_extension ORDER BY extname;" \ + '^(fuzzystrmatch|postgis|postgis_tiger_geocoder|postgis_topology)$' + } + + check_extensions() { + [[ "$(get_extensions "$1")" == "fuzzystrmatch,postgis,postgis_tiger_geocoder,postgis_topology" ]] + } + + retry 24 5 check_extensions postgres + retry 24 5 check_extensions mygisdata - for schema in tiger tiger_data topology; do - result=$(run_psql_local \ - "SELECT nspname FROM pg_catalog.pg_namespace WHERE nspname='${schema}';" \ - "${PSQL_URI}") - if [[ "${result}" != "${schema}" ]]; then - echo "PostGIS schema '${schema}' is missing" - exit 1 - fi - done - - result=$(run_psql_local \ + extensions_postgres=$(get_extensions postgres) + extensions_mygisdata=$(get_extensions mygisdata) + + schemas=$(select_matching postgres \ + "SELECT nspname FROM pg_catalog.pg_namespace ORDER BY nspname;" \ + '^(tiger|topology)$') + + geometry=$(run_psql_local \ "SELECT pg_typeof(ST_MakePoint(28.385200,-81.563900));" \ - "${PSQL_URI}") - if [[ "${result}" != "geometry" ]]; then - echo "ST_MakePoint check failed: expected 'geometry', got '${result}'" - exit 1 + "${BASE_URI}/postgres" | tr -d '[:space:]') + + geojson=$(run_psql_local \ + "SELECT ST_AsGeoJSON(ST_SetSRID(ST_MakePoint(-118.4079,33.9434),4326)::geography);" \ + "${BASE_URI}/postgres" | tr -d '[:space:]') + + version=$(run_psql_local \ + "SELECT left(postgis_version(),1);" \ + "${BASE_URI}/postgres" | tr -d '[:space:]') + spec_version=$(kubectl -n "${NAMESPACE}" get postgrescluster postgis -o jsonpath='{.spec.postGISVersion}') + version_matches=false + if [[ "${spec_version}" == "${POSTGIS_VER}" && "${version}" == "${POSTGIS_VER:0:1}" ]]; then + version_matches=true fi - result=$(run_psql_local \ - "SELECT ST_AsGeoJSON('SRID=4326;POINT(-118.4079 33.9434)'::geography);" \ - "${PSQL_URI}") - expected='{"type":"Point","coordinates":[-118.4079,33.9434]}' - if [[ "${result}" != "${expected}" ]]; then - echo "ST_AsGeoJSON check failed: expected '${expected}', got '${result}'" - exit 1 + primary=$(get_pod_by_role postgis primary name) + image=$(kubectl -n "${NAMESPACE}" get pod "${primary}" -o jsonpath='{.spec.containers[?(@.name=="database")].image}') + image_is_gis=false + if [[ "${image}" == *postgres-gis* ]]; then + image_is_gis=true fi + + kubectl create configmap -n "${NAMESPACE}" 03-check-postgis \ + --from-literal=extensions_postgres="${extensions_postgres}" \ + --from-literal=extensions_mygisdata="${extensions_mygisdata}" \ + --from-literal=schemas="${schemas}" \ + --from-literal=geometry="${geometry}" \ + --from-literal=geojson="${geojson}" \ + --from-literal=version_matches="${version_matches}" \ + --from-literal=image_is_gis="${image_is_gis}" diff --git a/e2e-tests/tests/postgis/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/postgis/99-remove-cluster-gracefully.yaml index 6c0486bf44..664de1d0ed 100644 --- a/e2e-tests/tests/postgis/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/postgis/99-remove-cluster-gracefully.yaml @@ -5,7 +5,7 @@ delete: kind: PerconaPGCluster metadata: name: postgis -- apiVersion: postgres-operator.crunchydata.com/v1beta1 +- apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: name: postgis diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index 839f0e0d94..ec63bac5ff 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -56,7 +56,8 @@ export PMM_SERVER_VERSION=${PMM_SERVER_VERSION:-"9.9.9"} export IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"perconalab/pmm-client:3-dev-latest"} export IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:3-dev-latest"} export IMAGE_LOGCOLLECTOR=${IMAGE_LOGCOLLECTOR:-"perconalab/fluentbit:main-logcollector"} -export IMAGE_POSTGIS=${s:-"docker.io/percona/percona-postgresql-operator:2.8.1-ppg17.7-postgres-gis3.3.8"} +export IMAGE_POSTGIS=${IMAGE_POSTGIS:-"${IMAGE_BASE}:main-ppg$PG_VER-postgres-gis"} +export POSTGIS_VER=${POSTGIS_VER:-"3.3"} export PGOV1_TAG=${PGOV1_TAG:-"1.4.0"} export PGOV1_VER=${PGOV1_VER:-"14"} export CPGO_VERSION=${CPGO_VERSION:-"5.8.7"}