Skip to content

K8SPG-612: update pgbouncer image #1095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ spec:
proxy:
pgBouncer:
replicas: 3
image: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer
image: perconalab/percona-postgresql-operator:main-pgbouncer17
# exposeSuperusers: true
# resources:
# limits:
Expand Down
2 changes: 1 addition & 1 deletion deploy/upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion e2e-tests/vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
export DEPLOY_DIR="${DEPLOY_DIR:-${ROOT_REPO}/deploy}"
export TESTS_DIR="${TESTS_DIR:-${ROOT_REPO}/e2e-tests}"
export TESTS_CONFIG_DIR="${TESTS_CONFIG_DIR:-${TESTS_DIR}/conf}"
export TEMP_DIR="/tmp/kuttl/pg/${test_name}"

Check warning on line 8 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L8 <ShellCheck.SC2154>

test_name is referenced but not assigned.
Raw output
./e2e-tests/vars.sh:8:32: warning: test_name is referenced but not assigned. (ShellCheck.SC2154)

export GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)

Check warning on line 10 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L10 <ShellCheck.SC2155>

Declare and assign separately to avoid masking return values.
Raw output
./e2e-tests/vars.sh:10:8: warning: Declare and assign separately to avoid masking return values. (ShellCheck.SC2155)
export VERSION=${VERSION:-$(echo "${GIT_BRANCH}" | sed -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')}

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:-"${IMAGE_BASE}:main-ppg$PG_VER-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"}
Expand All @@ -24,8 +24,8 @@
export PGOV1_TAG=${PGOV1_TAG:-"1.4.0"}
export PGOV1_VER=${PGOV1_VER:-"14"}

date=$(which gdate || which date)

Check warning on line 27 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L27 <ShellCheck.SC2034>

date appears unused. Verify use (or export if used externally).
Raw output
./e2e-tests/vars.sh:27:1: warning: date appears unused. Verify use (or export if used externally). (ShellCheck.SC2034)
sed=$(which gsed || which sed)

Check warning on line 28 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L28 <ShellCheck.SC2034>

sed appears unused. Verify use (or export if used externally).
Raw output
./e2e-tests/vars.sh:28:1: warning: sed appears unused. Verify use (or export if used externally). (ShellCheck.SC2034)

if command -v oc &>/dev/null; then
if oc get projects; then
Expand Down
2 changes: 1 addition & 1 deletion percona/controller/testdata/sidecar-resources-cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
proxy:
pgBouncer:
replicas: 3
image: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer
image: perconalab/percona-postgresql-operator:main-pgbouncer17
containers:
pgbouncerConfig:
resources:
Expand Down
Loading