Skip to content

Update pgbouncer to 1.23.1 and pgbouncer_exporter to 0.18.0 in helm chart #47416

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.

Sign up for GitHub

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
potiuk merged 8 commits into from
Mar 7, 2025
Merged

Update pgbouncer to 1.23.1 and pgbouncer_exporter to 0.18.0 in helm chart #47416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e7c3bb5
Upgrade pgbouncer_exporter to 0.18.0
Jarvl Mar 5, 2025
a7c8f6e
Update helm chart default pgbouncer_exporter image to 0.18.0
Jarvl Mar 6, 2025
6427590
Add newline to 47416.misc.rst
Jarvl Mar 6, 2025
4964a19
Update chart/newsfragments/47416.misc.rst
potiuk Mar 6, 2025
539f413
fixup! Update chart/newsfragments/47416.misc.rst
potiuk Mar 6, 2025
7457aa6
Bump pgbouncer to version 1.23.1
Jarvl Mar 6, 2025
60c7dc5
Change to significant news fragment
Jarvl Mar 6, 2025
b2e40ff
Update newsfragment content
Jarvl Mar 6, 2025
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
6 changes: 3 additions & 3 deletions chart/dockerfiles/pgbouncer-exporter/build_and_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ readonly DOCKERHUB_USER
DOCKERHUB_REPO=${DOCKERHUB_REPO:="airflow"}
readonly DOCKERHUB_REPO

PGBOUNCER_EXPORTER_VERSION="0.17.0"
PGBOUNCER_EXPORTER_VERSION="0.18.0"
readonly PGBOUNCER_EXPORTER_VERSION

AIRFLOW_PGBOUNCER_EXPORTER_VERSION="2024.06.18"
AIRFLOW_PGBOUNCER_EXPORTER_VERSION="2025.03.05"
readonly AIRFLOW_PGBOUNCER_EXPORTER_VERSION

EXPECTED_GO_VERSION="1.22.4"
EXPECTED_GO_VERSION="1.23.7"
readonly EXPECTED_GO_VERSION

COMMIT_SHA=$(git rev-parse HEAD)
Expand Down
3 changes: 2 additions & 1 deletion chart/dockerfiles/pgbouncer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ARG ALPINE_VERSION="3.19"
FROM alpine:${ALPINE_VERSION} AS builder
SHELL ["/bin/ash", "-e", "-x", "-c", "-o", "pipefail"]

ARG PGBOUNCER_TAG
ARG PGBOUNCER_VERSION
ARG AIRFLOW_PGBOUNCER_VERSION

Expand All @@ -30,7 +31,7 @@ RUN apk --no-cache add make pkgconfig build-base libtool wget gcc g++ libevent-d
# We are not using Dash so we can safely ignore the "Dash warning"
# "In dash, something is not supported." https://github.com/koalaman/shellcheck/wiki/SC2169
# hadolint ignore=SC2169,SC3060
RUN wget --progress=dot:giga "https://github.com/pgbouncer/pgbouncer/releases/download/pgbouncer_${PGBOUNCER_VERSION//\./_}/pgbouncer-${PGBOUNCER_VERSION}.tar.gz" \
RUN wget --progress=dot:giga "https://github.com/pgbouncer/pgbouncer/releases/download/${PGBOUNCER_TAG}/pgbouncer-${PGBOUNCER_VERSION}.tar.gz" \
&& echo "${PGBOUNCER_SHA256} pgbouncer-${PGBOUNCER_VERSION}.tar.gz" | sha256sum -c - \
&& tar -xzvf pgbouncer-$PGBOUNCER_VERSION.tar.gz

Expand Down
12 changes: 9 additions & 3 deletions chart/dockerfiles/pgbouncer/build_and_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,18 @@ readonly DOCKERHUB_USER
DOCKERHUB_REPO=${DOCKERHUB_REPO:="airflow"}
readonly DOCKERHUB_REPO

PGBOUNCER_VERSION="1.24.0"
# Sometimes the pgbouncer tag does not reliably correspond with the version name
# For example, it may have a `-fixed` suffix
PGBOUNCER_TAG="pgbouncer_1_23_1-fixed"
readonly PGBOUNCER_TAG

PGBOUNCER_VERSION="1.23.1"
readonly PGBOUNCER_VERSION

PGBOUNCER_SHA256="e76adf941a3191a416e223c0b2cdbf73159eef80a2a32314af6fbd82e41a1d41"
PGBOUNCER_SHA256="1963b497231d9a560a62d266e4a2eae6881ab401853d93e5d292c3740eec5084"
readonly PGBOUNCER_SHA256

AIRFLOW_PGBOUNCER_VERSION="2025.01.10"
AIRFLOW_PGBOUNCER_VERSION="2025.03.05"
readonly AIRFLOW_PGBOUNCER_VERSION

COMMIT_SHA=$(git rev-parse HEAD)
Expand Down Expand Up @@ -58,6 +63,7 @@ docker buildx build . \
--platform linux/amd64,linux/arm64 \
--pull \
--push \
--build-arg "PGBOUNCER_TAG=${PGBOUNCER_TAG}" \
--build-arg "PGBOUNCER_VERSION=${PGBOUNCER_VERSION}" \
--build-arg "AIRFLOW_PGBOUNCER_VERSION=${AIRFLOW_PGBOUNCER_VERSION}"\
--build-arg "PGBOUNCER_SHA256=${PGBOUNCER_SHA256}"\
Expand Down
3 changes: 3 additions & 0 deletions chart/newsfragments/47416.significant.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Decrements pgbouncer exporter to 1.23.1 and updates pgbouncer_exporter to v0.18.0

The chart uses newer version of pgbouncer exporter - ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` and decrements the version of pgbouncer to ``airflow-pgbouncer-2025.03.05-1.23.1`` previously ``airflow-pgbouncer-2025.01.10-1.24.0``, to provide compatibility with ``airflow-pgbouncer-exporter-2025.03.05-0.18.0``.
4 changes: 2 additions & 2 deletions chart/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@
"tag": {
"description": "The PgBouncer image tag.",
"type": "string",
"default": "airflow-pgbouncer-2025.01.10-1.24.0"
"default": "airflow-pgbouncer-2025.03.05-1.23.1"
},
"pullPolicy": {
"description": "The PgBouncer image pull policy.",
Expand All @@ -914,7 +914,7 @@
"tag": {
"description": "The PgBouncer exporter image tag.",
"type": "string",
"default": "airflow-pgbouncer-exporter-2024.06.18-0.17.0"
"default": "airflow-pgbouncer-exporter-2025.03.05-0.18.0"
},
"pullPolicy": {
"description": "The PgBouncer exporter image pull policy.",
Expand Down
4 changes: 2 additions & 2 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ images:
pullPolicy: IfNotPresent
pgbouncer:
repository: apache/airflow
tag: airflow-pgbouncer-2025.01.10-1.24.0
tag: airflow-pgbouncer-2025.03.05-1.23.1
pullPolicy: IfNotPresent
pgbouncerExporter:
repository: apache/airflow
tag: airflow-pgbouncer-exporter-2024.06.18-0.17.0
tag: airflow-pgbouncer-exporter-2025.03.05-0.18.0
pullPolicy: IfNotPresent
gitSync:
repository: registry.k8s.io/git-sync/git-sync
Expand Down