Skip to content

feat: advance to ubuntu 24.04 #1416

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.

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

Open
wants to merge 27 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
2622a30
feat: wip advance to ubuntu 24.04
samrose Jan 22, 2025
61ce696
fix; missing gp3 on image string
samrose Jan 22, 2025
2105652
chore: non-interactive
samrose Jan 22, 2025
34fc1aa
chore: set hostname in dhcp client
samrose Jan 22, 2025
197b513
chore: conform to new networking approach
samrose Jan 22, 2025
8dfe998
ore: reverse he sha values
samrose Jan 22, 2025
6b07c45
chore: fix kong address
samrose Jan 22, 2025
07df582
ore: typo in url
samrose Jan 22, 2025
f485a8c
chore: drop old removals
samrose Jan 22, 2025
30673f6
chore: remove defunct package
samrose Jan 23, 2025
8c5a791
chore: restore wal-g build approach
samrose Jan 23, 2025
f6f2c6d
chore: permission check and restore kong original version
samrose Jan 24, 2025
28739d0
chore: log output to debug
samrose Jan 24, 2025
267f283
chore: checks
samrose Jan 24, 2025
a25cf18
chore: increase wait time before health checks.
samrose Jan 28, 2025
9df2a03
chore: try to increase logging on postgres
samrose Jan 28, 2025
849792f
chore: post rebase cleanup
samrose Feb 11, 2025
3e95820
Update README.md
samrose Apr 2, 2025
02ca971
chore: restore function
samrose Apr 2, 2025
0cec887
chore: remove unused file
samrose Apr 2, 2025
feedda1
chore: make command non-interactive
samrose Apr 2, 2025
ce3b45a
chore: readme script
samrose Apr 2, 2025
d331806
chore: ubuntu 24.04 has moved to use networkd and netplan by default,
samrose Apr 2, 2025
adedd8c
chore: update README
samrose Apr 7, 2025
1a7c455
chore: bump versions for staging release/testing
samrose Apr 9, 2025
a4b3f81
chore: keep kong pinned to this version, was not meant to change
samrose Apr 9, 2025
721651d
chore: update qemu artifact to noble base
darora Apr 9, 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
8 changes: 4 additions & 4 deletions .github/workflows/ami-release-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
include:
- runner: arm-runner
arch: arm64
ubuntu_release: focal
ubuntu_version: 20.04
ubuntu_release: noble
ubuntu_version: 24.04
mcpu: neoverse-n1
runs-on: ${{ matrix.runner }}
timeout-minutes: 150
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:

- name: Upload nix flake revision to s3 staging
run: |
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz

- name: configure aws credentials - prod
uses: aws-actions/configure-aws-credentials@v4
Expand All @@ -141,7 +141,7 @@ jobs:

- name: Upload nix flake revision to s3 prod
run: |
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can these version changes be deduplicated?

Copy link
Collaborator Author

@samrose samrose Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@steve-chavez we can certainly address this. But as @pcnc had discussed in slack thread, these are currently tied to infrastructure functionality. So, instead of trying to make those changes as a part of the upgrade to ubuntu 24.04 PR, let's create another PR where we can introduce those changes and test and make sure nothing else breaks. We should not try to accomplish that in this PR.


- name: Create release
uses: softprops/action-gh-release@v2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

- name: Upload pg_upgrade scripts to s3 staging
run: |
aws s3 cp /tmp/pg_upgrade_bin.tar.gz "s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz"
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz

- name: Slack Notification on Failure
if: ${{ failure() }}
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:

- name: Upload pg_upgrade scripts to s3 prod
run: |
aws s3 cp /tmp/pg_upgrade_bin.tar.gz "s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz"
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto. Deduplication is needed.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, agree we should address this. As stated above, as @pcnc had discussed in slack thread, these are currently tied to infrastructure functionality. So, instead of trying to make those changes as a part of the upgrade to ubuntu 24.04 PR, let's create another PR where we can introduce those changes and test and make sure nothing else breaks. We should not try to accomplish that in this PR.


- name: Slack Notification on Failure
if: ${{ failure() }}
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/qemu-image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,6 @@ jobs:
VERSION=$(cat common-nix.vars.pkr.hcl | sed -e 's/postgres-version = "\(.*\)"/\1/g')
echo "version=$VERSION" >> $GITHUB_OUTPUT

# - name: Create nix flake revision tarball
# run: |
# GIT_SHA=${{github.sha}}
# MAJOR_VERSION=${{ env.POSTGRES_MAJOR_VERSION }}

# mkdir -p "/tmp/pg_upgrade_bin/${MAJOR_VERSION}"
# echo "$GIT_SHA" >> "/tmp/pg_upgrade_bin/${MAJOR_VERSION}/nix_flake_version"
# tar -czf "/tmp/pg_binaries.tar.gz" -C "/tmp/pg_upgrade_bin" .

- name: configure aws credentials - staging
uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testinfra-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
include:
- runner: arm-runner
arch: arm64
ubuntu_release: focal
ubuntu_version: 20.04
ubuntu_release: noble
ubuntu_version: 24.04
mcpu: neoverse-n1
runs-on: ${{ matrix.runner }}
timeout-minutes: 150
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-15
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ARG index_advisor_release=0.2.0
ARG supautils_release=2.2.0
ARG wal_g_release=2.0.1

FROM ubuntu:focal as base
FROM ubuntu:noble as base

RUN apt update -y && apt install -y \
curl \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-kubernetes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.21

ADD ./output-cloudimg/packer-cloudimg /disk/focal.qcow2
ADD ./output-cloudimg/packer-cloudimg /disk/image.qcow2

RUN apk add --no-cache qemu-system-aarch64 qemu-img openssh-client nftables cloud-utils-localds aavmf virtiofsd
# dev stuff
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-orioledb-17
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ARG index_advisor_release=0.2.0
ARG supautils_release=2.2.0
ARG wal_g_release=3.0.5

FROM ubuntu:focal as base
FROM ubuntu:noble as base

RUN apt update -y && apt install -y \
curl \
Expand Down
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ init: qemu-arm64-nix.pkr.hcl
output-cloudimg/packer-cloudimg: ansible qemu-arm64-nix.pkr.hcl
packer build -var "git_sha=$(UPSTREAM_NIX_GIT_SHA)" qemu-arm64-nix.pkr.hcl

disk/focal-raw.img: output-cloudimg/packer-cloudimg
mkdir -p disk
sudo qemu-img convert -O raw output-cloudimg/packer-cloudimg disk/focal-raw.img

alpine-image: output-cloudimg/packer-cloudimg
sudo nerdctl build . -t supabase-postgres-test:$(GIT_SHA) -f ./Dockerfile-kubernetes

Expand Down
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Unmodified Postgres with some useful plugins. Our goal with this repo is not to
## Primary Features
- ✅ Postgres [postgresql-15.8](https://www.postgresql.org/docs/15/index.html)
- ✅ Postgres [postgresql-17.4](https://www.postgresql.org/docs/17/index.html)
- ✅ Postgres [orioledb-postgresql-17_5](https://github.com/orioledb/orioledb)
- ✅ Ubuntu 20.04 (Focal Fossa).
- ✅ Postgres [orioledb-postgresql-17_6](https://github.com/orioledb/orioledb)
- ✅ Ubuntu 24.04 (Noble Numbat).
- ✅ [wal_level](https://www.postgresql.org/docs/current/runtime-config-wal.html) = logical and [max_replication_slots](https://www.postgresql.org/docs/current/runtime-config-replication.html) = 5. Ready for replication.
- ✅ [Large Systems Extensions](https://github.com/aws/aws-graviton-getting-started#building-for-graviton-and-graviton2). Enabled for ARM images.
## Extensions
Expand Down Expand Up @@ -42,7 +42,7 @@ Unmodified Postgres with some useful plugins. Our goal with this repo is not to
| [supabase-wrappers](https://github.com/supabase/wrappers/archive/v0.4.5.tar.gz) | [0.4.5](https://github.com/supabase/wrappers/archive/v0.4.5.tar.gz) | Various Foreign Data Wrappers (FDWs) for PostreSQL |
| [supautils](https://github.com/supabase/supautils/archive/refs/tags/v2.6.0.tar.gz) | [2.6.0](https://github.com/supabase/supautils/archive/refs/tags/v2.6.0.tar.gz) | PostgreSQL extension for enhanced security |
| [timescaledb-apache](https://github.com/timescale/timescaledb/archive/2.16.1.tar.gz) | [2.16.1](https://github.com/timescale/timescaledb/archive/2.16.1.tar.gz) | Scales PostgreSQL for time-series data via automatic partitioning across time and space |
| [vault](https://github.com/supabase/vault/archive/refs/tags/v0.2.9.tar.gz) | [0.2.9](https://github.com/supabase/vault/archive/refs/tags/v0.2.9.tar.gz) | Store encrypted secrets in PostgreSQL |
| [vault](https://github.com/supabase/vault/archive/refs/tags/v0.3.1.tar.gz) | [0.3.1](https://github.com/supabase/vault/archive/refs/tags/v0.3.1.tar.gz) | Store encrypted secrets in PostgreSQL |
| [wal2json](https://github.com/eulerto/wal2json/archive/wal2json_2_6.tar.gz) | [2_6](https://github.com/eulerto/wal2json/archive/wal2json_2_6.tar.gz) | PostgreSQL JSON output plugin for changeset extraction |

### PostgreSQL 17 Extensions
Expand All @@ -51,7 +51,6 @@ Unmodified Postgres with some useful plugins. Our goal with this repo is not to
| [hypopg](https://github.com/HypoPG/hypopg/archive/refs/tags/1.4.1.tar.gz) | [1.4.1](https://github.com/HypoPG/hypopg/archive/refs/tags/1.4.1.tar.gz) | Hypothetical Indexes for PostgreSQL |
| [index_advisor](https://github.com/olirice/index_advisor/archive/v0.2.0.tar.gz) | [0.2.0](https://github.com/olirice/index_advisor/archive/v0.2.0.tar.gz) | Recommend indexes to improve query performance in PostgreSQL |
| [pg-safeupdate](https://github.com/eradman/pg-safeupdate/archive/1.4.tar.gz) | [1.4](https://github.com/eradman/pg-safeupdate/archive/1.4.tar.gz) | A simple extension to PostgreSQL that requires criteria for UPDATE and DELETE |
| [pg_backtrace](https://github.com/pashkinelfe/pg_backtrace/archive/d100bac815a7365e199263f5b3741baf71b14c70.tar.gz) | [1.1](https://github.com/pashkinelfe/pg_backtrace/archive/d100bac815a7365e199263f5b3741baf71b14c70.tar.gz) | Updated fork of pg_backtrace |
| [pg_cron](https://github.com/citusdata/pg_cron/archive/v1.6.4.tar.gz) | [1.6.4](https://github.com/citusdata/pg_cron/archive/v1.6.4.tar.gz) | Run Cron jobs through PostgreSQL |
| [pg_graphql](https://github.com/supabase/pg_graphql/archive/v1.5.11.tar.gz) | [1.5.11](https://github.com/supabase/pg_graphql/archive/v1.5.11.tar.gz) | GraphQL support for PostreSQL |
| [pg_hashids](https://github.com/iCyberon/pg_hashids/archive/cd0e1b31d52b394a0df64079406a14a4f7387cd6.tar.gz) | [cd0e1b31d52b394a0df64079406a14a4f7387cd6](https://github.com/iCyberon/pg_hashids/archive/cd0e1b31d52b394a0df64079406a14a4f7387cd6.tar.gz) | Generate short unique IDs in PostgreSQL |
Expand All @@ -72,17 +71,17 @@ Unmodified Postgres with some useful plugins. Our goal with this repo is not to
| [plpgsql-check](https://github.com/okbob/plpgsql_check/archive/v2.7.11.tar.gz) | [2.7.11](https://github.com/okbob/plpgsql_check/archive/v2.7.11.tar.gz) | Linter tool for language PL/pgSQL |
| [postgis](https://download.osgeo.org/postgis/source/postgis-3.3.7.tar.gz) | [3.3.7](https://download.osgeo.org/postgis/source/postgis-3.3.7.tar.gz) | Geographic Objects for PostgreSQL |
| [rum](https://github.com/postgrespro/rum/archive/1.3.14.tar.gz) | [1.3.14](https://github.com/postgrespro/rum/archive/1.3.14.tar.gz) | Full text search index method for PostgreSQL |
| [supabase-wrappers](https://github.com/supabase/wrappers/archive/v0.4.4.tar.gz) | [0.4.4](https://github.com/supabase/wrappers/archive/v0.4.4.tar.gz) | Various Foreign Data Wrappers (FDWs) for PostreSQL |
| [supabase-wrappers](https://github.com/supabase/wrappers/archive/v0.4.5.tar.gz) | [0.4.5](https://github.com/supabase/wrappers/archive/v0.4.5.tar.gz) | Various Foreign Data Wrappers (FDWs) for PostreSQL |
| [supautils](https://github.com/supabase/supautils/archive/refs/tags/v2.6.0.tar.gz) | [2.6.0](https://github.com/supabase/supautils/archive/refs/tags/v2.6.0.tar.gz) | PostgreSQL extension for enhanced security |
| [vault](https://github.com/supabase/vault/archive/refs/tags/v0.2.9.tar.gz) | [0.2.9](https://github.com/supabase/vault/archive/refs/tags/v0.2.9.tar.gz) | Store encrypted secrets in PostgreSQL |
| [vault](https://github.com/supabase/vault/archive/refs/tags/v0.3.1.tar.gz) | [0.3.1](https://github.com/supabase/vault/archive/refs/tags/v0.3.1.tar.gz) | Store encrypted secrets in PostgreSQL |
| [wal2json](https://github.com/eulerto/wal2json/archive/wal2json_2_6.tar.gz) | [2_6](https://github.com/eulerto/wal2json/archive/wal2json_2_6.tar.gz) | PostgreSQL JSON output plugin for changeset extraction |

### PostgreSQL orioledb-17 Extensions
| Extension | Version | Description |
| ------------- | :-------------: | ------------- |
| [hypopg](https://github.com/HypoPG/hypopg/archive/refs/tags/1.4.1.tar.gz) | [1.4.1](https://github.com/HypoPG/hypopg/archive/refs/tags/1.4.1.tar.gz) | Hypothetical Indexes for PostgreSQL |
| [index_advisor](https://github.com/olirice/index_advisor/archive/v0.2.0.tar.gz) | [0.2.0](https://github.com/olirice/index_advisor/archive/v0.2.0.tar.gz) | Recommend indexes to improve query performance in PostgreSQL |
| [orioledb](https://github.com/orioledb/orioledb/archive/beta9.tar.gz) | [orioledb](https://github.com/orioledb/orioledb/archive/beta9.tar.gz) | orioledb |
| [orioledb](https://github.com/orioledb/orioledb/archive/beta10.tar.gz) | [orioledb](https://github.com/orioledb/orioledb/archive/beta10.tar.gz) | orioledb |
| [pg-safeupdate](https://github.com/eradman/pg-safeupdate/archive/1.4.tar.gz) | [1.4](https://github.com/eradman/pg-safeupdate/archive/1.4.tar.gz) | A simple extension to PostgreSQL that requires criteria for UPDATE and DELETE |
| [pg_cron](https://github.com/citusdata/pg_cron/archive/v1.6.4.tar.gz) | [1.6.4](https://github.com/citusdata/pg_cron/archive/v1.6.4.tar.gz) | Run Cron jobs through PostgreSQL |
| [pg_graphql](https://github.com/supabase/pg_graphql/archive/v1.5.11.tar.gz) | [1.5.11](https://github.com/supabase/pg_graphql/archive/v1.5.11.tar.gz) | GraphQL support for PostreSQL |
Expand All @@ -106,7 +105,7 @@ Unmodified Postgres with some useful plugins. Our goal with this repo is not to
| [rum](https://github.com/postgrespro/rum/archive/1.3.14.tar.gz) | [1.3.14](https://github.com/postgrespro/rum/archive/1.3.14.tar.gz) | Full text search index method for PostgreSQL |
| [supabase-wrappers](https://github.com/supabase/wrappers/archive/v0.4.5.tar.gz) | [0.4.5](https://github.com/supabase/wrappers/archive/v0.4.5.tar.gz) | Various Foreign Data Wrappers (FDWs) for PostreSQL |
| [supautils](https://github.com/supabase/supautils/archive/refs/tags/v2.6.0.tar.gz) | [2.6.0](https://github.com/supabase/supautils/archive/refs/tags/v2.6.0.tar.gz) | PostgreSQL extension for enhanced security |
| [vault](https://github.com/supabase/vault/archive/refs/tags/v0.2.9.tar.gz) | [0.2.9](https://github.com/supabase/vault/archive/refs/tags/v0.2.9.tar.gz) | Store encrypted secrets in PostgreSQL |
| [vault](https://github.com/supabase/vault/archive/refs/tags/v0.3.1.tar.gz) | [0.3.1](https://github.com/supabase/vault/archive/refs/tags/v0.3.1.tar.gz) | Store encrypted secrets in PostgreSQL |
| [wal2json](https://github.com/eulerto/wal2json/archive/wal2json_2_6.tar.gz) | [2_6](https://github.com/eulerto/wal2json/archive/wal2json_2_6.tar.gz) | PostgreSQL JSON output plugin for changeset extraction |
## Additional Goodies
*This is only available for our AWS EC2*
Expand Down Expand Up @@ -158,4 +157,4 @@ TODO: find way to automate this

We are building the features of Firebase using enterprise-grade, open source products. We support existing communities wherever possible, and if the products don’t exist we build them and open source them ourselves.

[![New Sponsor](https://user-images.githubusercontent.com/10214025/90518111-e74bbb00-e198-11ea-8f88-c9e3c1aa4b5b.png)](https://github.com/sponsors/supabase)
[![New Sponsor](https://user-images.githubusercontent.com/10214025/90518111-e74bbb00-e198-11ea-8f88-c9e3c1aa4b5b.png)](https://github.com/sponsors/supabase)
4 changes: 2 additions & 2 deletions amazon-arm64-nix.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
variable "ami" {
type = string
default = "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-*"
default = "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-*"
}

variable "profile" {
Expand Down Expand Up @@ -115,7 +115,7 @@ source "amazon-ebssurrogate" "source" {
#secret_key = "${var.aws_secret_key}"
force_deregister = var.force-deregister

# Use latest official ubuntu focal ami owned by Canonical.
# Use latest official ubuntu noble ami owned by Canonical.
source_ami_filter {
filters = {
virtualization-type = "hvm"
Expand Down
3 changes: 0 additions & 3 deletions ansible/files/permission_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"backup": [{"groupname": "backup", "username": "backup"}],
"list": [{"groupname": "list", "username": "list"}],
"irc": [{"groupname": "irc", "username": "irc"}],
"gnats": [{"groupname": "gnats", "username": "gnats"}],
"nobody": [{"groupname": "nogroup", "username": "nobody"}],
"systemd-network": [
{"groupname": "systemd-network", "username": "systemd-network"}
Expand Down Expand Up @@ -216,7 +215,6 @@ def main():
"backup",
"list",
"irc",
"gnats",
"nobody",
"systemd-network",
"systemd-resolve",
Expand All @@ -233,7 +231,6 @@ def main():
"adminapi",
"postgrest",
"tcpdump",
"systemd-coredump",
]
if not qemu_artifact:
usernames.append("ec2-instance-connect")
Expand Down
2 changes: 1 addition & 1 deletion ansible/tasks/setup-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

- name: Postgres - install server
apt:
name: postgresql-{{ postgresql_major }}={{ postgresql_release }}-1.pgdg20.04+1
name: postgresql-{{ postgresql_major }}={{ postgresql_release }}-1.pgdg24.04+1
install_recommends: no
when: debpkg_mode

Expand Down
4 changes: 2 additions & 2 deletions ansible/tasks/setup-postgrest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

- name: PostgREST - add Postgres PPA
apt_repository:
repo: "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg {{ postgresql_major }}"
repo: "deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg {{ postgresql_major }}"
state: present

- name: PostgREST - update apt cache
Expand All @@ -30,7 +30,7 @@

- name: PostgREST - remove Postgres PPA
apt_repository:
repo: "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg {{ postgresql_major }}"
repo: "deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg {{ postgresql_major }}"
state: absent

- name: postgis - ensure dependencies do not get autoremoved
Expand Down
4 changes: 0 additions & 4 deletions ansible/tasks/setup-wal-g.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
owner: wal-g
group: wal-g
mode: '0664'
when: stage2_nix

- name: Move custom wal-g.conf file to /etc/postgresql-custom/wal-g.conf
template:
Expand All @@ -67,7 +66,6 @@
mode: 0664
owner: postgres
group: postgres
when: stage2_nix

- name: Add script to be run for restore_command
template:
Expand All @@ -76,15 +74,13 @@
mode: 0500
owner: postgres
group: postgres
when: stage2_nix

- name: Add helper script for wal_fetch.sh
template:
src: "files/walg_helper_scripts/wal_change_ownership.sh"
dest: /root/wal_change_ownership.sh
mode: 0700
owner: root
when: stage2_nix

- name: Include /etc/postgresql-custom/wal-g.conf in postgresql.conf
become: yes
Expand Down
14 changes: 7 additions & 7 deletions ansible/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ postgres_major:

# Full version strings for each major version
postgres_release:
postgresorioledb-17: "17.0.1.065-orioledb"
postgres17: "17.4.1.015"
postgres15: "15.8.1.072"
postgresorioledb-17: "17.0.1.065-orioledb-rc-2"
postgres17: "17.4.1.015-rc-2"
postgres15: "15.8.1.072-rc-2"

# Non Postgres Extensions
pgbouncer_release: "1.19.0"
Expand All @@ -31,16 +31,16 @@ aws_cli_release: "2.23.11"

salt_minion_version: 3007

golang_version: "1.19.3"
golang_version: "1.22.11"
golang_version_checksum:
arm64: sha256:99de2fe112a52ab748fb175edea64b313a0c8d51d6157dba683a6be163fd5eab
amd64: sha256:74b9640724fd4e6bb0ed2a1bc44ae813a03f1e72a4c76253e2d5c015494430ba
arm64: sha256:0fc88d966d33896384fbde56e9a8d80a305dc17a9f48f1832e061724b1719991
amd64: sha256:9ebfcab26801fa4cf0627c6439db7a4da4d3c6766142a3dd83508240e4f21031

envoy_release: 1.28.0
envoy_release_checksum: sha1:b0a06e9cfb170f1993f369beaa5aa9d7ec679ce5
envoy_hot_restarter_release_checksum: sha1:6d43b89d266fb2427a4b51756b649883b0617eda

kong_release_target: focal # if it works, it works
kong_release_target: focal
kong_deb: kong_2.8.1_arm64.deb
kong_deb_checksum: sha1:2086f6ccf8454fe64435252fea4d29d736d7ec61

Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG ubuntu_release=focal
ARG ubuntu_release=noble
FROM ubuntu:${ubuntu_release} as base

ARG ubuntu_release=flocal
ARG ubuntu_release_no=20.04
ARG ubuntu_release_no=24.04
ARG postgresql_major=15
ARG postgresql_release=${postgresql_major}.1

Expand Down
20 changes: 10 additions & 10 deletions ebssurrogate/files/sources-arm64.cfg
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ focal main restricted
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ focal universe
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ focal-updates universe
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ focal multiverse
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ focal-updates multiverse
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted universe multiverse
deb http://ports.ubuntu.com/ubuntu-ports focal-security main restricted
deb http://ports.ubuntu.com/ubuntu-ports focal-security universe
deb http://ports.ubuntu.com/ubuntu-ports focal-security multiverse
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ noble main restricted
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ noble-updates main restricted
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ noble universe
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ noble-updates universe
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ noble multiverse
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ noble-updates multiverse
deb http://REGION.clouds.ports.ubuntu.com/ubuntu-ports/ noble-backports main restricted universe multiverse
deb http://ports.ubuntu.com/ubuntu-ports noble-security main restricted
deb http://ports.ubuntu.com/ubuntu-ports noble-security universe
deb http://ports.ubuntu.com/ubuntu-ports noble-security multiverse
Loading