Skip to content

Commit 02ec87f

Browse files
samrosedaroralaurenceisla
authored
feat: advance to ubuntu 24.04 (#1416)
* feat: wip advance to ubuntu 24.04 * fix; missing gp3 on image string * chore: non-interactive * chore: set hostname in dhcp client * chore: conform to new networking approach * ore: reverse he sha values * chore: fix kong address * ore: typo in url * chore: drop old removals * chore: remove defunct package * chore: restore wal-g build approach * chore: permission check and restore kong original version * chore: log output to debug * chore: increase wait time before health checks. * chore: post rebase cleanup * Update README.md Co-authored-by: Div Arora <[email protected]> * chore: restore function * chore: remove unused file * chore: make command non-interactive * chore: readme script * chore: ubuntu 24.04 has moved to use networkd and netplan by default, ... rather than the traditional dhclient.conf approach. * chore: update README * chore: bump versions for staging release/testing * chore: keep kong pinned to this version, was not meant to change * fix: tmp use 20.04 untl worker scripts can be rewritten * feat: netplan security and apply * fix: netplan apply after upgrade * fix: transitional file name structure * feat: netplan apply * feat: Remove Requisite to prevent being killed when restarting networkd * fix: fix_ipv6 timer not needed in ubuntu 24-04 * feat: restore check and fix but disabled * chore: update qemu artifact to noble base Also makes the VM artifact release agnostic. * fix: restore stage for wal-g tasks to stage 2 * fix: removing arbitrary netplan apply * fix: file path * feat: postgrest 13.0.4 (#1685) * fix: url of postgrest download * Update ansible/vars.yml Co-authored-by: Laurence Isla <[email protected]> * fix: correct URL for release * fix: correct url here too * chore: bump version for release --------- Co-authored-by: Div Arora <[email protected]> Co-authored-by: Div Arora <[email protected]> Co-authored-by: Laurence Isla <[email protected]>
1 parent 0147180 commit 02ec87f

33 files changed

+98
-82
lines changed

‎.github/workflows/ami-release-nix-single.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ jobs:
103103
- name: Upload nix flake revision to s3 staging
104104
run: |
105105
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
106+
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
107+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
106108
107109
- name: configure aws credentials - prod
108110
uses: aws-actions/configure-aws-credentials@v4
@@ -122,6 +124,8 @@ jobs:
122124
- name: Upload nix flake revision to s3 prod
123125
run: |
124126
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
127+
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
128+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
125129
126130
- name: Create release
127131
uses: softprops/action-gh-release@v2

‎.github/workflows/ami-release-nix.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ jobs:
125125
- name: Upload nix flake revision to s3 staging
126126
run: |
127127
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
128+
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
129+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
128130
129131
- name: configure aws credentials - prod
130132
uses: aws-actions/configure-aws-credentials@v4
@@ -144,6 +146,8 @@ jobs:
144146
- name: Upload nix flake revision to s3 prod
145147
run: |
146148
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
149+
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
150+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
147151
148152
- name: Create release
149153
uses: softprops/action-gh-release@v2

‎.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ jobs:
6666

6767
- name: Upload pg_upgrade scripts to s3 staging
6868
run: |
69-
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"
69+
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
70+
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
71+
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
7072
7173
- name: Slack Notification on Failure
7274
if: ${{ failure() }}
@@ -113,7 +115,9 @@ jobs:
113115

114116
- name: Upload pg_upgrade scripts to s3 prod
115117
run: |
116-
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"
118+
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
119+
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
120+
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/upgrade_bundle.tar.gz
117121
118122
- name: Slack Notification on Failure
119123
if: ${{ failure() }}

‎.github/workflows/testinfra-ami-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
include:
3535
- runner: arm-runner
3636
arch: arm64
37-
ubuntu_release: focal
38-
ubuntu_version: 20.04
37+
ubuntu_release: noble
38+
ubuntu_version: 24.04
3939
mcpu: neoverse-n1
4040
runs-on: ${{ matrix.runner }}
4141
timeout-minutes: 150

‎Dockerfile-15‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ARG index_advisor_release=0.2.0
3838
ARG supautils_release=2.2.0
3939
ARG wal_g_release=2.0.1
4040

41-
FROM ubuntu:focal as base
41+
FROM ubuntu:noble as base
4242

4343
RUN apt update -y && apt install -y \
4444
curl \

‎Dockerfile-kubernetes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine:3.22
22

3-
ADD ./output-cloudimg/packer-cloudimg /disk/focal.qcow2
3+
ADD ./output-cloudimg/packer-cloudimg /disk/image.qcow2
44

55
RUN apk add --no-cache qemu-system-aarch64 qemu-img openssh-client aavmf virtiofsd \
66
&& truncate -s 64M /root/varstore.img \

‎Dockerfile-orioledb-17‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ARG index_advisor_release=0.2.0
3939
ARG supautils_release=2.2.0
4040
ARG wal_g_release=3.0.5
4141

42-
FROM ubuntu:focal as base
42+
FROM ubuntu:noble as base
4343

4444
RUN apt update -y && apt install -y \
4545
curl \

‎Makefile‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ init: qemu-arm64-nix.pkr.hcl
77
output-cloudimg/packer-cloudimg: ansible qemu-arm64-nix.pkr.hcl
88
packer build -var "git_sha=$(UPSTREAM_NIX_GIT_SHA)" qemu-arm64-nix.pkr.hcl
99

10-
disk/focal-raw.img: output-cloudimg/packer-cloudimg
11-
mkdir -p disk
12-
sudo qemu-img convert -O raw output-cloudimg/packer-cloudimg disk/focal-raw.img
13-
1410
alpine-image: output-cloudimg/packer-cloudimg
1511
sudo nerdctl build . -t supabase-postgres-test:$(GIT_SHA) -f ./Dockerfile-kubernetes
1612

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Unmodified Postgres with some useful plugins. Our goal with this repo is not to
66
- ✅ Postgres [postgresql-15.8](https://www.postgresql.org/docs/15/index.html)
77
- ✅ Postgres [postgresql-17.4](https://www.postgresql.org/docs/17/index.html)
88
- ✅ Postgres [orioledb-postgresql-17_6](https://github.com/orioledb/orioledb)
9-
- ✅ Ubuntu 20.04 (Focal Fossa).
9+
- ✅ Ubuntu 24.04 (Noble Numbat).
1010
- ✅ [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.
1111
- ✅ [Large Systems Extensions](https://github.com/aws/aws-graviton-getting-started#building-for-graviton-and-graviton2). Enabled for ARM images.
1212
## Extensions
@@ -115,7 +115,7 @@ Unmodified Postgres with some useful plugins. Our goal with this repo is not to
115115
| Goodie | Version | Description |
116116
| ------------- | :-------------: | ------------- |
117117
| [PgBouncer](https://www.pgbouncer.org/) | [1.19.0](http://www.pgbouncer.org/changelog.html#pgbouncer-119x) | Set up Connection Pooling. |
118-
| [PostgREST](https://postgrest.org/en/stable/) | [v12.2.3](https://github.com/PostgREST/postgrest/releases/tag/v12.2.3) | Instantly transform your database into an RESTful API. |
118+
| [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. |
119119
| [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. | -->
120120

121121
## Install

‎amazon-arm64-nix.pkr.hcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variable "ami" {
22
type = string
3-
default = "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-*"
3+
default = "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-*"
44
}
55

66
variable "profile" {
@@ -115,7 +115,7 @@ source "amazon-ebssurrogate" "source" {
115115
#secret_key = "${var.aws_secret_key}"
116116
force_deregister = var.force-deregister
117117

118-
# Use latest official ubuntu focal ami owned by Canonical.
118+
# Use latest official ubuntu noble ami owned by Canonical.
119119
source_ami_filter {
120120
filters = {
121121
virtualization-type = "hvm"

0 commit comments

Comments
 (0)