From e7c3bb5ef67a6f97a9c6eb9ff1dabde289b7aaf4 Mon Sep 17 00:00:00 2001 From: Andrew Jarvis Date: Wed, 5 Mar 2025 15:09:52 -0500 Subject: [PATCH 1/8] Upgrade pgbouncer_exporter to 0.18.0 - Upgrades pgbouncer_exporter to 0.18.0 - Bumps Airflow pgbouncer_exporter version to current date (2025-03-05) - Bumps expected Go version to 1.23.7 per pgbouncer_exporter release notes --- chart/dockerfiles/pgbouncer-exporter/build_and_push.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chart/dockerfiles/pgbouncer-exporter/build_and_push.sh b/chart/dockerfiles/pgbouncer-exporter/build_and_push.sh index e9014b1b0893b..a17748164f95c 100755 --- a/chart/dockerfiles/pgbouncer-exporter/build_and_push.sh +++ b/chart/dockerfiles/pgbouncer-exporter/build_and_push.sh @@ -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) From a7c8f6ed1cf8dbd6c4dc55f5ba7cce119b026fd5 Mon Sep 17 00:00:00 2001 From: Andrew Jarvis Date: Thu, 6 Mar 2025 13:34:37 -0500 Subject: [PATCH 2/8] Update helm chart default pgbouncer_exporter image to 0.18.0 --- chart/newsfragments/47416.misc.rst | 1 + chart/values.schema.json | 2 +- chart/values.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 chart/newsfragments/47416.misc.rst diff --git a/chart/newsfragments/47416.misc.rst b/chart/newsfragments/47416.misc.rst new file mode 100644 index 0000000000000..6cfbd08c806c9 --- /dev/null +++ b/chart/newsfragments/47416.misc.rst @@ -0,0 +1 @@ +The chart uses newer version of pgbouncer exporter - ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` \ No newline at end of file diff --git a/chart/values.schema.json b/chart/values.schema.json index edd019cfaf5c7..fac467c89dc87 100644 --- a/chart/values.schema.json +++ b/chart/values.schema.json @@ -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.", diff --git a/chart/values.yaml b/chart/values.yaml index 25d67fced692f..285e8615749de 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -119,7 +119,7 @@ images: 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 From 642759085d914f75ad02a4e8313e338a0eb8be41 Mon Sep 17 00:00:00 2001 From: Andrew Jarvis Date: Thu, 6 Mar 2025 13:57:18 -0500 Subject: [PATCH 3/8] Add newline to 47416.misc.rst --- chart/newsfragments/47416.misc.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/newsfragments/47416.misc.rst b/chart/newsfragments/47416.misc.rst index 6cfbd08c806c9..5788f18d54faa 100644 --- a/chart/newsfragments/47416.misc.rst +++ b/chart/newsfragments/47416.misc.rst @@ -1 +1 @@ -The chart uses newer version of pgbouncer exporter - ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` \ No newline at end of file +The chart uses newer version of pgbouncer exporter - ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` From 4964a19c8764c54c5996008c3e95e6d392e839d3 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Thu, 6 Mar 2025 19:57:46 +0100 Subject: [PATCH 4/8] Update chart/newsfragments/47416.misc.rst --- chart/newsfragments/47416.misc.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/chart/newsfragments/47416.misc.rst b/chart/newsfragments/47416.misc.rst index 5788f18d54faa..d4da9029a83ea 100644 --- a/chart/newsfragments/47416.misc.rst +++ b/chart/newsfragments/47416.misc.rst @@ -1 +1,2 @@ The chart uses newer version of pgbouncer exporter - ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` + From 539f413313eac835d1cae746998f8b4c084dad67 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Thu, 6 Mar 2025 20:33:28 +0100 Subject: [PATCH 5/8] fixup! Update chart/newsfragments/47416.misc.rst --- chart/newsfragments/47416.misc.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/chart/newsfragments/47416.misc.rst b/chart/newsfragments/47416.misc.rst index d4da9029a83ea..5788f18d54faa 100644 --- a/chart/newsfragments/47416.misc.rst +++ b/chart/newsfragments/47416.misc.rst @@ -1,2 +1 @@ The chart uses newer version of pgbouncer exporter - ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` - From 7457aa65886a05a79e2dd1cc3469b0f48a964469 Mon Sep 17 00:00:00 2001 From: Andrew Jarvis Date: Thu, 6 Mar 2025 15:31:38 -0500 Subject: [PATCH 6/8] Bump pgbouncer to version 1.23.1 --- chart/dockerfiles/pgbouncer/Dockerfile | 3 ++- chart/dockerfiles/pgbouncer/build_and_push.sh | 12 +++++++++--- chart/newsfragments/47416.improvement.rst | 2 ++ chart/newsfragments/47416.misc.rst | 1 - chart/values.schema.json | 2 +- chart/values.yaml | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 chart/newsfragments/47416.improvement.rst delete mode 100644 chart/newsfragments/47416.misc.rst diff --git a/chart/dockerfiles/pgbouncer/Dockerfile b/chart/dockerfiles/pgbouncer/Dockerfile index fcc45da47ba92..70236d26da6d3 100644 --- a/chart/dockerfiles/pgbouncer/Dockerfile +++ b/chart/dockerfiles/pgbouncer/Dockerfile @@ -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 @@ -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 diff --git a/chart/dockerfiles/pgbouncer/build_and_push.sh b/chart/dockerfiles/pgbouncer/build_and_push.sh index e4345cc44d018..333e4708ccdc0 100755 --- a/chart/dockerfiles/pgbouncer/build_and_push.sh +++ b/chart/dockerfiles/pgbouncer/build_and_push.sh @@ -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) @@ -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}"\ diff --git a/chart/newsfragments/47416.improvement.rst b/chart/newsfragments/47416.improvement.rst new file mode 100644 index 0000000000000..c1a9fe468a0b8 --- /dev/null +++ b/chart/newsfragments/47416.improvement.rst @@ -0,0 +1,2 @@ +The chart uses newer version of pgbouncer exporter - ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` +The chart decrements the version of pgbouncer to ``airflow-pgbouncer-2025.03.05-1.23.1`` to provide compatibility with ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` diff --git a/chart/newsfragments/47416.misc.rst b/chart/newsfragments/47416.misc.rst deleted file mode 100644 index 5788f18d54faa..0000000000000 --- a/chart/newsfragments/47416.misc.rst +++ /dev/null @@ -1 +0,0 @@ -The chart uses newer version of pgbouncer exporter - ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` diff --git a/chart/values.schema.json b/chart/values.schema.json index fac467c89dc87..b8995cffa1c5d 100644 --- a/chart/values.schema.json +++ b/chart/values.schema.json @@ -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.", diff --git a/chart/values.yaml b/chart/values.yaml index 285e8615749de..99a4e1fd1c1e6 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -115,7 +115,7 @@ 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 From 60c7dc5c65d1ba5b6a7e0bbd3bf837f302b43f89 Mon Sep 17 00:00:00 2001 From: Andrew Jarvis Date: Thu, 6 Mar 2025 16:08:21 -0500 Subject: [PATCH 7/8] Change to significant news fragment --- .../{47416.improvement.rst => 47416.significant.rst} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename chart/newsfragments/{47416.improvement.rst => 47416.significant.rst} (51%) diff --git a/chart/newsfragments/47416.improvement.rst b/chart/newsfragments/47416.significant.rst similarity index 51% rename from chart/newsfragments/47416.improvement.rst rename to chart/newsfragments/47416.significant.rst index c1a9fe468a0b8..0d0a0b3d6a029 100644 --- a/chart/newsfragments/47416.improvement.rst +++ b/chart/newsfragments/47416.significant.rst @@ -1,2 +1,3 @@ The chart uses newer version of pgbouncer exporter - ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` -The chart decrements the version of pgbouncer to ``airflow-pgbouncer-2025.03.05-1.23.1`` to provide compatibility with ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` + +The chart 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`` From b2e40ff2ffe9dd043d384d6a4a027d46c6899a23 Mon Sep 17 00:00:00 2001 From: Andrew Jarvis Date: Thu, 6 Mar 2025 16:34:50 -0500 Subject: [PATCH 8/8] Update newsfragment content --- chart/newsfragments/47416.significant.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/newsfragments/47416.significant.rst b/chart/newsfragments/47416.significant.rst index 0d0a0b3d6a029..995c19ba0a861 100644 --- a/chart/newsfragments/47416.significant.rst +++ b/chart/newsfragments/47416.significant.rst @@ -1,3 +1,3 @@ -The chart uses newer version of pgbouncer exporter - ``airflow-pgbouncer-exporter-2025.03.05-0.18.0`` +Decrements pgbouncer exporter to 1.23.1 and updates pgbouncer_exporter to v0.18.0 -The chart 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`` +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``.