chore: further ami build things

Author: darora

Dockerfile-kubevirt

@@ -1,2 +1,2 @@
 FROM scratch
-ADD --chown=107:107 focal.img /disk/focal.qcow2
+ADD --chown=107:107 focal-raw.img /disk/focal.qcow2

Makefile

@@ -13,7 +13,7 @@ disk/focal-raw.img: output-cloudimg/packer-cloudimg
 	sudo qemu-img convert -O raw output-cloudimg/packer-cloudimg disk/focal-raw.img
 
 container-disk-image: disk/focal-raw.img
-	sudo nerdctl build . -t supabase-postgres-test:$(GIT_SHA) --namespace k8s.io -f ./Dockerfile-kubevirt
+	docker build . -t supabase-postgres-test:$(GIT_SHA) -f ./Dockerfile-kubevirt
 
 host-disk: disk/focal-raw.img
 	sudo chown 107 -R disk

amazon-arm64-nix.pkr.hcl

@@ -264,7 +264,7 @@ build {
     ]
     use_env_var_file = true
     script = "ebssurrogate/scripts/surrogate-bootstrap-nix.sh"
-    execute_command = "sudo -S sh -c '. {{.EnvVarFile}} && {{.Path}}'"
+    execute_command = "sudo -S sh -c '. {{.EnvVarFile}} && cd /tmp/ansible-playbook && {{.Path}}'"
     start_retry_timeout = "5m"
     skip_clean = true
   }

ansible/files/permission_check.py

@@ -223,4 +223,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()

ansible/playbook.yml

@@ -1,4 +1,4 @@
-- hosts: localhost
+- hosts: all
   become: yes
 
   pre_tasks:
@@ -142,6 +142,18 @@
       import_tasks: tasks/setup-fail2ban.yml
       when: debpkg_mode or nixpkg_mode
 
+
+    # Install EC2 instance connect
+    # Only for AWS images
+    - name: install EC2 instance connect
+      become: yes
+      apt:
+        pkg:
+          - ec2-instance-connect
+      tags:
+        - aws-only
+      when: qemu_mode is undefined
+
     # Install this at the end to prevent it from kicking in during the apt process, causing conflicts
     - name: Install security tools
       become: yes

ansible/tasks/setup-postgres.yml

@@ -241,7 +241,7 @@
   shell: |
     mkdir -p /run/postgresql
     chown -R postgres:postgres /run/postgresql
-  when: stage2_nix
+  when: stage2_nix and qemu_mode
 
 - name: Restart Postgres Database without Systemd
   become: yes

ebssurrogate/scripts/qemu-bootstrap-nix.sh

@@ -72,6 +72,8 @@ EOF
 	locale-gen en_US.UTF-8
 }
 
+sed -i 's/- hosts: all/- hosts: localhost/' ansible/playbook.yml
+
 waitfor_boot_finished
 install_packages
 setup_postgesql_env
@@ -92,7 +94,6 @@ function execute_stage2_playbook {
 [defaults]
 callbacks_enabled = timer, profile_tasks, profile_roles
 EOF
-    # sed -i 's/- hosts: all/- hosts: localhost/' /tmp/ansible-playbook/ansible/playbook.yml
     # Run Ansible playbook
     export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_REMOTE_TEMP=/tmp
     ansible-playbook ./ansible/playbook.yml \