From 781073a6c4810dcbf40499da31c48e89651a9c16 Mon Sep 17 00:00:00 2001 From: vipin-dfe Date: Thu, 28 Nov 2024 14:57:03 +0000 Subject: [PATCH 1/3] Remove legacy prod jobs --- .github/workflows/build-and-deploy.yml | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index c67c32584..7970f13cc 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -89,31 +89,10 @@ jobs: image-tag: ${{ github.sha }} azure-credentials: ${{ secrets.AZURE_CREDENTIALS }} - deploy_prod: - name: Deploy to production environment - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' && github.event_name == 'push' - concurrency: deploy_prod - needs: [build_image, deploy_aks] - environment: - name: production - url: ${{ steps.deploy.outputs.environment_url }} - - steps: - - uses: actions/checkout@v4 - - - uses: ./.github/actions/deploy-environment - id: deploy - with: - environment_name: production - image_name_tag: ${{ needs.build_image.outputs.image_name_tag }} - image_tag: ${{ github.sha }} - azure_credentials: ${{ secrets.AZURE_CREDENTIALS }} - notify_slack_of_failures: name: Notify Slack of failures runs-on: ubuntu-latest - needs: [build_image, deploy_review_app_aks, deploy_aks, deploy_prod] + needs: [build_image, deploy_review_app_aks, deploy_aks] environment: aks-test env: ENVIRONMENT_NAME: ${{ needs.deploy_aks.outputs.environment_name || 'dev' }} @@ -135,9 +114,6 @@ jobs: elif ${{ needs.deploy_aks.result == 'failure' }} then job=deploy_aks - elif ${{ needs.deploy_prod.result == 'failure' }} - then - job=deploy_prod fi echo "JOB=${job}" >> $GITHUB_ENV From c00ba96ceaae8f0eb7da6d77d5b88eb6dbf4dd84 Mon Sep 17 00:00:00 2001 From: vipin-dfe Date: Mon, 2 Dec 2024 14:08:39 +0000 Subject: [PATCH 2/3] Update origin hostname to point to aks --- .../domains/environment_domains/config/production.tfvars.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/domains/environment_domains/config/production.tfvars.json b/terraform/domains/environment_domains/config/production.tfvars.json index 551d4f11f..5b5894189 100644 --- a/terraform/domains/environment_domains/config/production.tfvars.json +++ b/terraform/domains/environment_domains/config/production.tfvars.json @@ -11,7 +11,7 @@ "to-domain": "refer-serious-misconduct.education.gov.uk" } ], - "origin_hostname": "s165p01-rsm-production-app.azurewebsites.net" + "origin_hostname": "refer-serious-misconduct-production.teacherservices.cloud" } } } From 6f28dd6ecba1578bc0e0c7cef06aaff8420fb927 Mon Sep 17 00:00:00 2001 From: vipin-dfe Date: Mon, 2 Dec 2024 15:55:07 +0000 Subject: [PATCH 3/3] Set RSM worker replicas to 1 on AKS --- terraform/application/config/production.tfvars.json | 1 - 1 file changed, 1 deletion(-) diff --git a/terraform/application/config/production.tfvars.json b/terraform/application/config/production.tfvars.json index f3126ce30..d552dee06 100644 --- a/terraform/application/config/production.tfvars.json +++ b/terraform/application/config/production.tfvars.json @@ -5,7 +5,6 @@ "start_hour": 2, "start_minute": 0 }, - "worker_replicas": 0, "postgres_flexible_server_sku": "GP_Standard_D2ds_v4", "enable_postgres_backup_storage": true, "postgres_enable_high_availability": true,