From 53f2af8fcd67dd2d39e977bfda4154c6429b05d0 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Tue, 18 Mar 2025 16:32:58 +0200 Subject: [PATCH 1/3] K8SPG-612: update pgbouncer image https://perconadev.atlassian.net/browse/K8SPG-612 --- deploy/cr.yaml | 2 +- e2e-tests/vars.sh | 2 +- percona/controller/testdata/sidecar-resources-cr.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/cr.yaml b/deploy/cr.yaml index 8515165097..0483c10a51 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -240,7 +240,7 @@ spec: proxy: pgBouncer: replicas: 3 - image: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer + image: perconalab/percona-pgbouncer # exposeSuperusers: true # resources: # limits: diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index 330e303e49..1be2e3eaeb 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -13,7 +13,7 @@ export VERSION=${VERSION:-$(echo "${GIT_BRANCH}" | sed -e 's^/^-^g; s^[.]^-^g;' export IMAGE_BASE=${IMAGE_BASE:-"perconalab/percona-postgresql-operator"} export IMAGE=${IMAGE:-"${IMAGE_BASE}:${VERSION}"} export PG_VER="${PG_VER:-17}" -export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"${IMAGE_BASE}:main-ppg$PG_VER-pgbouncer"} +export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"perconalab/percona-pgbouncer"} export IMAGE_POSTGRESQL=${IMAGE_POSTGRESQL:-"${IMAGE_BASE}:main-ppg$PG_VER-postgres"} export IMAGE_BACKREST=${IMAGE_BACKREST:-"${IMAGE_BASE}:main-ppg$PG_VER-pgbackrest"} export IMAGE_UPGRADE=${IMAGE_UPGRADE:-"${IMAGE_BASE}:main-upgrade"} diff --git a/percona/controller/testdata/sidecar-resources-cr.yaml b/percona/controller/testdata/sidecar-resources-cr.yaml index e2487a0f05..eeadc60246 100644 --- a/percona/controller/testdata/sidecar-resources-cr.yaml +++ b/percona/controller/testdata/sidecar-resources-cr.yaml @@ -39,7 +39,7 @@ spec: proxy: pgBouncer: replicas: 3 - image: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer + image: perconalab/percona-pgbouncer containers: pgbouncerConfig: resources: From 95102a2251f0c0a04d0eb184ff9e5160c3d45ea3 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Wed, 2 Apr 2025 11:00:00 +0300 Subject: [PATCH 2/3] update image --- deploy/cr.yaml | 2 +- e2e-tests/vars.sh | 2 +- percona/controller/testdata/sidecar-resources-cr.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/cr.yaml b/deploy/cr.yaml index 3b8b2b242f..222f564ada 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -240,7 +240,7 @@ spec: proxy: pgBouncer: replicas: 3 - image: perconalab/percona-pgbouncer + image: perconalab/percona-postgresql-operator:main-pgbouncer17 # exposeSuperusers: true # resources: # limits: diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index 3255465ff6..63766bc375 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -13,7 +13,7 @@ export VERSION=${VERSION:-$(echo "${GIT_BRANCH}" | sed -e 's^/^-^g; s^[.]^-^g;' export IMAGE_BASE=${IMAGE_BASE:-"perconalab/percona-postgresql-operator"} export IMAGE=${IMAGE:-"${IMAGE_BASE}:${VERSION}"} export PG_VER="${PG_VER:-16}" -export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"perconalab/percona-pgbouncer"} +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-ppg$PG_VER-pgbackrest"} export IMAGE_UPGRADE=${IMAGE_UPGRADE:-"${IMAGE_BASE}:main-upgrade"} diff --git a/percona/controller/testdata/sidecar-resources-cr.yaml b/percona/controller/testdata/sidecar-resources-cr.yaml index c182912072..290d4ad9bd 100644 --- a/percona/controller/testdata/sidecar-resources-cr.yaml +++ b/percona/controller/testdata/sidecar-resources-cr.yaml @@ -39,7 +39,7 @@ spec: proxy: pgBouncer: replicas: 3 - image: perconalab/percona-pgbouncer + image: perconalab/percona-postgresql-operator:main-pgbouncer17 containers: pgbouncerConfig: resources: From 87216513cc3d7c43a7b83bcd587fcdb090af1c53 Mon Sep 17 00:00:00 2001 From: Andrii Dema Date: Wed, 2 Apr 2025 13:21:18 +0300 Subject: [PATCH 3/3] update upgrade.yaml --- deploy/upgrade.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/upgrade.yaml b/deploy/upgrade.yaml index 104ebb6f9a..3a9b80db2a 100644 --- a/deploy/upgrade.yaml +++ b/deploy/upgrade.yaml @@ -8,5 +8,5 @@ spec: fromPostgresVersion: 16 toPostgresVersion: 17 toPostgresImage: perconalab/percona-postgresql-operator:main-ppg17-postgres - toPgBouncerImage: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer + toPgBouncerImage: perconalab/percona-postgresql-operator:main-pgbouncer17 toPgBackRestImage: perconalab/percona-postgresql-operator:main-ppg17-pgbackrest