From 7ca1b8717e60a93c9d6d7dd304ca36a01abb5d3a Mon Sep 17 00:00:00 2001
From: Benjamin Ssempala <86492979+BenjaminSsempala@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:51:11 +0300
Subject: [PATCH 1/2] Adding Readiness checks and upscaling instances for
 Website

---
 .../workflows/deploy-frontends-to-production.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/deploy-frontends-to-production.yml b/.github/workflows/deploy-frontends-to-production.yml
index 80cc3ccd66..f609863be5 100644
--- a/.github/workflows/deploy-frontends-to-production.yml
+++ b/.github/workflows/deploy-frontends-to-production.yml
@@ -286,6 +286,12 @@ jobs:
           echo "runtime_config:" >> app.yaml
           echo "  operating_system: \"ubuntu22\"" >> app.yaml
           echo "  runtime_version: \"3.12\"" >> app.yaml
+          echo "readiness_check:" >> app.yaml
+          echo "  check_interval_sec: 5" >> app.yaml
+          echo "  timeout_sec: 4" >> app.yaml
+          echo "  failure_threshold: 2" >> app.yaml
+          echo "  success_threshold: 2" >> app.yaml
+          echo "  app_start_timeout_sec: 1800" >> app.yaml
           echo "========== Creating .env.yaml file =========="  
           echo "env_variables:" > .env.yaml
           echo "  SECRET: ${{ secrets.WEBSITE_SECRET }}" >> .env.yaml
@@ -295,6 +301,11 @@ jobs:
           echo "  DEBUG: False" >> .env.yaml
           echo "  GOOGLE_APPLICATION_CREDENTIALS: /app/google_application_credentials.json" >> .env.yaml
 
+      - name: Temporarily Increase Min Instances
+        run: |
+          echo "========== Setting minimum instances to 2 for deployment =========="
+          gcloud app services update default --min-instances=2 --quiet
+
       - name: Build and Push Docker Image
         run: |
           cd website2/
@@ -314,6 +325,11 @@ jobs:
             --image-url=${{ env.REGISTRY_URL }}/${{ secrets.FRONTEND_PROJECT_ID }}/airqo-website2:latest \
             --project=${{ secrets.FRONTEND_PROJECT_ID }} \
             --quiet
+
+      - name: Restore Min Instances
+        run: |
+          echo "========== Restoring minimum instances to 1 after deployment =========="
+          gcloud app services update default --min-instances=1 --quiet
         
       - name: Delete Old Versions
         run: |-

From db038d74d8ed312297950f9fe7d58c135114ef09 Mon Sep 17 00:00:00 2001
From: Benjamin Ssempala <86492979+BenjaminSsempala@users.noreply.github.com>
Date: Mon, 27 Jan 2025 15:34:09 +0300
Subject: [PATCH 2/2] Modify timeout sec

---
 .github/workflows/deploy-frontends-to-production.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-frontends-to-production.yml b/.github/workflows/deploy-frontends-to-production.yml
index f609863be5..04d07fbba6 100644
--- a/.github/workflows/deploy-frontends-to-production.yml
+++ b/.github/workflows/deploy-frontends-to-production.yml
@@ -287,8 +287,8 @@ jobs:
           echo "  operating_system: \"ubuntu22\"" >> app.yaml
           echo "  runtime_version: \"3.12\"" >> app.yaml
           echo "readiness_check:" >> app.yaml
-          echo "  check_interval_sec: 5" >> app.yaml
-          echo "  timeout_sec: 4" >> app.yaml
+          echo "  check_interval_sec: 10" >> app.yaml
+          echo "  timeout_sec: 15" >> app.yaml
           echo "  failure_threshold: 2" >> app.yaml
           echo "  success_threshold: 2" >> app.yaml
           echo "  app_start_timeout_sec: 1800" >> app.yaml