From 3735ba04db1156b9ed4ba9f96e394e758ff52ac3 Mon Sep 17 00:00:00 2001 From: Div Arora Date: Fri, 26 Sep 2025 07:02:24 +0800 Subject: [PATCH 1/2] fix: adjust the qemu vars filename --- ebssurrogate/scripts/qemu-bootstrap-nix.sh | 4 ++-- qemu_artifact.md | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ebssurrogate/scripts/qemu-bootstrap-nix.sh b/ebssurrogate/scripts/qemu-bootstrap-nix.sh index 81bd13229..0b21959c3 100755 --- a/ebssurrogate/scripts/qemu-bootstrap-nix.sh +++ b/ebssurrogate/scripts/qemu-bootstrap-nix.sh @@ -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 { @@ -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 { diff --git a/qemu_artifact.md b/qemu_artifact.md index 20a33f5c1..bc71d7009 100644 --- a/qemu_artifact.md +++ b/qemu_artifact.md @@ -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 From f190e08f89f2e7c95e534ed98c4e86b0d33fa98c Mon Sep 17 00:00:00 2001 From: Div Arora Date: Fri, 26 Sep 2025 12:26:10 +0800 Subject: [PATCH 2/2] fix: templating of SAA service file --- ...t_salt.service => supabase-admin-agent_salt.service.j2} | 2 +- ansible/tasks/internal/supabase-admin-agent.yml | 4 ++-- ansible/tasks/setup-system.yml | 7 +++++++ ansible/vars.yml | 6 +++--- 4 files changed, 13 insertions(+), 6 deletions(-) rename ansible/files/supabase_admin_agent_config/{supabase-admin-agent_salt.service => supabase-admin-agent_salt.service.j2} (94%) diff --git a/ansible/files/supabase_admin_agent_config/supabase-admin-agent_salt.service b/ansible/files/supabase_admin_agent_config/supabase-admin-agent_salt.service.j2 similarity index 94% rename from ansible/files/supabase_admin_agent_config/supabase-admin-agent_salt.service rename to ansible/files/supabase_admin_agent_config/supabase-admin-agent_salt.service.j2 index 948c65e45..33b506df4 100644 --- a/ansible/files/supabase_admin_agent_config/supabase-admin-agent_salt.service +++ b/ansible/files/supabase_admin_agent_config/supabase-admin-agent_salt.service.j2 @@ -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 %} diff --git a/ansible/tasks/internal/supabase-admin-agent.yml b/ansible/tasks/internal/supabase-admin-agent.yml index 39756b674..0dfc4427a 100644 --- a/ansible/tasks/internal/supabase-admin-agent.yml +++ b/ansible/tasks/internal/supabase-admin-agent.yml @@ -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 diff --git a/ansible/tasks/setup-system.yml b/ansible/tasks/setup-system.yml index c0653811d..1f8abec62 100644 --- a/ansible/tasks/setup-system.yml +++ b/ansible/tasks/setup-system.yml @@ -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 diff --git a/ansible/vars.yml b/ansible/vars.yml index 37eb8341f..42c8cd3b5 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -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