Skip to content

chore: qemu fixes for salt v2 integration #1803

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 26, 2025
Merged

chore: qemu fixes for salt v2 integration #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3735ba0
fix: adjust the qemu vars filename
darora Sep 25, 2025
f190e08
fix: templating of SAA service file
darora Sep 26, 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
2 changes: 1 addition & 1 deletion ..._config/supabase-admin-agent_salt.service → ...nfig/supabase-admin-agent_salt.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Requires=local-fs.target
[Service]
Type=oneshot
{% if qemu_mode is defined and qemu_mode %}
ExecStart=/opt/supabase-admin-agent/supabase-admin-agent --config /opt/supabase-admin-agent/config.yaml salt --apply --store-result --salt-archive configmainv3-main.tar.gz
ExecStart=/opt/supabase-admin-agent/supabase-admin-agent --config /opt/supabase-admin-agent/config.yaml salt --apply --store-result --salt-archive configmanv3-main.tar.gz
User=root
Group=root
{% else %}
Expand Down
4 changes: 2 additions & 2 deletions ansible/tasks/internal/supabase-admin-agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
dest: /etc/systemd/system/supabase-admin-agent_salt.timer

- name: supabase-admin-agent - create salt service file
copy:
src: files/supabase_admin_agent_config/supabase-admin-agent_salt.service
template:
src: files/supabase_admin_agent_config/supabase-admin-agent_salt.service.j2
dest: /etc/systemd/system/supabase-admin-agent_salt.service

- name: supabase-admin-agent - reload systemd
Expand Down
7 changes: 7 additions & 0 deletions ansible/tasks/setup-system.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
update_cache: yes
when: debpkg_mode or nixpkg_mode

- name: Install other useful tools
apt:
pkg:
- less
update_cache: yes
when: qemu_mode is defined

- name: Configure sysstat
copy:
src: files/sysstat.sysstat
Expand Down
6 changes: 3 additions & 3 deletions ansible/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ postgres_major:

# Full version strings for each major version
postgres_release:
postgresorioledb-17: 17.5.1.031-orioledb
postgres17: 17.6.1.010
postgres15: 15.14.1.010
postgresorioledb-17: 17.5.1.032-orioledb
postgres17: 17.6.1.011
postgres15: 15.14.1.011

# Non Postgres Extensions
pgbouncer_release: 1.19.0
Expand Down
4 changes: 2 additions & 2 deletions ebssurrogate/scripts/qemu-bootstrap-nix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ EOF
--extra-vars "postgresql_major_version=${POSTGRES_MAJOR_VERSION}" \
--extra-vars "postgresql_major=${POSTGRES_MAJOR_VERSION}" \
--extra-vars "psql_version=psql_${POSTGRES_MAJOR_VERSION}" \
--extra-vars @./ansible/qemu-vars.yml
--extra-vars @./ansible/qemu-vars.yaml
}

function setup_postgesql_env {
Expand Down Expand Up @@ -103,7 +103,7 @@ EOF
--extra-vars "postgresql_major_version=${POSTGRES_MAJOR_VERSION}" \
--extra-vars "postgresql_major=${POSTGRES_MAJOR_VERSION}" \
--extra-vars "psql_version=psql_${POSTGRES_MAJOR_VERSION}" \
--extra-vars @./ansible/qemu-vars.yml
--extra-vars @./ansible/qemu-vars.yaml
}

function clean_legacy_things {
Expand Down
8 changes: 3 additions & 5 deletions qemu_artifact.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,9 @@ For faster iteration, it's more convenient to build the image on an ubuntu bare-
list of packages installed on the EKS to build images:

```
apt-get install -y git emacs ripgrep vim-tiny byobu build-essential
wget -O - https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(grep -oP '(?<=UBUNTU_CODENAME=).*' /etc/os-release || lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
apt-cache update
apt-get install -y qemu-system qemu-system-arm qemu-utils qemu-efi-aarch64 libvirt-clients libvirt-daemon libqcow-utils software-properties-common git make libnbd-bin nbdkit fuse2fs cloud-image-utils awscli packer=1.11.2-1
apt-get install -y git emacs ripgrep vim-tiny byobu build-essential unzip
curl -L "https://releases.hashicorp.com/packer/1.14.1/packer_1.14.1_linux_$(dpkg --print-architecture).zip" -o packer.zip && unzip packer.zip && rm -f packer.zip && sudo mv packer /usr/local/bin/
apt-get install -y qemu-system qemu-system-arm qemu-utils qemu-efi-aarch64 libvirt-clients libvirt-daemon libqcow-utils software-properties-common git make libnbd-bin nbdkit fuse2fs cloud-image-utils
```

### Dependencies note
Expand Down