Skip to content

Commit 4c2d51e

Browse files
committed
Merge branch 'INDATA-260' of github.com:supabase/postgres into INDATA-260
* 'INDATA-260' of github.com:supabase/postgres: chore: [ansible/vars] bumping admin-api version (#1960) fix: reserve the port for postgres_exporter with sysctl (#1953) chore: Update PostgREST setup and versions (#1955) Bump PostgREST to 14.1 (#1909)
2 parents 51bdc1c + 9666f22 commit 4c2d51e

File tree

4 files changed

+22
-13
lines changed

4 files changed

+22
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ This is the same PostgreSQL build that powers [Supabase](https://supabase.io), b
294294
| Goodie | Version | Description |
295295
| ------------- | :-------------: | ------------- |
296296
| [PgBouncer](https://www.pgbouncer.org/) | [1.19.0](http://www.pgbouncer.org/changelog.html#pgbouncer-119x) | Set up Connection Pooling. |
297-
| [PostgREST](https://postgrest.org/en/stable/) | [v13.0.4](https://github.com/PostgREST/postgrest/releases/tag/v13.0.4) | Instantly transform your database into an RESTful API. |
297+
| [PostgREST](https://postgrest.org/en/stable/) | [v14.1](https://github.com/PostgREST/postgrest/releases/tag/v14.1) | Instantly transform your database into an RESTful API. |
298298
| [WAL-G](https://github.com/wal-g/wal-g#wal-g) | [v2.0.1](https://github.com/wal-g/wal-g/releases/tag/v2.0.1) | Tool for physical database backup and recovery. | -->
299299

300300

ansible/tasks/setup-postgrest.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
state: 'present'
55

66
- name: PostgREST - add Postgres PPA gpg key
7-
ansible.builtin.apt_key:
7+
ansible.builtin.get_url:
8+
dest: /etc/apt/trusted.gpg.d/ppdg.asc
9+
force: true
10+
mode: '0644'
811
url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
9-
state: 'present'
1012

1113
- name: PostgREST - add Postgres PPA main
1214
ansible.builtin.apt_repository:
@@ -30,9 +32,9 @@
3032
msg: "Installed libpq5 version: {{ ansible_facts['packages']['libpq5'][0]['version'] }}"
3133

3234
- name: PostgREST - remove Postgres PPA gpg key
33-
ansible.builtin.apt_key:
35+
ansible.builtin.file:
36+
path: /etc/apt/trusted.gpg.d/ppdg.asc
3437
state: 'absent'
35-
url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
3638

3739
- name: PostgREST - remove Postgres PPA
3840
ansible.builtin.apt_repository:
@@ -58,7 +60,7 @@
5860
{%- if platform == "arm64" -%}
5961
ubuntu-aarch64
6062
{%- elif platform == "amd64" -%}
61-
inux-static-x86-64
63+
linux-static-x86-64
6264
{%- endif -%}
6365
6466
- name: PostgREST - unpack archive in /opt

ansible/tasks/setup-system.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@
154154
value: 60
155155
state: 'present'
156156

157+
# postgres_exporter runs on port 9187 and postgresT occasionlly chooses it as random srcport
158+
- name: Set net.ipv4.ip_local_reserved_ports=9187
159+
ansible.builtin.sysctl:
160+
name: 'net.ipv4.ip_local_reserved_ports'
161+
value: 9187
162+
state: 'present'
163+
157164
- name: Execute tasks when (debpkg_mode or nixpkg_mode)
158165
when:
159166
- (debpkg_mode or nixpkg_mode)

ansible/vars.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ postgres_major:
1010

1111
# Full version strings for each major version
1212
postgres_release:
13-
postgresorioledb-17: "17.6.0.015-orioledb"
14-
postgres17: "17.6.1.058"
15-
postgres15: "15.14.1.058"
13+
postgresorioledb-17: "17.6.0.017-orioledb"
14+
postgres17: "17.6.1.060"
15+
postgres15: "15.14.1.060"
1616

1717
# Non Postgres Extensions
1818
pgbouncer_release: 1.19.0
@@ -21,9 +21,9 @@ pgbouncer_release_checksum: sha256:af0b05e97d0e1fd9ad45fe00ea6d2a934c63075f67f7e
2121
# The checksum can be found under "Assets", in the GitHub release page for each version.
2222
# The binaries used are: ubuntu-aarch64 and linux-static.
2323
# https://github.com/PostgREST/postgrest/releases
24-
postgrest_release: 13.0.5
25-
postgrest_arm_release_checksum: sha256:7b4eafdaf76bc43b57f603109d460a838f89f949adccd02f452ca339f9a0a0d4
26-
postgrest_x86_release_checksum: sha256:05be2bd48abee6c1691fc7c5d005023466c6989e41a4fc7d1302b8212adb88b5
24+
postgrest_release: 14.1
25+
postgrest_arm_release_checksum: sha256:68885d936873059b946afadaae697467daedacd7d8e697a80b7f0f6881c9c92f
26+
postgrest_x86_release_checksum: sha256:bdab6ab3389ca0d6c1f3b8363491674dbca71875c3f30261d92d8fecdde35277
2727

2828
gotrue_release: 2.182.1
2929
gotrue_release_checksum: sha1:38a12109ad62df32460d88e4c7b2a475b88e7865
@@ -53,7 +53,7 @@ postgres_exporter_release_checksum:
5353
arm64: sha256:29ba62d538b92d39952afe12ee2e1f4401250d678ff4b354ff2752f4321c87a0
5454
amd64: sha256:cb89fc5bf4485fb554e0d640d9684fae143a4b2d5fa443009bd29c59f9129e84
5555

56-
adminapi_release: "0.93.0"
56+
adminapi_release: "0.93.1"
5757
adminmgr_release: "0.32.3"
5858
supabase_admin_agent_release: 1.6.0
5959
supabase_admin_agent_splay: 30s

0 commit comments

Comments
 (0)