Skip to content

Commit 172611d

Browse files
authored
chore: bump adminapi and admin-mgr binaries (#792)
* chore: bump admin-api and admin-mgr * chore: init read-replica.conf * and ensure it's accounted for everywhere * chore: bump version * chore: remove rc versioning * chore: use admin-api v0.54.0 instead * chore: include read-replica.conf from start
1 parent 1392c7c commit 172611d

File tree

8 files changed

+23
-3
lines changed

8 files changed

+23
-3
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -903,6 +903,7 @@ COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql-stdout
903903
COPY --chown=postgres:postgres ansible/files/postgresql_config/supautils.conf.j2 /etc/postgresql-custom/supautils.conf
904904
COPY --chown=postgres:postgres ansible/files/postgresql_extension_custom_scripts /etc/postgresql-custom/extension-custom-scripts
905905
COPY --chown=postgres:postgres ansible/files/pgsodium_getkey_urandom.sh.j2 /usr/lib/postgresql/${postgresql_major}/bin/pgsodium_getkey.sh
906+
COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_read_replica.conf.j2 /etc/postgresql-custom/read-replica.conf
906907
COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_walg.conf.j2 /etc/postgresql-custom/wal-g.conf
907908
COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /home/postgres/wal_fetch.sh
908909
COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh

Dockerfile-u18

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -924,6 +924,7 @@ COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql-stdout
924924
COPY --chown=postgres:postgres ansible/files/postgresql_config/supautils.conf.j2 /etc/postgresql-custom/supautils.conf
925925
COPY --chown=postgres:postgres ansible/files/postgresql_extension_custom_scripts /etc/postgresql-custom/extension-custom-scripts
926926
COPY --chown=postgres:postgres ansible/files/pgsodium_getkey_urandom.sh.j2 /usr/lib/postgresql/${postgresql_major}/bin/pgsodium_getkey.sh
927+
COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_read_replica.conf.j2 /etc/postgresql-custom/read-replica.conf
927928
COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_walg.conf.j2 /etc/postgresql-custom/wal-g.conf
928929
COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /home/postgres/wal_fetch.sh
929930
COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# hot_standby = on
2+
# restore_command = '/usr/bin/admin-mgr wal-fetch %f %p >> /var/log/wal-g/wal-fetch.log 2>&1'
3+
# recovery_target_timeline = 'latest'
4+
5+
# primary_conninfo = 'host=localhost port=6543 user=replication'

ansible/files/postgresql_config/postgresql.conf.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,9 @@ jit_provider = 'llvmjit' # JIT library to use
763763
# WAL-G specific configurations
764764
#include = '/etc/postgresql-custom/wal-g.conf'
765765

766+
# read replica specific configurations
767+
include = '/etc/postgresql-custom/read-replica.conf'
768+
766769
# supautils specific configurations
767770
#include = '/etc/postgresql-custom/supautils.conf'
768771

ansible/tasks/setup-postgres.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,15 @@
100100
dest: /etc/postgresql/pg_ident.conf
101101
group: postgres
102102

103+
# Add custom config for read replicas set up
104+
- name: Move custom read-replica.conf file to /etc/postgresql-custom/read-replica.conf
105+
template:
106+
src: "files/postgresql_config/custom_read_replica.conf.j2"
107+
dest: /etc/postgresql-custom/read-replica.conf
108+
mode: 0664
109+
owner: postgres
110+
group: postgres
111+
103112
# Install extensions before init
104113
- name: Install Postgres extensions
105114
import_tasks: tasks/setup-docker.yml

ansible/vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ postgres_exporter_release_checksum:
4141
arm64: sha256:29ba62d538b92d39952afe12ee2e1f4401250d678ff4b354ff2752f4321c87a0
4242
amd64: sha256:cb89fc5bf4485fb554e0d640d9684fae143a4b2d5fa443009bd29c59f9129e84
4343

44-
adminapi_release: 0.51.0
45-
adminmgr_release: 0.10.2
44+
adminapi_release: 0.54.0
45+
adminmgr_release: 0.13.1
4646

4747
# Postgres Extensions
4848
postgis_release: "3.3.2"

common.vars.pkr.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
postgres-version = "15.1.0.134-wrappers"
1+
postgres-version = "15.1.0.134-rc-1"

docker/orioledb/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,7 @@ COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql-stdout
845845
COPY --chown=postgres:postgres ansible/files/postgresql_config/supautils.conf.j2 /etc/postgresql-custom/supautils.conf
846846
COPY --chown=postgres:postgres ansible/files/postgresql_extension_custom_scripts /etc/postgresql-custom/extension-custom-scripts
847847
COPY --chown=postgres:postgres ansible/files/pgsodium_getkey_urandom.sh.j2 /usr/lib/postgresql/${postgresql_major}/bin/pgsodium_getkey.sh
848+
COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_read_replica.conf.j2 /etc/postgresql-custom/read-replica.conf
848849
COPY --chown=postgres:postgres ansible/files/postgresql_config/custom_walg.conf.j2 /etc/postgresql-custom/wal-g.conf
849850
COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /home/postgres/wal_fetch.sh
850851
COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh

0 commit comments

Comments
 (0)