From dbd3affb1a800811cdf2dba576010e8ac9dfd847 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Thu, 13 Nov 2025 18:50:23 +0200 Subject: [PATCH 1/3] Revert images back to main after 2.8.0 release --- Makefile | 9 +++++++-- config/bundle/kustomization.yaml | 4 ++-- .../versionlabel_in_perconapgbackups.yaml | 2 +- .../versionlabel_in_perconapgclusters.yaml | 2 +- .../versionlabel_in_perconapgrestores.yaml | 2 +- .../versionlabel_in_perconapgupgrade.yaml | 2 +- config/cw-bundle/kustomization.yaml | 4 ++-- config/manager/cluster/kustomization.yaml | 4 ++-- config/manager/namespace/kustomization.yaml | 4 ++-- deploy/bundle.yaml | 10 +++++----- deploy/cr.yaml | 18 +++++++++--------- deploy/crd.yaml | 8 ++++---- deploy/cw-bundle.yaml | 10 +++++----- deploy/cw-operator.yaml | 2 +- deploy/operator.yaml | 2 +- deploy/upgrade.yaml | 8 ++++---- e2e-tests/tests/init-deploy/05-assert.yaml | 12 ++++++------ .../tests/upgrade-consistency/01-assert.yaml | 2 +- .../upgrade-consistency/01-create-cluster.yaml | 2 +- .../tests/upgrade-consistency/02-assert.yaml | 2 +- .../upgrade-consistency/02-patch-cluster.yaml | 2 +- .../tests/upgrade-consistency/03-assert.yaml | 2 +- .../upgrade-consistency/03-patch-cluster.yaml | 2 +- .../testdata/sidecar-resources-cr.yaml | 2 +- percona/version/version.txt | 2 +- 25 files changed, 62 insertions(+), 57 deletions(-) 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/bundle/kustomization.yaml b/config/bundle/kustomization.yaml index 0412fd1ddd..90cf89956e 100644 --- a/config/bundle/kustomization.yaml +++ b/config/bundle/kustomization.yaml @@ -6,5 +6,5 @@ resources: - ../manager/namespace images: - name: postgres-operator - newName: docker.io/percona/percona-postgresql-operator - newTag: 2.8.0 + newName: docker.io/perconalab/percona-postgresql-operator + newTag: main 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/config/cw-bundle/kustomization.yaml b/config/cw-bundle/kustomization.yaml index 0b3c810eab..440d098731 100644 --- a/config/cw-bundle/kustomization.yaml +++ b/config/cw-bundle/kustomization.yaml @@ -7,5 +7,5 @@ resources: images: - name: postgres-operator - newName: docker.io/percona/percona-postgresql-operator - newTag: 2.8.0 + newName: docker.io/perconalab/percona-postgresql-operator + newTag: main diff --git a/config/manager/cluster/kustomization.yaml b/config/manager/cluster/kustomization.yaml index 940a80d27b..6f8f4bf129 100644 --- a/config/manager/cluster/kustomization.yaml +++ b/config/manager/cluster/kustomization.yaml @@ -8,5 +8,5 @@ patchesStrategicMerge: images: - name: postgres-operator - newName: docker.io/percona/percona-postgresql-operator - newTag: 2.8.0 + newName: docker.io/perconalab/percona-postgresql-operator + newTag: main diff --git a/config/manager/namespace/kustomization.yaml b/config/manager/namespace/kustomization.yaml index 1e4cfc0e67..a57ff786e0 100644 --- a/config/manager/namespace/kustomization.yaml +++ b/config/manager/namespace/kustomization.yaml @@ -9,5 +9,5 @@ patchesStrategicMerge: images: - name: postgres-operator - newName: docker.io/percona/percona-postgresql-operator - newTag: 2.8.0 + newName: docker.io/perconalab/percona-postgresql-operator + newTag: main diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 020076242b..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 @@ -53964,7 +53964,7 @@ spec: value: "false" - name: PGO_WORKERS value: "1" - image: docker.io/percona/percona-postgresql-operator:2.8.0 + image: docker.io/perconalab/percona-postgresql-operator:main imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/cr.yaml b/deploy/cr.yaml index ed3064d5d1..bdd17d33fb 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -9,9 +9,9 @@ metadata: # - percona.com/delete-ssl # - percona.com/delete-backups spec: - crVersion: 2.8.0 + crVersion: 2.9.0 # initContainer: -# image: docker.io/percona/percona-postgresql-operator:2.8.0 +# image: docker.io/perconalab/percona-postgresql-operator:main # resources: # limits: # cpu: 2.0 @@ -154,7 +154,7 @@ spec: # test-label: value - image: docker.io/percona/percona-distribution-postgresql:17.6-1 + image: docker.io/perconalab/percona-postgresql-operator:main-ppg17-postgres imagePullPolicy: Always postgresVersion: 17 # port: 5432 @@ -188,7 +188,7 @@ spec: # - secretRef: # name: instance-env-secret # initContainer: -# image: docker.io/percona/percona-postgresql-operator:2.8.0 +# image: docker.io/perconalab/percona-postgresql-operator:main # resources: # limits: # cpu: 2.0 @@ -312,7 +312,7 @@ spec: proxy: pgBouncer: replicas: 3 - image: docker.io/percona/percona-pgbouncer:1.24.1-1 + image: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer17 # env: # - name: MY_ENV # value: "1000" @@ -409,7 +409,7 @@ spec: pgbackrest: # metadata: # labels: - image: docker.io/percona/percona-pgbackrest:2.56.0-1 + image: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest17 # env: # - name: MY_ENV # value: "1000" @@ -417,7 +417,7 @@ spec: # - secretRef: # name: repo-host-env-secret # initContainer: -# image: docker.io/percona/percona-postgresql-operator:2.8.0 +# image: docker.io/perconalab/percona-postgresql-operator:main # resources: # limits: # cpu: 2.0 @@ -613,7 +613,7 @@ spec: pmm: enabled: false - image: docker.io/percona/pmm-client:3.4.1 + image: docker.io/perconalab/pmm-client:dev-latest # imagePullPolicy: IfNotPresent secret: cluster1-pmm-secret serverHost: monitoring-service @@ -647,7 +647,7 @@ spec: # - basebackup # extensions: -# image: docker.io/percona/percona-postgresql-operator:2.8.0 +# image: docker.io/perconalab/percona-postgresql-operator:main # imagePullPolicy: Always # storage: # type: s3 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 3fc6cc1c48..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 @@ -53962,7 +53962,7 @@ spec: value: "false" - name: PGO_WORKERS value: "1" - image: docker.io/percona/percona-postgresql-operator:2.8.0 + image: docker.io/perconalab/percona-postgresql-operator:main imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/cw-operator.yaml b/deploy/cw-operator.yaml index 1abc72e4c5..7861413845 100644 --- a/deploy/cw-operator.yaml +++ b/deploy/cw-operator.yaml @@ -44,7 +44,7 @@ spec: value: "false" - name: PGO_WORKERS value: "1" - image: docker.io/percona/percona-postgresql-operator:2.8.0 + image: docker.io/perconalab/percona-postgresql-operator:main imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 7da02aca8d..c6c492333b 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -47,7 +47,7 @@ spec: value: "false" - name: PGO_WORKERS value: "1" - image: docker.io/percona/percona-postgresql-operator:2.8.0 + image: docker.io/perconalab/percona-postgresql-operator:main imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/upgrade.yaml b/deploy/upgrade.yaml index 2a28427a41..59ddf91d3b 100644 --- a/deploy/upgrade.yaml +++ b/deploy/upgrade.yaml @@ -4,9 +4,9 @@ metadata: name: cluster1-16-to-17 spec: postgresClusterName: cluster1 - image: docker.io/percona/percona-postgresql-operator:2.8.0-upgrade + image: docker.io/perconalab/percona-postgresql-operator:main-upgrade fromPostgresVersion: 16 toPostgresVersion: 17 - toPostgresImage: docker.io/percona/percona-distribution-postgresql:17.6-1 - toPgBouncerImage: docker.io/percona/percona-pgbouncer:1.24.1-1 - toPgBackRestImage: docker.io/percona/percona-pgbackrest:2.56.0-1 + toPostgresImage: docker.io/perconalab/percona-postgresql-operator:main-ppg17-postgres + toPgBouncerImage: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer17 + toPgBackRestImage: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest17 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/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..4cde0661b8 100644 --- a/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml @@ -8,7 +8,7 @@ commands: source ../../functions - cr_version="2.6.0" + cr_version="2.7.0" get_cr \ | yq eval ".spec.crVersion=\"$cr_version\"" - \ | yq eval ".spec.image=\"${IMAGE_BASE}:pg-operator-$cr_version-ppg$PG_VER-postgres\"" - \ 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..5299048fc2 100644 --- a/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml @@ -8,7 +8,7 @@ commands: source ../../functions - cr_version="2.7.0" + cr_version="2.8.0" get_cr \ | yq eval ".spec.crVersion=\"$cr_version\"" - \ - \ | yq eval ".spec.image=\"${IMAGE_BASE}:pg-operator-$cr_version-ppg$PG_VER-postgres\"" - \ 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..39867d5f74 100644 --- a/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml @@ -8,7 +8,7 @@ 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/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 From d37fe9ce6a1c2707f1a0303c82efa652a1ce0f60 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Thu, 13 Nov 2025 22:51:03 +0200 Subject: [PATCH 2/3] Fix consistency and pg main image --- e2e-tests/functions | 12 ++++++++++++ .../upgrade-consistency/01-create-cluster.yaml | 13 +++++++++---- .../tests/upgrade-consistency/02-patch-cluster.yaml | 13 +++++++++---- .../tests/upgrade-consistency/03-patch-cluster.yaml | 1 + .../tests/upgrade-minor/01-create-cluster.yaml | 7 +++---- e2e-tests/vars.sh | 2 +- 6 files changed, 35 insertions(+), 13 deletions(-) diff --git a/e2e-tests/functions b/e2e-tests/functions index ecdb008d13..e7e9d021d8 100644 --- a/e2e-tests/functions +++ b/e2e-tests/functions @@ -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" diff --git a/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml b/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml index 4cde0661b8..e0c05f018f 100644 --- a/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml @@ -9,9 +9,14 @@ commands: source ../../functions 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-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml index 5299048fc2..54c3b9853f 100644 --- a/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml @@ -9,11 +9,16 @@ commands: source ../../functions 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-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml index 39867d5f74..51c335c9fc 100644 --- a/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml @@ -9,6 +9,7 @@ commands: source ../../functions 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"} From b236b5182c5308305690380de580e1eea4f1605e Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Thu, 13 Nov 2025 22:54:23 +0200 Subject: [PATCH 3/3] Apply suggestion from @github-actions[bot] Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- e2e-tests/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e-tests/functions b/e2e-tests/functions index e7e9d021d8..6b2a23167e 100644 --- a/e2e-tests/functions +++ b/e2e-tests/functions @@ -500,8 +500,8 @@ get_version_images() { 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 + 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