From f82987891999aeefdf61f5e0746345c045639073 Mon Sep 17 00:00:00 2001
From: Gideon Goldberg <1764158+gidsg@users.noreply.github.com>
Date: Fri, 16 Aug 2024 09:17:50 +0100
Subject: [PATCH 1/2] remove -2 aliases from pre-prod envs

---
 copilot/post-award/manifest.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/copilot/post-award/manifest.yml b/copilot/post-award/manifest.yml
index 88cc1956b..588abe82a 100644
--- a/copilot/post-award/manifest.yml
+++ b/copilot/post-award/manifest.yml
@@ -85,7 +85,7 @@ environments:
       FIND_HOST: find-monitoring-data.access-funding.levellingup.gov.uk
   test:
     http:
-      alias: ["find-monitoring-data-2.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk", "submit-monitoring-data-2.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"]
+      alias: ["find-monitoring-data.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk", "submit-monitoring-data.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"]
       target_container: nginx
       healthcheck:
         path: /healthcheck
@@ -96,10 +96,10 @@ environments:
         grace_period: 10s
     variables:
       SENTRY_TRACES_SAMPLE_RATE: 1.0
-      FIND_SERVICE_BASE_URL: https://find-monitoring-data-2.test.access-funding.test.levellingup.gov.uk
+      FIND_SERVICE_BASE_URL: https://find-monitoring-data.test.access-funding.test.levellingup.gov.uk
       COOKIE_DOMAIN: '.test.access-funding.test.levellingup.gov.uk'
-      SUBMIT_HOST: submit-monitoring-data-2.test.access-funding.test.levellingup.gov.uk
-      FIND_HOST: find-monitoring-data-2.test.access-funding.test.levellingup.gov.uk
+      SUBMIT_HOST: submit-monitoring-data.test.access-funding.test.levellingup.gov.uk
+      FIND_HOST: find-monitoring-data.test.access-funding.test.levellingup.gov.uk
     sidecars:
       nginx:
         port: 8087
@@ -114,7 +114,7 @@ environments:
           BASIC_AUTH_PASSWORD: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/POST_AWARD_BASIC_AUTH_PASSWORD
   dev:
     http:
-      alias: ["find-monitoring-data-2.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk", "submit-monitoring-data-2.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"]
+      alias: ["find-monitoring-data.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk", "submit-monitoring-data.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk"]
       target_container: nginx
       healthcheck:
         path: /healthcheck
@@ -125,10 +125,10 @@ environments:
         grace_period: 10s
     variables:
       SENTRY_TRACES_SAMPLE_RATE: 1.0
-      FIND_SERVICE_BASE_URL: https://find-monitoring-data-2.dev.access-funding.test.levellingup.gov.uk
+      FIND_SERVICE_BASE_URL: https://find-monitoring-data.dev.access-funding.test.levellingup.gov.uk
       COOKIE_DOMAIN: '.dev.access-funding.test.levellingup.gov.uk'
-      SUBMIT_HOST: submit-monitoring-data-2.dev.access-funding.test.levellingup.gov.uk
-      FIND_HOST: find-monitoring-data-2.dev.access-funding.test.levellingup.gov.uk
+      SUBMIT_HOST: submit-monitoring-data.dev.access-funding.test.levellingup.gov.uk
+      FIND_HOST: find-monitoring-data.dev.access-funding.test.levellingup.gov.uk
     sidecars:
       nginx:
         port: 8087

From 99672a148f3dc351ba62a118ed513269f18292a1 Mon Sep 17 00:00:00 2001
From: Gideon Goldberg <1764158+gidsg@users.noreply.github.com>
Date: Fri, 16 Aug 2024 09:46:19 +0100
Subject: [PATCH 2/2] update celery manifest

---
 copilot/post-award-celery/manifest.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/copilot/post-award-celery/manifest.yml b/copilot/post-award-celery/manifest.yml
index 2ed4fea66..b62307682 100644
--- a/copilot/post-award-celery/manifest.yml
+++ b/copilot/post-award-celery/manifest.yml
@@ -65,11 +65,11 @@ environments:
       FIND_HOST: find-monitoring-data.access-funding.levellingup.gov.uk
   test:
     variables:
-      FIND_SERVICE_BASE_URL: https://find-monitoring-data-2.test.access-funding.test.levellingup.gov.uk
-      SUBMIT_HOST: submit-monitoring-data-2.test.access-funding.test.levellingup.gov.uk
-      FIND_HOST: find-monitoring-data-2.test.access-funding.test.levellingup.gov.uk
+      FIND_SERVICE_BASE_URL: https://find-monitoring-data.test.access-funding.test.levellingup.gov.uk
+      SUBMIT_HOST: submit-monitoring-data.test.access-funding.test.levellingup.gov.uk
+      FIND_HOST: find-monitoring-data.test.access-funding.test.levellingup.gov.uk
   dev:
     variables:
-      FIND_SERVICE_BASE_URL: https://find-monitoring-data-2.dev.access-funding.test.levellingup.gov.uk
-      SUBMIT_HOST: submit-monitoring-data-2.dev.access-funding.test.levellingup.gov.uk
-      FIND_HOST: find-monitoring-data-2.dev.access-funding.test.levellingup.gov.uk
+      FIND_SERVICE_BASE_URL: https://find-monitoring-data.dev.access-funding.test.levellingup.gov.uk
+      SUBMIT_HOST: submit-monitoring-data.dev.access-funding.test.levellingup.gov.uk
+      FIND_HOST: find-monitoring-data.dev.access-funding.test.levellingup.gov.uk