From f0fe7904ebae8e3d852b4eff0a1f272ba2c69ab3 Mon Sep 17 00:00:00 2001
From: Viacheslav Sarzhan <slava.sarzhan@percona.com>
Date: Tue, 10 Dec 2024 15:49:20 +0200
Subject: [PATCH] K8SPG-652 downgrade patroni for PG <= 16 (#1077)

---
 postgresql-containers/build/pgbackrest/Dockerfile | 2 +-
 postgresql-containers/build/postgres/Dockerfile   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/postgresql-containers/build/pgbackrest/Dockerfile b/postgresql-containers/build/pgbackrest/Dockerfile
index 11c5905f..04e87ba1 100644
--- a/postgresql-containers/build/pgbackrest/Dockerfile
+++ b/postgresql-containers/build/pgbackrest/Dockerfile
@@ -79,7 +79,7 @@ RUN set -ex; \
 
 RUN set -ex; \
     microdnf -y install \
-        percona-pgbackrest-2.53*; \
+        percona-pgbackrest; \
     microdnf -y clean all
 
 RUN set -ex; \
diff --git a/postgresql-containers/build/postgres/Dockerfile b/postgresql-containers/build/postgres/Dockerfile
index fa29523a..0e057018 100644
--- a/postgresql-containers/build/postgres/Dockerfile
+++ b/postgresql-containers/build/postgres/Dockerfile
@@ -59,6 +59,7 @@ RUN set -ex; \
     percona-release enable ppg-${PG_MAJOR} release
 
 RUN set -ex; \
+    microdnf -y install perl-DBI perl-DBD-Pg perl-XML-Parser; \
     yum-config-manager --disable ol9_appstream; \
     microdnf --disablerepo="ubi-9-appstream-rpms" -y install \
         llvm; \
@@ -97,7 +98,7 @@ RUN set -ex; \
         --enablerepo="ol9_developer_EPEL" \
         percona-pgaudit${PG_MAJOR//.} \
         percona-pgaudit${PG_MAJOR//.}_set_user \
-        percona-pgbackrest-2.53* \
+        percona-pgbackrest \
         percona-postgresql${PG_MAJOR//.}-contrib \
         percona-postgresql${PG_MAJOR//.}-server \
         percona-postgresql${PG_MAJOR//.}-libs \
@@ -129,7 +130,11 @@ RUN set -ex; \
     microdnf clean all; \
     rm -rf /var/cache/dnf /var/cache/yum
 
-RUN microdnf -y install --enablerepo="ol9_developer_EPEL" percona-patroni; \
+RUN if [[ "${PG_MAJOR//.}" -le '16' ]]; then \
+        microdnf -y install --enablerepo="ol9_developer_EPEL" percona-patroni-3*; \
+    else \
+        microdnf -y install --enablerepo="ol9_developer_EPEL" percona-patroni; \
+    fi; \
     microdnf clean all; \
     rm -rf /var/cache/dnf /var/cache/yum