chore: better os-version specific handling

Author: pcnc

.github/workflows/ami-build-ubuntu-18.yml

@@ -2,12 +2,13 @@ name: Build Ubuntu 18 AMI
 
 on:
   push:
-    branches:
-      - develop
-      - pcnc/build-glibc227-bin
-    # paths:
-    #   - '.github/workflows/ami-build-ubuntu-18.yml'
-    #   - 'common.vars.pkr.hcl'
+    paths:
+      - '.github/workflows/ami-build-ubuntu-18.yml'
+  workflow_run:
+    workflows: [Release AMI]
+    types:
+      - completed
+
   workflow_dispatch:
 
 jobs:
@@ -26,8 +27,7 @@ jobs:
       - name: Build AMI
         run: |
           GIT_SHA=${{github.sha}}
-          # packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=u18-${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common.vars.pkr.hcl" -var "ami=ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-arm64-server-*" -var "ami_name=builder-supabase-postgres-u18" -var ansible_arguments="ebssurrogate_mode='true' --skip-tags 'install-supabase-internal,migrations,unit-tests'" amazon-arm64.pkr.hcl
-          packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=u18-${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common.vars.pkr.hcl" -var "ami=ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-arm64-server-*" -var "ami_name=builder-supabase-postgres-u18" -var ansible_arguments="ebssurrogate_mode='true' --skip-tags 'install-supabase-internal,ubuntu-18-incompatible'" amazon-arm64.pkr.hcl
+          packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=u18-${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common.vars.pkr.hcl" -var-file="legacy.vars.pkr.hcl" amazon-arm64.pkr.hcl
 
       - name: Grab release version
         id: process_release_version
@@ -58,21 +58,22 @@ jobs:
 
       - name: Upload pg binaries to s3 prod
         run: |
-          aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/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/${{ steps.process_release_version.outputs.version }}/18.04.tar.gz
 
       - name: Deregister image
         if: ${{ always() }}
+        continue-on-error: true
         run: |
           IMAGE_IDS=$(aws ec2 describe-images --filters "Name=name,Values=builder-supabase-postgres-u18-*" --query "Images[] .ImageId" --output text)
           for IMAGE_ID in $IMAGE_IDS; do
             SNAPSHOTS=$(aws ec2 describe-images --image-ids $IMAGE_ID --query "Images[*].BlockDeviceMappings[*].Ebs.SnapshotId" --output text)
 
             echo "Deregistering image $IMAGE_ID"
-            # aws ec2 deregister-image --image-id $IMAGE_ID
+            aws ec2 deregister-image --image-id $IMAGE_ID
 
             for SNAPSHOT in $SNAPSHOTS; do
               echo "Deleting snapshot $SNAPSHOT"
-              # aws ec2 delete-snapshot --snapshot-id $SNAPSHOT
+              aws ec2 delete-snapshot --snapshot-id $SNAPSHOT
             done
           done
 

.github/workflows/ami-release.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Build AMI
         run: |
           GIT_SHA=${{github.sha}}
-          packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common.vars.pkr.hcl" amazon-arm64.pkr.hcl
+          packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common.vars.pkr.hcl" -var "ansible_arguments="  amazon-arm64.pkr.hcl
 
       - name: Grab release version
         id: process_release_version
@@ -47,6 +47,10 @@ jobs:
             -e "internal_artifacts_bucket=${{ secrets.ARTIFACTS_BUCKET }}" \
             manifest-playbook.yml
 
+      - name: Upload pg binaries to s3 staging
+        run: |
+          aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
+    
       - name: configure aws credentials - prod
         uses: aws-actions/configure-aws-credentials@v1
         with:
@@ -61,6 +65,10 @@ jobs:
             -e "internal_artifacts_bucket=${{ secrets.PROD_ARTIFACTS_BUCKET }}" \
             manifest-playbook.yml
 
+      - name: Upload pg binaries to s3 prod
+        run: |
+          aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
+    
       - name: Create release
         uses: softprops/action-gh-release@v1
         with:

amazon-arm64.pkr.hcl

@@ -20,7 +20,7 @@ variable "ami_regions" {
 
 variable "ansible_arguments" {
   type    = string
-  default = "--skip-tags,install-postgrest,--skip-tags,install-pgbouncer,--skip-tags,install-supabase-internal,ebssurrogate_mode='true'"
+  default = "--skip-tags install-postgrest,install-pgbouncer,install-supabase-internal"
 }
 
 variable "aws_access_key" {
@@ -239,8 +239,9 @@ build {
       "DOCKER_IMAGE=${var.docker_image}",
       "DOCKER_IMAGE_TAG=${var.docker_image_tag}"
     ]
+    use_env_var_file = true
     script = "ebssurrogate/scripts/surrogate-bootstrap.sh"
-    execute_command = "sudo -S sh -c '{{ .Vars }} {{ .Path }}'"
+    execute_command = "sudo -S sh -c '. {{.EnvVarFile}} && {{.Path}}'"
     start_retry_timeout = "5m"
     skip_clean = true
   }

ansible/playbook.yml

@@ -172,4 +172,4 @@
     - name: Collect Postgres binaries
       import_tasks: tasks/internal/collect-pg-binaries.yml
       tags:
-        - install-supabase-internal
+        - collect-binaries

ansible/tasks/setup-extensions.yml

@@ -39,6 +39,8 @@
 
 - name: Install pljava
   import_tasks: tasks/postgres-extensions/12-pljava.yml
+  tags:
+    - legacy-incompatible
 
 - name: Install pg_plan_filter
   import_tasks: tasks/postgres-extensions/14-pg_plan_filter.yml
@@ -58,7 +60,7 @@
 - name: Install pg_graphql
   import_tasks: tasks/postgres-extensions/19-pg_graphql.yml
   tags:
-    - ubuntu-18-incompatible
+    - legacy-incompatible
 
 - name: Install pg_stat_monitor
   import_tasks: tasks/postgres-extensions/20-pg_stat_monitor.yml

common.vars.pkr.hcl

@@ -1 +1 @@
-postgres-version = "15.1.0.67"
+postgres-version = "15.1.0.67-versioned-bins-4"

ebssurrogate/scripts/surrogate-bootstrap.sh

@@ -40,9 +40,7 @@ function install_packages {
 		gdisk \
 		e2fsprogs \
 		debootstrap \
-		nvme-cli \
-		docker.io 
-
+		nvme-cli
 }
 
 # Partition the new root EBS volume
@@ -126,6 +124,7 @@ function format_build_partition {
 	mkfs.ext4 -O ^has_journal /dev/xvdc
 }
 function pull_docker {
+	apt-get install -y docker.io
 	docker run -itd --name ccachedata "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}" sh
 	docker exec -itd ccachedata mkdir -p /build/ccache
 }
@@ -213,8 +212,8 @@ callbacks_enabled = timer, profile_tasks, profile_roles
 EOF
 	# Run Ansible playbook
 	#export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_DEBUG=True && export ANSIBLE_REMOTE_TEMP=/mnt/tmp 
-	export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_REMOTE_TEMP=/mnt/tmp 
-	ansible-playbook -c chroot -i '/mnt,' /tmp/ansible-playbook/ansible/playbook.yml --extra-vars " $ARGS"
+	export ANSIBLE_LOG_PATH=/tmp/ansible.log && export ANSIBLE_REMOTE_TEMP=/mnt/tmp
+	ansible-playbook -c chroot -i '/mnt,' /tmp/ansible-playbook/ansible/playbook.yml $ARGS
 }
 
 function update_systemd_services {
@@ -246,20 +245,27 @@ function clean_system {
 	touch /mnt/var/log/auth.log
 
 	touch /mnt/var/log/pgbouncer.log
-	chroot /mnt /usr/bin/chown pgbouncer:postgres /var/log/pgbouncer.log
+	if [ -f /usr/bin/chown ]; then
+		chroot /mnt /usr/bin/chown pgbouncer:postgres /var/log/pgbouncer.log
+	fi
 
 	# Setup postgresql logs
 	mkdir -p /mnt/var/log/postgresql
-	chroot /mnt /usr/bin/chown postgres:postgres /var/log/postgresql
+	if [ -f /usr/bin/chown ]; then
+		chroot /mnt /usr/bin/chown postgres:postgres /var/log/postgresql
+	fi
 
 	# Setup wal-g logs
 	mkdir /mnt/var/log/wal-g
 	touch /mnt/var/log/wal-g/{backup-push.log,backup-fetch.log,wal-push.log,wal-fetch.log}
-	chroot /mnt /usr/bin/chown -R postgres:postgres /var/log/wal-g
-	chroot /mnt /usr/bin/chmod -R 0300 /var/log/wal-g
 
-        # audit logs directory for apparmor
-        mkdir /mnt/var/log/audit
+	if [ -f /usr/bin/chown ]; then
+		chroot /mnt /usr/bin/chown -R postgres:postgres /var/log/wal-g
+		chroot /mnt /usr/bin/chmod -R 0300 /var/log/wal-g
+	fi
+
+	# audit logs directory for apparmor
+	mkdir /mnt/var/log/audit
 
 	# unwanted files
 	rm -rf /mnt/var/lib/apt/lists/*

legacy.vars.pkr.hcl

@@ -0,0 +1,3 @@
+ansible_arguments="--skip-tags install-supabase-internal,install-pgbouncer,legacy-incompatible,migrations,unit-tests,aws-only"
+ami_name="builder-supabase-postgres-u18"
+ami="ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-arm64-server-*"

scripts/90-cleanup.sh

@@ -36,8 +36,13 @@ elif [ -n "$(command -v apt-get)" ]; then
 	libicu-dev \
 	libcgal-dev \
 	libgcc-9-dev \
-	libgcc-8-dev \
-	linux-headers-5.11.0-1021-aws
+	libgcc-8-dev
+
+  source /etc/os-release
+  if [ "${UBUNTU_VERSION}" != "bionic" ]; then
+	apt-get -y remove --purge linux-headers-5.11.0-1021-aws
+  fi
+
   apt-get -y update
   apt-get -y upgrade
   apt-get -y autoremove