diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index 971eb5a4a1..a0a4a1e058 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -93,6 +93,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 - - run: | + - name: check on release branch + if: ${{ contains(github.base_ref, 'release-') }} + run: | + make generate VERSION="$(cat percona/version/version.txt)" IMAGE_TAG_BASE="percona/percona-postgresql-operator" + git diff --exit-code + - name: check on non release branches + if: ${{ ! contains(github.base_ref, 'release-') }} + run: | make generate VERSION=main git diff --exit-code diff --git a/Makefile b/Makefile index 528b983dbb..72854a544f 100644 --- a/Makefile +++ b/Makefile @@ -443,6 +443,9 @@ rm -rf $$TMP_DIR ;\ } endef +update-version: + echo $(NEXT_VER) > percona/version/version.txt + # Prepare release PG_VER ?= $(shell grep -o "postgresVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+") include e2e-tests/release_versions @@ -469,11 +472,11 @@ MINOR_VER := $(word 2,$(subst ., ,$(CURRENT_VERSION))) NEXT_VER := $(MAJOR_VER).$(shell expr $(MINOR_VER) + 1).0 PREV1_VERSION := $(MAJOR_VER).$(shell expr $(MINOR_VER) - 1).0 PREV2_VERSION := $(MAJOR_VER).$(shell expr $(MINOR_VER) - 2).0 -after-release: generate - echo $(NEXT_VER) > percona/version/version.txt +after-release: update-version generate $(SED) -i \ -e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(NEXT_VER)/}" \ -e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \ + -e "/initContainer:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main#}" \ -e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbouncer$(PG_VER)#}" \ -e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" \ -e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main#}" \ @@ -484,6 +487,8 @@ after-release: generate -e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \ -e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbouncer$(PG_VER)#}" \ -e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" deploy/upgrade.yaml + +# Update upgrade-consistency $(SED) -i "s/$(PREV2_VERSION)/$(PREV1_VERSION)/g" e2e-tests/tests/upgrade-consistency/01-*.yaml $(SED) -i "s/$(PREV1_VERSION)/$(CURRENT_VERSION)/g" e2e-tests/tests/upgrade-consistency/02-*.yaml $(SED) -i "s/$(CURRENT_VERSION)/$(NEXT_VER)/g" e2e-tests/tests/upgrade-consistency/03-*.yaml e2e-tests/tests/init-deploy/05-assert.yaml \ No newline at end of file diff --git a/config/crd/patches/versionlabel_in_perconapgbackups.yaml b/config/crd/patches/versionlabel_in_perconapgbackups.yaml index d4c5958860..3c32866138 100644 --- a/config/crd/patches/versionlabel_in_perconapgbackups.yaml +++ b/config/crd/patches/versionlabel_in_perconapgbackups.yaml @@ -3,4 +3,4 @@ kind: CustomResourceDefinition metadata: name: perconapgbackups.pgv2.percona.com labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 diff --git a/config/crd/patches/versionlabel_in_perconapgclusters.yaml b/config/crd/patches/versionlabel_in_perconapgclusters.yaml index 9ee2cce213..8a4bf1231a 100644 --- a/config/crd/patches/versionlabel_in_perconapgclusters.yaml +++ b/config/crd/patches/versionlabel_in_perconapgclusters.yaml @@ -3,4 +3,4 @@ kind: CustomResourceDefinition metadata: name: perconapgclusters.pgv2.percona.com labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 diff --git a/config/crd/patches/versionlabel_in_perconapgrestores.yaml b/config/crd/patches/versionlabel_in_perconapgrestores.yaml index 9d4796443f..b9c11c6953 100644 --- a/config/crd/patches/versionlabel_in_perconapgrestores.yaml +++ b/config/crd/patches/versionlabel_in_perconapgrestores.yaml @@ -3,4 +3,4 @@ kind: CustomResourceDefinition metadata: name: perconapgrestores.pgv2.percona.com labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 diff --git a/config/crd/patches/versionlabel_in_perconapgupgrade.yaml b/config/crd/patches/versionlabel_in_perconapgupgrade.yaml index 75d0fce2bb..0becb36acf 100644 --- a/config/crd/patches/versionlabel_in_perconapgupgrade.yaml +++ b/config/crd/patches/versionlabel_in_perconapgupgrade.yaml @@ -3,4 +3,4 @@ kind: CustomResourceDefinition metadata: name: perconapgupgrades.pgv2.percona.com labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index e93e6e85ad..fa440143fd 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -297,7 +297,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgbackups.pgv2.percona.com spec: group: pgv2.percona.com @@ -705,7 +705,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgclusters.pgv2.percona.com spec: group: pgv2.percona.com @@ -22109,7 +22109,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgrestores.pgv2.percona.com spec: group: pgv2.percona.com @@ -22209,7 +22209,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgupgrades.pgv2.percona.com spec: group: pgv2.percona.com diff --git a/deploy/cr.yaml b/deploy/cr.yaml index e055bc6f38..bdd17d33fb 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -9,7 +9,7 @@ metadata: # - percona.com/delete-ssl # - percona.com/delete-backups spec: - crVersion: 2.8.0 + crVersion: 2.9.0 # initContainer: # image: docker.io/perconalab/percona-postgresql-operator:main # resources: diff --git a/deploy/crd.yaml b/deploy/crd.yaml index be4cee1441..b0bf292f26 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -297,7 +297,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgbackups.pgv2.percona.com spec: group: pgv2.percona.com @@ -705,7 +705,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgclusters.pgv2.percona.com spec: group: pgv2.percona.com @@ -22109,7 +22109,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgrestores.pgv2.percona.com spec: group: pgv2.percona.com @@ -22209,7 +22209,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgupgrades.pgv2.percona.com spec: group: pgv2.percona.com diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 669b9940ec..5e19e282f1 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -297,7 +297,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgbackups.pgv2.percona.com spec: group: pgv2.percona.com @@ -705,7 +705,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgclusters.pgv2.percona.com spec: group: pgv2.percona.com @@ -22109,7 +22109,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgrestores.pgv2.percona.com spec: group: pgv2.percona.com @@ -22209,7 +22209,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 labels: - pgv2.percona.com/version: v2.8.0 + pgv2.percona.com/version: v2.9.0 name: perconapgupgrades.pgv2.percona.com spec: group: pgv2.percona.com diff --git a/e2e-tests/functions b/e2e-tests/functions index a2cd3b3651..6b2a23167e 100644 --- a/e2e-tests/functions +++ b/e2e-tests/functions @@ -2,7 +2,7 @@ # set root repo relatively to a test dir ROOT_REPO=${ROOT_REPO:-$(realpath ../../..)} -CERT_MANAGER_VER="1.18.2" +CERT_MANAGER_VER="1.19.1" test_name=$(basename "$(pwd)") source "${ROOT_REPO}/e2e-tests/vars.sh" @@ -495,6 +495,18 @@ get_service_ip() { kubectl get service/$service -n "${NAMESPACE}" -o 'jsonpath={.status.loadBalancer.ingress[].hostname}' } +get_version_images() { + local cr_version="$1" + local component="$2" + local release_versions_file="${TEMP_DIR}/release_version_${cr_version}" + + if [[ ! -f $release_versions_file ]]; then + curl -s "https://raw.githubusercontent.com/percona/percona-postgresql-operator/refs/tags/v${cr_version}/e2e-tests/release_versions" >$release_versions_file + fi + + grep -i ${component} $release_versions_file | cut -d'=' -f2 +} + wait_for_delete() { local res="$1" @@ -1114,7 +1126,11 @@ get_container_image() { operatorVersion=main fi - echo "${IMAGE_BASE}:${operatorVersion}-ppg${pgVersion}-${component}" + if [[ $component == 'pgbouncer' || $component == 'pgbackrest' ]]; then + echo "${IMAGE_BASE}:${operatorVersion}-${component}${pgVersion}" + else + echo "${IMAGE_BASE}:${operatorVersion}-ppg${pgVersion}-${component}" + fi } get_postgresql_logs() { diff --git a/e2e-tests/release_versions b/e2e-tests/release_versions index 4e7b46b824..a425622447 100644 --- a/e2e-tests/release_versions +++ b/e2e-tests/release_versions @@ -1,45 +1,46 @@ # Images versions -IMAGE_OPERATOR=percona/percona-postgresql-operator:2.7.0 +IMAGE_OPERATOR=percona/percona-postgresql-operator:2.8.0 -IMAGE_POSTGRESQL17=percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres -IMAGE_PGBOUNCER17=percona/percona-pgbouncer:1.24.1 -IMAGE_POSTGIS17=percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres-gis3.3.8 -IMAGE_BACKREST17=percona/percona-pgbackrest:2.55.0 +IMAGE_POSTGRESQL17=percona/percona-distribution-postgresql:17.6-1 +IMAGE_PGBOUNCER17=percona/percona-pgbouncer:1.24.1-1 +IMAGE_POSTGIS17=percona/percona-postgresql-operator:2.8.0-ppg17.6-postgres-gis3.3.8 +IMAGE_BACKREST17=percona/percona-pgbackrest:2.56.0-1 -IMAGE_POSTGRESQL16=percona/percona-postgresql-operator:2.7.0-ppg16.9-postgres -IMAGE_PGBOUNCER16=percona/percona-pgbouncer:1.24.1 -IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.7.0-ppg16.9-postgres-gis3.3.8 -IMAGE_BACKREST16=percona/percona-pgbackrest:2.55.0 +IMAGE_POSTGRESQL16=percona/percona-distribution-postgresql:16.10-1 +IMAGE_PGBOUNCER16=percona/percona-pgbouncer:1.24.1-1 +IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.8.0-ppg16.10-postgres-gis3.3.8 +IMAGE_BACKREST16=percona/percona-pgbackrest:2.56.0-1 -IMAGE_POSTGRESQL15=percona/percona-postgresql-operator:2.7.0-ppg15.13-postgres -IMAGE_PGBOUNCER15=percona/percona-pgbouncer:1.24.1 -IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.7.0-ppg15.13-postgres-gis3.3.8 -IMAGE_BACKREST15=percona/percona-pgbackrest:2.55.0 +IMAGE_POSTGRESQL15=percona/percona-distribution-postgresql:15.14-1 +IMAGE_PGBOUNCER15=percona/percona-pgbouncer:1.24.1-1 +IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.8.0-ppg15.14-postgres-gis3.3.8 +IMAGE_BACKREST15=percona/percona-pgbackrest:2.56.0-1 -IMAGE_POSTGRESQL14=percona/percona-postgresql-operator:2.7.0-ppg14.18-postgres -IMAGE_PGBOUNCER14=percona/percona-pgbouncer:1.24.1 -IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.7.0-ppg14.18-postgres-gis3.3.8 -IMAGE_BACKREST14=percona/percona-pgbackrest:2.55.0 +IMAGE_POSTGRESQL14=percona/percona-distribution-postgresql:14.19-1 +IMAGE_PGBOUNCER14=percona/percona-pgbouncer:1.24.1-1 +IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.8.0-ppg14.19-postgres-gis3.3.8 +IMAGE_BACKREST14=percona/percona-pgbackrest:2.56.0-1 -IMAGE_POSTGRESQL13=percona/percona-postgresql-operator:2.7.0-ppg13.21-postgres -IMAGE_PGBOUNCER13=percona/percona-pgbouncer:1.24.1 -IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.7.0-ppg13.21-postgres-gis3.3.8 -IMAGE_BACKREST13=percona/percona-pgbackrest:2.55.0 +IMAGE_POSTGRESQL13=percona/percona-distribution-postgresql:13.22-1 +IMAGE_PGBOUNCER13=percona/percona-pgbouncer:1.24.1-1 +IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.8.0-ppg13.22-postgres-gis3.3.8 +IMAGE_BACKREST13=percona/percona-pgbackrest:2.56.0-1 -IMAGE_UPGRADE=percona/percona-postgresql-operator:2.7.0-upgrade +IMAGE_UPGRADE=percona/percona-postgresql-operator:2.8.0-upgrade -IMAGE_PMM_CLIENT=percona/pmm-client:2.44.1 +IMAGE_PMM_CLIENT=percona/pmm-client:2.44.1-1 IMAGE_PMM_SERVER=percona/pmm-server:2.44.1 -IMAGE_PMM3_CLIENT=percona/pmm-client:3.3.0 -IMAGE_PMM3_SERVER=percona/pmm-server:3.3.0 +IMAGE_PMM3_CLIENT=percona/pmm-client:3.4.1 +IMAGE_PMM3_SERVER=percona/pmm-server:3.4.1 # Supported k8s versions -GKE_MIN=1.30 -GKE_MAX=1.32 -EKS_MIN=1.30 -EKS_MAX=1.33 -AKS_MIN=1.30 -AKS_MAX=1.32 -OPENSHIFT_MIN=4.15.53 -OPENSHIFT_MAX=4.19.2 -MINIKUBE_MAX=1.33.1 \ No newline at end of file +GKE_MIN=1.31 +GKE_MAX=1.33 +EKS_MIN=1.31 +EKS_MAX=1.34 +AKS_MIN=1.32 +AKS_MAX=1.34 +OPENSHIFT_MIN=4.16.51 +OPENSHIFT_MAX=4.20.2 +# MINIKUBE_MAX = k8s version in MINIKUBE +MINIKUBE_MAX=1.34.0 \ No newline at end of file diff --git a/e2e-tests/run-release.csv b/e2e-tests/run-release.csv index 358ce44987..5a53e2617b 100644 --- a/e2e-tests/run-release.csv +++ b/e2e-tests/run-release.csv @@ -6,6 +6,7 @@ database-init-sql demand-backup finalizers init-deploy +major-upgrade monitoring monitoring-pmm3 one-pod diff --git a/e2e-tests/tests/custom-envs/01-assert.yaml b/e2e-tests/tests/custom-envs/01-assert.yaml index 9f767a78f3..cc0e97651f 100644 --- a/e2e-tests/tests/custom-envs/01-assert.yaml +++ b/e2e-tests/tests/custom-envs/01-assert.yaml @@ -1,6 +1,6 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert -timeout: 120 +timeout: 240 --- kind: StatefulSet apiVersion: apps/v1 diff --git a/e2e-tests/tests/init-deploy/05-assert.yaml b/e2e-tests/tests/init-deploy/05-assert.yaml index 246ab59daf..86b1aa02c3 100644 --- a/e2e-tests/tests/init-deploy/05-assert.yaml +++ b/e2e-tests/tests/init-deploy/05-assert.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 2.8.0 + pgv2.percona.com/version: 2.9.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/pgbackrest: "" postgres-operator.crunchydata.com/pgbackrest-config: "" @@ -81,7 +81,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 2.8.0 + pgv2.percona.com/version: 2.9.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/role: pgbouncer test-label: test @@ -144,7 +144,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 2.8.0 + pgv2.percona.com/version: 2.9.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/pgbackrest: "" postgres-operator.crunchydata.com/pgbackrest-config: "" @@ -168,7 +168,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 2.8.0 + pgv2.percona.com/version: 2.9.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/role: pgbouncer test-label: test @@ -191,7 +191,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 2.8.0 + pgv2.percona.com/version: 2.9.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/data: pgbackrest postgres-operator.crunchydata.com/pgbackrest: "" @@ -214,7 +214,7 @@ spec: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 2.8.0 + pgv2.percona.com/version: 2.9.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/data: pgbackrest postgres-operator.crunchydata.com/pgbackrest: "" diff --git a/e2e-tests/tests/major-upgrade/01-create-cluster.yaml b/e2e-tests/tests/major-upgrade/01-create-cluster.yaml index 729fbcc51f..ad23c41e3d 100644 --- a/e2e-tests/tests/major-upgrade/01-create-cluster.yaml +++ b/e2e-tests/tests/major-upgrade/01-create-cluster.yaml @@ -10,11 +10,11 @@ commands: get_cr \ | yq eval ' - .spec.postgresVersion = 12 | - .spec.image = "perconalab/percona-postgresql-operator:main-ppg12-postgres" | + .spec.postgresVersion = 13 | + .spec.image = "perconalab/percona-postgresql-operator:main-ppg13-postgres" | .spec.instances[0].dataVolumeClaimSpec.resources.requests.storage = "3Gi" | - .spec.proxy.pgBouncer.image = "perconalab/percona-postgresql-operator:main-ppg12-pgbouncer" | - .spec.backups.pgbackrest.image = "perconalab/percona-postgresql-operator:main-ppg12-pgbackrest" | + .spec.proxy.pgBouncer.image = "perconalab/percona-postgresql-operator:main-pgbouncer13" | + .spec.backups.pgbackrest.image = "perconalab/percona-postgresql-operator:main-pgbackrest13" | .spec.patroni.dynamicConfiguration.postgresql.parameters.shared_preload_libraries = "pg_cron" | .spec.extensions.custom += [{"name": "pg_cron", "version": "1.6.1"}]' \ | kubectl -n "${NAMESPACE}" apply -f - diff --git a/e2e-tests/tests/major-upgrade/20-13-to-14.yaml b/e2e-tests/tests/major-upgrade/04-13-to-14.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/20-13-to-14.yaml rename to e2e-tests/tests/major-upgrade/04-13-to-14.yaml diff --git a/e2e-tests/tests/major-upgrade/30-assert.yaml b/e2e-tests/tests/major-upgrade/04-assert.yaml similarity index 90% rename from e2e-tests/tests/major-upgrade/30-assert.yaml rename to e2e-tests/tests/major-upgrade/04-assert.yaml index b871b4faf8..23d3a30f61 100644 --- a/e2e-tests/tests/major-upgrade/30-assert.yaml +++ b/e2e-tests/tests/major-upgrade/04-assert.yaml @@ -11,7 +11,7 @@ kind: PerconaPGCluster metadata: name: major-upgrade spec: - postgresVersion: 15 + postgresVersion: 14 status: pgbouncer: ready: 3 @@ -32,7 +32,7 @@ metadata: postgres-operator.crunchydata.com/cluster: major-upgrade postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-backup: replica-create - postgres-operator.crunchydata.com/pgbackrest-repo: repo3 + postgres-operator.crunchydata.com/pgbackrest-repo: repo1 ownerReferences: - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup diff --git a/e2e-tests/tests/major-upgrade/46-assert.yaml b/e2e-tests/tests/major-upgrade/05-assert.yaml similarity index 96% rename from e2e-tests/tests/major-upgrade/46-assert.yaml rename to e2e-tests/tests/major-upgrade/05-assert.yaml index 1b95780c8f..47ccba03b5 100644 --- a/e2e-tests/tests/major-upgrade/46-assert.yaml +++ b/e2e-tests/tests/major-upgrade/05-assert.yaml @@ -16,6 +16,6 @@ status: pgbackrest: repos: - bound: true - name: repo1 + name: repo2 replicaCreateBackupComplete: true stanzaCreated: true diff --git a/e2e-tests/tests/major-upgrade/11-change-repo.yaml b/e2e-tests/tests/major-upgrade/05-change-repo.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/11-change-repo.yaml rename to e2e-tests/tests/major-upgrade/05-change-repo.yaml diff --git a/e2e-tests/tests/major-upgrade/22-assert.yaml b/e2e-tests/tests/major-upgrade/06-assert.yaml similarity index 88% rename from e2e-tests/tests/major-upgrade/22-assert.yaml rename to e2e-tests/tests/major-upgrade/06-assert.yaml index 7a2f6c1c0f..605465e35a 100644 --- a/e2e-tests/tests/major-upgrade/22-assert.yaml +++ b/e2e-tests/tests/major-upgrade/06-assert.yaml @@ -9,7 +9,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-13-to-14 labels: postgres-operator.crunchydata.com/pgbackrest-backup: manual - postgres-operator.crunchydata.com/pgbackrest-repo: repo3 + postgres-operator.crunchydata.com/pgbackrest-repo: repo2 ownerReferences: - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup @@ -24,7 +24,7 @@ metadata: name: backup-after-13-to-14 spec: pgCluster: major-upgrade - repoName: repo3 + repoName: repo2 options: - --type=full status: diff --git a/e2e-tests/tests/major-upgrade/22-run-backup.yaml b/e2e-tests/tests/major-upgrade/06-run-backup.yaml similarity index 89% rename from e2e-tests/tests/major-upgrade/22-run-backup.yaml rename to e2e-tests/tests/major-upgrade/06-run-backup.yaml index a7a1050c53..aaf7d5a7c4 100644 --- a/e2e-tests/tests/major-upgrade/22-run-backup.yaml +++ b/e2e-tests/tests/major-upgrade/06-run-backup.yaml @@ -4,6 +4,6 @@ metadata: name: backup-after-13-to-14 spec: pgCluster: major-upgrade - repoName: repo3 + repoName: repo2 options: - --type=full diff --git a/e2e-tests/tests/major-upgrade/24-assert.yaml b/e2e-tests/tests/major-upgrade/07-assert.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/24-assert.yaml rename to e2e-tests/tests/major-upgrade/07-assert.yaml diff --git a/e2e-tests/tests/major-upgrade/24-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/07-read-from-primary.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/24-read-from-primary.yaml rename to e2e-tests/tests/major-upgrade/07-read-from-primary.yaml diff --git a/e2e-tests/tests/major-upgrade/30-14-to-15.yaml b/e2e-tests/tests/major-upgrade/08-14-to-15.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/30-14-to-15.yaml rename to e2e-tests/tests/major-upgrade/08-14-to-15.yaml diff --git a/e2e-tests/tests/major-upgrade/20-assert.yaml b/e2e-tests/tests/major-upgrade/08-assert.yaml similarity index 97% rename from e2e-tests/tests/major-upgrade/20-assert.yaml rename to e2e-tests/tests/major-upgrade/08-assert.yaml index c506a745f5..c00e35e2ae 100644 --- a/e2e-tests/tests/major-upgrade/20-assert.yaml +++ b/e2e-tests/tests/major-upgrade/08-assert.yaml @@ -11,7 +11,7 @@ kind: PerconaPGCluster metadata: name: major-upgrade spec: - postgresVersion: 14 + postgresVersion: 15 status: pgbouncer: ready: 3 diff --git a/e2e-tests/tests/major-upgrade/21-assert.yaml b/e2e-tests/tests/major-upgrade/09-assert.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/21-assert.yaml rename to e2e-tests/tests/major-upgrade/09-assert.yaml diff --git a/e2e-tests/tests/major-upgrade/21-change-repo.yaml b/e2e-tests/tests/major-upgrade/09-change-repo.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/21-change-repo.yaml rename to e2e-tests/tests/major-upgrade/09-change-repo.yaml diff --git a/e2e-tests/tests/major-upgrade/10-12-to-13.yaml b/e2e-tests/tests/major-upgrade/10-12-to-13.yaml deleted file mode 100644 index 96a7fe9207..0000000000 --- a/e2e-tests/tests/major-upgrade/10-12-to-13.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: |- - set -o errexit - set -o xtrace - - source ../../functions - - kubectl apply -n ${NAMESPACE} -f - <<-EOF - apiVersion: pgv2.percona.com/v2 - kind: PerconaPGUpgrade - metadata: - name: 12-to-13 - spec: - postgresClusterName: major-upgrade - image: ${IMAGE_UPGRADE} - fromPostgresVersion: 12 - toPostgresVersion: 13 - toPostgresImage: $(get_container_image "postgres" 13) - toPgBouncerImage: $(get_container_image "pgbouncer" 13) - toPgBackRestImage: $(get_container_image "pgbackrest" 13) - EOF - diff --git a/e2e-tests/tests/major-upgrade/10-assert.yaml b/e2e-tests/tests/major-upgrade/10-assert.yaml index ae8dcb18f8..4a603ba7e9 100644 --- a/e2e-tests/tests/major-upgrade/10-assert.yaml +++ b/e2e-tests/tests/major-upgrade/10-assert.yaml @@ -1,38 +1,15 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert -timeout: 360 -commands: -- script: |- - kubectl -n ${NAMESPACE} get pg,pod,job - sleep 5 ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGCluster -metadata: - name: major-upgrade -spec: - postgresVersion: 13 -status: - pgbouncer: - ready: 3 - size: 3 - postgres: - instances: - - name: instance1 - ready: 3 - size: 3 - ready: 3 - size: 3 - state: ready +timeout: 660 --- kind: Job apiVersion: batch/v1 metadata: + annotations: + postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-14-to-15 labels: - postgres-operator.crunchydata.com/cluster: major-upgrade - postgres-operator.crunchydata.com/pgbackrest: '' - postgres-operator.crunchydata.com/pgbackrest-backup: replica-create - postgres-operator.crunchydata.com/pgbackrest-repo: repo1 + postgres-operator.crunchydata.com/pgbackrest-backup: manual + postgres-operator.crunchydata.com/pgbackrest-repo: repo3 ownerReferences: - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup @@ -40,3 +17,15 @@ metadata: blockOwnerDeletion: true status: succeeded: 1 +--- +apiVersion: pgv2.percona.com/v2 +kind: PerconaPGBackup +metadata: + name: backup-after-14-to-15 +spec: + pgCluster: major-upgrade + repoName: repo3 + options: + - --type=full +status: + state: Succeeded diff --git a/e2e-tests/tests/major-upgrade/32-run-backup.yaml b/e2e-tests/tests/major-upgrade/10-run-backup.yaml similarity index 89% rename from e2e-tests/tests/major-upgrade/32-run-backup.yaml rename to e2e-tests/tests/major-upgrade/10-run-backup.yaml index 792209c20c..047e0b5571 100644 --- a/e2e-tests/tests/major-upgrade/32-run-backup.yaml +++ b/e2e-tests/tests/major-upgrade/10-run-backup.yaml @@ -4,6 +4,6 @@ metadata: name: backup-after-14-to-15 spec: pgCluster: major-upgrade - repoName: repo4 + repoName: repo3 options: - --type=full diff --git a/e2e-tests/tests/major-upgrade/11-assert.yaml b/e2e-tests/tests/major-upgrade/11-assert.yaml index 47ccba03b5..95d57c293f 100644 --- a/e2e-tests/tests/major-upgrade/11-assert.yaml +++ b/e2e-tests/tests/major-upgrade/11-assert.yaml @@ -1,21 +1,10 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert -timeout: 660 -commands: -- script: |- - kubectl get postgrescluster major-upgrade \ - -n ${NAMESPACE} \ - -o yaml \ - | yq eval '.status.pgbackrest.repos' - +timeout: 30 --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 -kind: PostgresCluster +kind: ConfigMap +apiVersion: v1 metadata: - name: major-upgrade -status: - pgbackrest: - repos: - - bound: true - name: repo2 - replicaCreateBackupComplete: true - stanzaCreated: true + name: 11-read-from-primary +data: + data: ' 100500' diff --git a/e2e-tests/tests/major-upgrade/44-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/11-read-from-primary.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/44-read-from-primary.yaml rename to e2e-tests/tests/major-upgrade/11-read-from-primary.yaml diff --git a/e2e-tests/tests/major-upgrade/40-15-to-16.yaml b/e2e-tests/tests/major-upgrade/12-15-to-16.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/40-15-to-16.yaml rename to e2e-tests/tests/major-upgrade/12-15-to-16.yaml diff --git a/e2e-tests/tests/major-upgrade/12-assert.yaml b/e2e-tests/tests/major-upgrade/12-assert.yaml index d1790eabf5..8cd5dbcad3 100644 --- a/e2e-tests/tests/major-upgrade/12-assert.yaml +++ b/e2e-tests/tests/major-upgrade/12-assert.yaml @@ -1,15 +1,38 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert -timeout: 660 +timeout: 360 +commands: +- script: |- + kubectl -n ${NAMESPACE} get pg,pod,job + sleep 5 +--- +apiVersion: pgv2.percona.com/v2 +kind: PerconaPGCluster +metadata: + name: major-upgrade +spec: + postgresVersion: 16 +status: + pgbouncer: + ready: 3 + size: 3 + postgres: + instances: + - name: instance1 + ready: 3 + size: 3 + ready: 3 + size: 3 + state: ready --- kind: Job apiVersion: batch/v1 metadata: - annotations: - postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-12-to-13 labels: - postgres-operator.crunchydata.com/pgbackrest-backup: manual - postgres-operator.crunchydata.com/pgbackrest-repo: repo2 + postgres-operator.crunchydata.com/cluster: major-upgrade + postgres-operator.crunchydata.com/pgbackrest: '' + postgres-operator.crunchydata.com/pgbackrest-backup: replica-create + postgres-operator.crunchydata.com/pgbackrest-repo: repo3 ownerReferences: - apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup @@ -17,15 +40,3 @@ metadata: blockOwnerDeletion: true status: succeeded: 1 ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGBackup -metadata: - name: backup-after-12-to-13 -spec: - pgCluster: major-upgrade - repoName: repo2 - options: - - --type=full -status: - state: Succeeded diff --git a/e2e-tests/tests/major-upgrade/12-run-backup.yaml b/e2e-tests/tests/major-upgrade/12-run-backup.yaml deleted file mode 100644 index 601008d4ca..0000000000 --- a/e2e-tests/tests/major-upgrade/12-run-backup.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGBackup -metadata: - name: backup-after-12-to-13 -spec: - pgCluster: major-upgrade - repoName: repo2 - options: - - --type=full diff --git a/e2e-tests/tests/major-upgrade/13-assert.yaml b/e2e-tests/tests/major-upgrade/13-assert.yaml index 2d05bb7d88..6af985e4b7 100644 --- a/e2e-tests/tests/major-upgrade/13-assert.yaml +++ b/e2e-tests/tests/major-upgrade/13-assert.yaml @@ -1,52 +1,21 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert -timeout: 720 +timeout: 660 commands: - script: |- - set -o errexit - - kubectl -n ${NAMESPACE} get pod - - for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do - phase=$(kubectl -n ${NAMESPACE} get pod/${pod} -o jsonpath={".status.phase"}) - if [[ "${phase}" != "Running" ]]; then - echo "Waiting for ${pod} to start running" - continue - fi - echo "PostgreSQL logs from ${pod}:" - echo "find /pgdata/pg13/log -type f -iname 'postgresql*.log' -exec tail -n 30 {} \;" \ - | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null - done - - sleep 30 -collectors: -- type: pod - selector: "postgres-operator.crunchydata.com/data=postgres" - tail: 30 + kubectl get postgrescluster major-upgrade \ + -n ${NAMESPACE} \ + -o yaml \ + | yq eval '.status.pgbackrest.repos' - --- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGRestore -metadata: - name: restore-after-12-to-13 -spec: - pgCluster: major-upgrade - repoName: repo2 -status: - state: Succeeded ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGCluster +apiVersion: postgres-operator.crunchydata.com/v1beta1 +kind: PostgresCluster metadata: name: major-upgrade status: - pgbouncer: - ready: 3 - size: 3 - postgres: - instances: - - name: instance1 - ready: 3 - size: 3 - ready: 3 - size: 3 - state: ready + pgbackrest: + repos: + - bound: true + name: repo4 + replicaCreateBackupComplete: true + stanzaCreated: true diff --git a/e2e-tests/tests/major-upgrade/31-change-repo.yaml b/e2e-tests/tests/major-upgrade/13-change-repo.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/31-change-repo.yaml rename to e2e-tests/tests/major-upgrade/13-change-repo.yaml diff --git a/e2e-tests/tests/major-upgrade/13-run-restore.yaml b/e2e-tests/tests/major-upgrade/13-run-restore.yaml deleted file mode 100644 index bba96fe985..0000000000 --- a/e2e-tests/tests/major-upgrade/13-run-restore.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGRestore -metadata: - name: restore-after-12-to-13 -spec: - pgCluster: major-upgrade - repoName: repo2 diff --git a/e2e-tests/tests/major-upgrade/14-assert.yaml b/e2e-tests/tests/major-upgrade/14-assert.yaml index 7c65443fbe..55610fcd16 100644 --- a/e2e-tests/tests/major-upgrade/14-assert.yaml +++ b/e2e-tests/tests/major-upgrade/14-assert.yaml @@ -1,10 +1,31 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert -timeout: 30 +timeout: 660 --- -kind: ConfigMap -apiVersion: v1 +kind: Job +apiVersion: batch/v1 metadata: - name: 05-read-from-primary -data: - data: ' 100500' + annotations: + postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-15-to-16 + labels: + postgres-operator.crunchydata.com/pgbackrest-backup: manual + postgres-operator.crunchydata.com/pgbackrest-repo: repo4 + ownerReferences: + - apiVersion: pgv2.percona.com/v2 + kind: PerconaPGBackup + controller: true + blockOwnerDeletion: true +status: + succeeded: 1 +--- +apiVersion: pgv2.percona.com/v2 +kind: PerconaPGBackup +metadata: + name: backup-after-15-to-16 +spec: + pgCluster: major-upgrade + repoName: repo4 + options: + - --type=full +status: + state: Succeeded diff --git a/e2e-tests/tests/major-upgrade/14-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/14-read-from-primary.yaml deleted file mode 100644 index ac80bb337c..0000000000 --- a/e2e-tests/tests/major-upgrade/14-read-from-primary.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -timeout: 30 -commands: - - script: |- - set -o errexit - set -o xtrace - - source ../../functions - data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)") - - kubectl create configmap -n "${NAMESPACE}" 05-read-from-primary --from-literal=data="${data}" diff --git a/e2e-tests/tests/major-upgrade/42-run-backup.yaml b/e2e-tests/tests/major-upgrade/14-run-backup.yaml similarity index 89% rename from e2e-tests/tests/major-upgrade/42-run-backup.yaml rename to e2e-tests/tests/major-upgrade/14-run-backup.yaml index 3e4fe9c94c..adc6c49ed2 100644 --- a/e2e-tests/tests/major-upgrade/42-run-backup.yaml +++ b/e2e-tests/tests/major-upgrade/14-run-backup.yaml @@ -4,6 +4,6 @@ metadata: name: backup-after-15-to-16 spec: pgCluster: major-upgrade - repoName: repo1 + repoName: repo4 options: - --type=full diff --git a/e2e-tests/tests/major-upgrade/44-assert.yaml b/e2e-tests/tests/major-upgrade/15-assert.yaml similarity index 81% rename from e2e-tests/tests/major-upgrade/44-assert.yaml rename to e2e-tests/tests/major-upgrade/15-assert.yaml index 95d57c293f..3590bbe99a 100644 --- a/e2e-tests/tests/major-upgrade/44-assert.yaml +++ b/e2e-tests/tests/major-upgrade/15-assert.yaml @@ -5,6 +5,6 @@ timeout: 30 kind: ConfigMap apiVersion: v1 metadata: - name: 11-read-from-primary + name: 15-read-from-primary data: data: ' 100500' diff --git a/e2e-tests/tests/major-upgrade/34-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/15-read-from-primary.yaml similarity index 85% rename from e2e-tests/tests/major-upgrade/34-read-from-primary.yaml rename to e2e-tests/tests/major-upgrade/15-read-from-primary.yaml index 12ff6f8d79..23a10ac997 100644 --- a/e2e-tests/tests/major-upgrade/34-read-from-primary.yaml +++ b/e2e-tests/tests/major-upgrade/15-read-from-primary.yaml @@ -9,4 +9,4 @@ commands: source ../../functions data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)") - kubectl create configmap -n "${NAMESPACE}" 09-read-from-primary --from-literal=data="${data}" \ No newline at end of file + kubectl create configmap -n "${NAMESPACE}" 15-read-from-primary --from-literal=data="${data}" \ No newline at end of file diff --git a/e2e-tests/tests/major-upgrade/45-16-to-17.yaml b/e2e-tests/tests/major-upgrade/16-16-to-17.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/45-16-to-17.yaml rename to e2e-tests/tests/major-upgrade/16-16-to-17.yaml diff --git a/e2e-tests/tests/major-upgrade/45-assert.yaml b/e2e-tests/tests/major-upgrade/16-assert.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/45-assert.yaml rename to e2e-tests/tests/major-upgrade/16-assert.yaml diff --git a/e2e-tests/tests/major-upgrade/31-assert.yaml b/e2e-tests/tests/major-upgrade/17-assert.yaml similarity index 100% rename from e2e-tests/tests/major-upgrade/31-assert.yaml rename to e2e-tests/tests/major-upgrade/17-assert.yaml diff --git a/e2e-tests/tests/major-upgrade/32-assert.yaml b/e2e-tests/tests/major-upgrade/18-assert.yaml similarity index 93% rename from e2e-tests/tests/major-upgrade/32-assert.yaml rename to e2e-tests/tests/major-upgrade/18-assert.yaml index 75daf8364c..0bc5ed7dcc 100644 --- a/e2e-tests/tests/major-upgrade/32-assert.yaml +++ b/e2e-tests/tests/major-upgrade/18-assert.yaml @@ -6,7 +6,7 @@ kind: Job apiVersion: batch/v1 metadata: annotations: - postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-14-to-15 + postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-16-to-17 labels: postgres-operator.crunchydata.com/pgbackrest-backup: manual postgres-operator.crunchydata.com/pgbackrest-repo: repo4 @@ -21,7 +21,7 @@ status: apiVersion: pgv2.percona.com/v2 kind: PerconaPGBackup metadata: - name: backup-after-14-to-15 + name: backup-after-16-to-17 spec: pgCluster: major-upgrade repoName: repo4 diff --git a/e2e-tests/tests/major-upgrade/47-run-backup.yaml b/e2e-tests/tests/major-upgrade/18-run-backup.yaml similarity index 89% rename from e2e-tests/tests/major-upgrade/47-run-backup.yaml rename to e2e-tests/tests/major-upgrade/18-run-backup.yaml index 392bc719ea..9a378656f4 100644 --- a/e2e-tests/tests/major-upgrade/47-run-backup.yaml +++ b/e2e-tests/tests/major-upgrade/18-run-backup.yaml @@ -4,6 +4,6 @@ metadata: name: backup-after-16-to-17 spec: pgCluster: major-upgrade - repoName: repo1 + repoName: repo4 options: - --type=full diff --git a/e2e-tests/tests/major-upgrade/34-assert.yaml b/e2e-tests/tests/major-upgrade/19-assert.yaml similarity index 81% rename from e2e-tests/tests/major-upgrade/34-assert.yaml rename to e2e-tests/tests/major-upgrade/19-assert.yaml index 7321c61abe..381403d405 100644 --- a/e2e-tests/tests/major-upgrade/34-assert.yaml +++ b/e2e-tests/tests/major-upgrade/19-assert.yaml @@ -5,6 +5,6 @@ timeout: 30 kind: ConfigMap apiVersion: v1 metadata: - name: 09-read-from-primary + name: 19-read-from-primary data: data: ' 100500' diff --git a/e2e-tests/tests/major-upgrade/49-read-from-primary.yaml b/e2e-tests/tests/major-upgrade/19-read-from-primary.yaml similarity index 85% rename from e2e-tests/tests/major-upgrade/49-read-from-primary.yaml rename to e2e-tests/tests/major-upgrade/19-read-from-primary.yaml index 03c7aa852b..f835a311f5 100644 --- a/e2e-tests/tests/major-upgrade/49-read-from-primary.yaml +++ b/e2e-tests/tests/major-upgrade/19-read-from-primary.yaml @@ -9,4 +9,4 @@ commands: source ../../functions data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)") - kubectl create configmap -n "${NAMESPACE}" 11-read-from-primary --from-literal=data="${data}" + kubectl create configmap -n "${NAMESPACE}" 19-read-from-primary --from-literal=data="${data}" diff --git a/e2e-tests/tests/major-upgrade/23-assert.yaml b/e2e-tests/tests/major-upgrade/23-assert.yaml deleted file mode 100644 index 75b542e689..0000000000 --- a/e2e-tests/tests/major-upgrade/23-assert.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 720 -commands: -- script: |- - set -o errexit - - kubectl -n ${NAMESPACE} get pod - - for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do - phase=$(kubectl -n ${NAMESPACE} get pod/${pod} -o jsonpath={".status.phase"}) - if [[ "${phase}" != "Running" ]]; then - echo "Waiting for ${pod} to start running" - continue - fi - echo "PostgreSQL logs from ${pod}:" - echo "find /pgdata/pg14/log -type f -iname 'postgresql*.log' -exec tail -n 30 {} \;" \ - | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null - done - - sleep 30 -collectors: -- type: pod - selector: "postgres-operator.crunchydata.com/data=postgres" - tail: 30 ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGRestore -metadata: - name: restore-after-13-to-14 -spec: - pgCluster: major-upgrade - repoName: repo3 -status: - state: Succeeded ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGCluster -metadata: - name: major-upgrade -status: - pgbouncer: - ready: 3 - size: 3 - postgres: - instances: - - name: instance1 - ready: 3 - size: 3 - ready: 3 - size: 3 - state: ready diff --git a/e2e-tests/tests/major-upgrade/23-run-restore.yaml b/e2e-tests/tests/major-upgrade/23-run-restore.yaml deleted file mode 100644 index 079ebf7b77..0000000000 --- a/e2e-tests/tests/major-upgrade/23-run-restore.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGRestore -metadata: - name: restore-after-13-to-14 -spec: - pgCluster: major-upgrade - repoName: repo3 diff --git a/e2e-tests/tests/major-upgrade/33-assert.yaml b/e2e-tests/tests/major-upgrade/33-assert.yaml deleted file mode 100644 index 1d3a8a9aae..0000000000 --- a/e2e-tests/tests/major-upgrade/33-assert.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 720 -commands: -- script: |- - set -o errexit - - kubectl -n ${NAMESPACE} get pod - - for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do - phase=$(kubectl -n ${NAMESPACE} get pod/${pod} -o jsonpath={".status.phase"}) - if [[ "${phase}" != "Running" ]]; then - echo "Waiting for ${pod} to start running" - continue - fi - echo "PostgreSQL logs from ${pod}:" - echo "find /pgdata/pg15/log -type f -iname 'postgresql*.log' -exec tail -n 30 {} \;" \ - | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null - done - - sleep 30 -collectors: -- type: pod - selector: "postgres-operator.crunchydata.com/data=postgres" - tail: 30 ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGRestore -metadata: - name: restore-after-14-to-15 -spec: - pgCluster: major-upgrade - repoName: repo4 -status: - state: Succeeded ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGCluster -metadata: - name: major-upgrade -status: - pgbouncer: - ready: 3 - size: 3 - postgres: - instances: - - name: instance1 - ready: 3 - size: 3 - ready: 3 - size: 3 - state: ready diff --git a/e2e-tests/tests/major-upgrade/33-run-restore.yaml b/e2e-tests/tests/major-upgrade/33-run-restore.yaml deleted file mode 100644 index 8e7c7c6dab..0000000000 --- a/e2e-tests/tests/major-upgrade/33-run-restore.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGRestore -metadata: - name: restore-after-14-to-15 -spec: - pgCluster: major-upgrade - repoName: repo4 - diff --git a/e2e-tests/tests/major-upgrade/40-assert.yaml b/e2e-tests/tests/major-upgrade/40-assert.yaml deleted file mode 100644 index de3a338c83..0000000000 --- a/e2e-tests/tests/major-upgrade/40-assert.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 360 -commands: -- script: |- - kubectl -n ${NAMESPACE} get pg,pod,job - sleep 5 ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGCluster -metadata: - name: major-upgrade -spec: - postgresVersion: 16 -status: - pgbouncer: - ready: 3 - size: 3 - postgres: - instances: - - name: instance1 - ready: 3 - size: 3 - ready: 3 - size: 3 - state: ready ---- -kind: Job -apiVersion: batch/v1 -metadata: - labels: - postgres-operator.crunchydata.com/cluster: major-upgrade - postgres-operator.crunchydata.com/pgbackrest: '' - postgres-operator.crunchydata.com/pgbackrest-backup: replica-create - postgres-operator.crunchydata.com/pgbackrest-repo: repo4 - ownerReferences: - - apiVersion: pgv2.percona.com/v2 - kind: PerconaPGBackup - controller: true - blockOwnerDeletion: true -status: - succeeded: 1 diff --git a/e2e-tests/tests/major-upgrade/41-assert.yaml b/e2e-tests/tests/major-upgrade/41-assert.yaml deleted file mode 100644 index 1b95780c8f..0000000000 --- a/e2e-tests/tests/major-upgrade/41-assert.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 660 -commands: -- script: |- - kubectl get postgrescluster major-upgrade \ - -n ${NAMESPACE} \ - -o yaml \ - | yq eval '.status.pgbackrest.repos' - ---- -apiVersion: postgres-operator.crunchydata.com/v1beta1 -kind: PostgresCluster -metadata: - name: major-upgrade -status: - pgbackrest: - repos: - - bound: true - name: repo1 - replicaCreateBackupComplete: true - stanzaCreated: true diff --git a/e2e-tests/tests/major-upgrade/41-change-repo.yaml b/e2e-tests/tests/major-upgrade/41-change-repo.yaml deleted file mode 100644 index d3d277599f..0000000000 --- a/e2e-tests/tests/major-upgrade/41-change-repo.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: |- - set -o errexit - set -o xtrace - - kubectl patch \ - -n $NAMESPACE \ - perconapgcluster major-upgrade \ - --type='json' \ - -p='[{"op": "replace", "path": "/spec/backups/pgbackrest/repos/0/name", "value": "repo1"}]' diff --git a/e2e-tests/tests/major-upgrade/42-assert.yaml b/e2e-tests/tests/major-upgrade/42-assert.yaml deleted file mode 100644 index 2b003b69a9..0000000000 --- a/e2e-tests/tests/major-upgrade/42-assert.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 660 ---- -kind: Job -apiVersion: batch/v1 -metadata: - annotations: - postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-15-to-16 - labels: - postgres-operator.crunchydata.com/pgbackrest-backup: manual - postgres-operator.crunchydata.com/pgbackrest-repo: repo1 - ownerReferences: - - apiVersion: pgv2.percona.com/v2 - kind: PerconaPGBackup - controller: true - blockOwnerDeletion: true -status: - succeeded: 1 ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGBackup -metadata: - name: backup-after-15-to-16 -spec: - pgCluster: major-upgrade - repoName: repo1 - options: - - --type=full -status: - state: Succeeded diff --git a/e2e-tests/tests/major-upgrade/43-assert.yaml b/e2e-tests/tests/major-upgrade/43-assert.yaml deleted file mode 100644 index 3114c23118..0000000000 --- a/e2e-tests/tests/major-upgrade/43-assert.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 720 -commands: -- script: |- - set -o errexit - - kubectl -n ${NAMESPACE} get pod - - for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do - phase=$(kubectl -n ${NAMESPACE} get pod/${pod} -o jsonpath={".status.phase"}) - if [[ "${phase}" != "Running" ]]; then - echo "Waiting for ${pod} to start running" - continue - fi - echo "PostgreSQL logs from ${pod}:" - echo "find /pgdata/pg16/log -type f -iname 'postgresql*.log' -exec tail -n 30 {} \;" \ - | kubectl -n ${NAMESPACE} exec -it ${pod} -- bash 2>/dev/null - done - - sleep 30 -collectors: -- type: pod - selector: "postgres-operator.crunchydata.com/data=postgres" - tail: 30 ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGRestore -metadata: - name: restore-after-15-to-16 -spec: - pgCluster: major-upgrade - repoName: repo1 -status: - state: Succeeded ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGCluster -metadata: - name: major-upgrade -status: - pgbouncer: - ready: 3 - size: 3 - postgres: - instances: - - name: instance1 - ready: 3 - size: 3 - ready: 3 - size: 3 - state: ready diff --git a/e2e-tests/tests/major-upgrade/43-run-restore.yaml b/e2e-tests/tests/major-upgrade/43-run-restore.yaml deleted file mode 100644 index c86adba0d1..0000000000 --- a/e2e-tests/tests/major-upgrade/43-run-restore.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGRestore -metadata: - name: restore-after-15-to-16 -spec: - pgCluster: major-upgrade - repoName: repo1 - diff --git a/e2e-tests/tests/major-upgrade/47-assert.yaml b/e2e-tests/tests/major-upgrade/47-assert.yaml deleted file mode 100644 index 0b0618774c..0000000000 --- a/e2e-tests/tests/major-upgrade/47-assert.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 660 ---- -kind: Job -apiVersion: batch/v1 -metadata: - annotations: - postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-16-to-17 - labels: - postgres-operator.crunchydata.com/pgbackrest-backup: manual - postgres-operator.crunchydata.com/pgbackrest-repo: repo1 - ownerReferences: - - apiVersion: pgv2.percona.com/v2 - kind: PerconaPGBackup - controller: true - blockOwnerDeletion: true -status: - succeeded: 1 ---- -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGBackup -metadata: - name: backup-after-16-to-17 -spec: - pgCluster: major-upgrade - repoName: repo1 - options: - - --type=full -status: - state: Succeeded diff --git a/e2e-tests/tests/major-upgrade/48-assert.yaml b/e2e-tests/tests/major-upgrade/48-assert.yaml deleted file mode 100644 index 95d57c293f..0000000000 --- a/e2e-tests/tests/major-upgrade/48-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 30 ---- -kind: ConfigMap -apiVersion: v1 -metadata: - name: 11-read-from-primary -data: - data: ' 100500' diff --git a/e2e-tests/tests/major-upgrade/48-run-restore.yaml b/e2e-tests/tests/major-upgrade/48-run-restore.yaml deleted file mode 100644 index d496fe3126..0000000000 --- a/e2e-tests/tests/major-upgrade/48-run-restore.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: pgv2.percona.com/v2 -kind: PerconaPGRestore -metadata: - name: restore-after-16-to-17 -spec: - pgCluster: major-upgrade - repoName: repo1 - diff --git a/e2e-tests/tests/telemetry-transfer/02-assert.yaml b/e2e-tests/tests/telemetry-transfer/02-assert.yaml index 010577755c..8359a47764 100644 --- a/e2e-tests/tests/telemetry-transfer/02-assert.yaml +++ b/e2e-tests/tests/telemetry-transfer/02-assert.yaml @@ -1,6 +1,6 @@ apiVersion: kuttl.dev/v1beta1 kind: TestAssert -timeout: 120 +timeout: 240 --- kind: StatefulSet apiVersion: apps/v1 diff --git a/e2e-tests/tests/telemetry-transfer/04-verify-transferred-pmm.yaml b/e2e-tests/tests/telemetry-transfer/04-verify-transferred-pmm.yaml index b87ae394ec..75f10545b0 100644 --- a/e2e-tests/tests/telemetry-transfer/04-verify-transferred-pmm.yaml +++ b/e2e-tests/tests/telemetry-transfer/04-verify-transferred-pmm.yaml @@ -9,7 +9,7 @@ commands: source ../../functions kubectl -n ${NAMESPACE} patch perconapgcluster/${test_name} --type=merge -p '{"spec":{"pmm":{"enabled":true}}}' - sleep 5 + sleep 7 CR_ID=$(kubectl -n ${NAMESPACE} get perconapgcluster/${test_name} --template='{{.metadata.uid}}') TRANSFERRED_KEYS=$(kubectl -n ${NAMESPACE} logs -l run=version-service| grep ${CR_ID} | tail -n1 | grep -Eo '\{.*\}$' | jq '."grpc.request.content".msg | keys') kubectl create configmap -n "${NAMESPACE}" 04-verify-tramsferred-pmm --from-literal=keys="${TRANSFERRED_KEYS}" \ No newline at end of file diff --git a/e2e-tests/tests/telemetry-transfer/05-verify-transferred-helm-cr.yaml b/e2e-tests/tests/telemetry-transfer/05-verify-transferred-helm-cr.yaml index 859984246c..736809a7da 100644 --- a/e2e-tests/tests/telemetry-transfer/05-verify-transferred-helm-cr.yaml +++ b/e2e-tests/tests/telemetry-transfer/05-verify-transferred-helm-cr.yaml @@ -9,7 +9,7 @@ commands: source ../../functions kubectl -n ${NAMESPACE} patch perconapgcluster/${test_name} --type=merge -p '{"metadata":{"labels":{"helm.sh/chart":"fake-chart-to-verify-telemetry-transfer"}}}' - sleep 5 + sleep 7 CR_ID=$(kubectl -n ${NAMESPACE} get perconapgcluster/${test_name} --template='{{.metadata.uid}}') TRANSFERRED_KEYS=$(kubectl -n ${NAMESPACE} logs -l run=version-service| grep ${CR_ID} | tail -n1 | grep -Eo '\{.*\}$' | jq '."grpc.request.content".msg | keys') kubectl create configmap -n "${NAMESPACE}" 05-verify-tramsferred-helm-cr --from-literal=keys="${TRANSFERRED_KEYS}" \ No newline at end of file diff --git a/e2e-tests/tests/telemetry-transfer/06-verify-transferred-sidecars.yaml b/e2e-tests/tests/telemetry-transfer/06-verify-transferred-sidecars.yaml index e75fef4553..8aeec9f576 100644 --- a/e2e-tests/tests/telemetry-transfer/06-verify-transferred-sidecars.yaml +++ b/e2e-tests/tests/telemetry-transfer/06-verify-transferred-sidecars.yaml @@ -9,7 +9,7 @@ commands: source ../../functions kubectl -n ${NAMESPACE} patch perconapgcluster/${test_name} --type=json -p '[{"op":"add","path":"/spec/instances/0/sidecars","value":[{"name":"testcontainer","image":"busybox","command":["sleep","infinity"]}]}]' - sleep 5 + sleep 7 CR_ID=$(kubectl -n ${NAMESPACE} get perconapgcluster/${test_name} --template='{{.metadata.uid}}') TRANSFERRED_KEYS=$(kubectl -n ${NAMESPACE} logs -l run=version-service| grep ${CR_ID} | tail -n1 | grep -Eo '\{.*\}$' | jq '."grpc.request.content".msg | keys') kubectl create configmap -n "${NAMESPACE}" 06-verify-tramsferred-sidecars --from-literal=keys="${TRANSFERRED_KEYS}" \ No newline at end of file diff --git a/e2e-tests/tests/upgrade-consistency/01-assert.yaml b/e2e-tests/tests/upgrade-consistency/01-assert.yaml index 60b019bcef..f50e94bdae 100644 --- a/e2e-tests/tests/upgrade-consistency/01-assert.yaml +++ b/e2e-tests/tests/upgrade-consistency/01-assert.yaml @@ -122,7 +122,7 @@ kind: PerconaPGCluster metadata: name: upgrade-consistency spec: - crVersion: 2.6.0 + crVersion: 2.7.0 status: pgbouncer: ready: 3 diff --git a/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml b/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml index 53c32fbcbe..e0c05f018f 100644 --- a/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml @@ -8,10 +8,15 @@ commands: source ../../functions - cr_version="2.6.0" + cr_version="2.7.0" + + backrest_image=$(get_version_images $cr_version BACKREST${PG_VER}) + pgbouncer_image=$(get_version_images $cr_version PGBOUNCER${PG_VER}) + postgres_image=$(get_version_images $cr_version POSTGRESQL${PG_VER}) + get_cr \ | yq eval ".spec.crVersion=\"$cr_version\"" - \ - | yq eval ".spec.image=\"${IMAGE_BASE}:pg-operator-$cr_version-ppg$PG_VER-postgres\"" - \ - | yq eval ".spec.backups.pgbackrest.image=\"${IMAGE_BASE}:pg-operator-$cr_version-ppg$PG_VER-pgbackrest\"" - \ - | yq eval ".spec.proxy.pgBouncer.image=\"${IMAGE_BASE}:pg-operator-$cr_version-ppg$PG_VER-pgbouncer\"" - \ - | kubectl -n "${NAMESPACE}" apply -f - + | yq eval ".spec.image=\"${REGISTRY_NAME_FULL}${postgres_image}\"" - \ + | yq eval ".spec.backups.pgbackrest.image=\"${REGISTRY_NAME_FULL}${backrest_image}\"" - \ + | yq eval ".spec.proxy.pgBouncer.image=\"${REGISTRY_NAME_FULL}${pgbouncer_image}\"" - \ + | kubectl -n "${NAMESPACE}" apply -f - \ No newline at end of file diff --git a/e2e-tests/tests/upgrade-consistency/02-assert.yaml b/e2e-tests/tests/upgrade-consistency/02-assert.yaml index 4bce8de813..3d3961691b 100644 --- a/e2e-tests/tests/upgrade-consistency/02-assert.yaml +++ b/e2e-tests/tests/upgrade-consistency/02-assert.yaml @@ -120,7 +120,7 @@ kind: PerconaPGCluster metadata: name: upgrade-consistency spec: - crVersion: 2.7.0 + crVersion: 2.8.0 status: pgbouncer: ready: 3 diff --git a/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml index f35c4dd88d..54c3b9853f 100644 --- a/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml @@ -8,12 +8,17 @@ commands: source ../../functions - cr_version="2.7.0" + cr_version="2.8.0" + + backrest_image=$(get_version_images $cr_version BACKREST${PG_VER} ) + pgbouncer_image=$(get_version_images $cr_version PGBOUNCER${PG_VER}) + postgres_image=$(get_version_images $cr_version POSTGRESQL${PG_VER}) + get_cr \ - | yq eval ".spec.crVersion=\"$cr_version\"" - \ - \ - | yq eval ".spec.image=\"${IMAGE_BASE}:pg-operator-$cr_version-ppg$PG_VER-postgres\"" - \ - | yq eval ".spec.backups.pgbackrest.image=\"${IMAGE_BASE}:pg-operator-$cr_version-pgbackrest$PG_VER\"" - \ - | yq eval ".spec.proxy.pgBouncer.image=\"${IMAGE_BASE}:pg-operator-$cr_version-pgbouncer$PG_VER\"" - \ + | yq eval ".spec.crVersion=\"$cr_version\"" - \ + | yq eval ".spec.image=\"${REGISTRY_NAME_FULL}${postgres_image}\"" - \ + | yq eval ".spec.backups.pgbackrest.image=\"${REGISTRY_NAME_FULL}${backrest_image}\"" - \ + | yq eval ".spec.proxy.pgBouncer.image=\"${REGISTRY_NAME_FULL}${pgbouncer_image}\"" - \ | kubectl -n "${NAMESPACE}" apply -f - sleep 10 diff --git a/e2e-tests/tests/upgrade-consistency/03-assert.yaml b/e2e-tests/tests/upgrade-consistency/03-assert.yaml index bcc9f45111..1382b3ea26 100644 --- a/e2e-tests/tests/upgrade-consistency/03-assert.yaml +++ b/e2e-tests/tests/upgrade-consistency/03-assert.yaml @@ -120,7 +120,7 @@ kind: PerconaPGCluster metadata: name: upgrade-consistency spec: - crVersion: 2.8.0 + crVersion: 2.9.0 status: pgbouncer: ready: 3 diff --git a/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml index 959d3aab14..51c335c9fc 100644 --- a/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml @@ -8,7 +8,8 @@ commands: source ../../functions - cr_version="2.8.0" + cr_version="2.9.0" + get_cr \ | yq eval ".spec.crVersion=\"$cr_version\"" - \ | yq eval ".spec.image=\"${IMAGE_BASE}:main-ppg$PG_VER-postgres\"" - \ diff --git a/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml b/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml index 9b96bfe43c..e7eb470636 100644 --- a/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml +++ b/e2e-tests/tests/upgrade-minor/01-create-cluster.yaml @@ -28,10 +28,9 @@ commands: $sed -E -i "s|^( *image: *)(.*)|\1${REGISTRY_NAME_FULL}\2|" ${TEMP_DIR}/cr_lower.yaml fi - lower_ver_images=$(curl -s https://raw.githubusercontent.com/percona/percona-postgresql-operator/refs/tags/v${lower_ver}/e2e-tests/release_versions) - backrest_image=$(echo "$lower_ver_images" | grep BACKREST${pg_ver} | cut -d'=' -f2 ) - pgbouncer_image=$(echo "$lower_ver_images" | grep PGBOUNCER${pg_ver} | cut -d'=' -f2 ) - postgres_image=$(echo "$lower_ver_images" | grep POSTGRESQL${pg_ver} | cut -d'=' -f2 ) + backrest_image=$(get_version_images $lower_ver BACKREST${pg_ver}) + pgbouncer_image=$(get_version_images $lower_ver PGBOUNCER${pg_ver}) + postgres_image=$(get_version_images $lower_ver POSTGRESQL${pg_ver}) yq -i eval ' .metadata.name = "'${test_name}'" | diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index 42691936e0..6aaf2ce21b 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -30,7 +30,7 @@ else export PG_VER="${PG_VER:-17}" fi export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"${IMAGE_BASE}:main-pgbouncer$PG_VER"} -export IMAGE_POSTGRESQL=${IMAGE_POSTGRESQL:-"perconalab/percona-distribution-postgresql:$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_UPGRADE=${IMAGE_UPGRADE:-"${IMAGE_BASE}:main-upgrade"} export BUCKET=${BUCKET:-"pg-operator-testing"} diff --git a/percona/controller/testdata/sidecar-resources-cr.yaml b/percona/controller/testdata/sidecar-resources-cr.yaml index 1c137a6ead..aa347ddfd9 100644 --- a/percona/controller/testdata/sidecar-resources-cr.yaml +++ b/percona/controller/testdata/sidecar-resources-cr.yaml @@ -4,7 +4,7 @@ kind: PerconaPGCluster metadata: name: cluster1 spec: - crVersion: 2.8.0 + crVersion: 2.9.0 image: perconalab/percona-postgresql-operator:main-ppg17-postgres imagePullPolicy: Always diff --git a/percona/version/version.txt b/percona/version/version.txt index 834f262953..c8e38b6140 100644 --- a/percona/version/version.txt +++ b/percona/version/version.txt @@ -1 +1 @@ -2.8.0 +2.9.0