From 7b9bce93e2a558fce7deddb0d408b09652c559d2 Mon Sep 17 00:00:00 2001
From: Mat <MatMoore@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:47:23 +0100
Subject: [PATCH] Remove ingress rules for the old domain (#671)

fix: remove old cloud platform ingress

Now we have our domains set up, we don't need this ingress.
These old URLs aren't fully working because EntraID will redirect
the new URL after login.

We should also use new domain for deployment notifications.
---
 .github/workflows/notify.yml      |  4 ++--
 deployments/templates/ingress.yml | 12 ------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/notify.yml b/.github/workflows/notify.yml
index cae58743..d49067b7 100644
--- a/.github/workflows/notify.yml
+++ b/.github/workflows/notify.yml
@@ -50,7 +50,7 @@ jobs:
         with:
           status: ${{ github.event.workflow_run.conclusion }}
           notification_title: "Deployment Successful"
-          message_format: ":rocket: <https://data-platform-find-moj-data-preprod.apps.live.cloud-platform.service.justice.gov.uk/|New Preproduction Deployment>"
+          message_format: ":rocket: <https://preprod.find-moj-data.service.justice.gov.uk/|New Preproduction Deployment>"
           footer: "Linked Repo <${{github.server_url}}/${{github.repository}}|${{github.repository}}> | <${{github.server_url}}/${{github.repository}}/actions/runs/${{github.event.workflow_run.id}}|View>"
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_DATA_CATALOGUE }}
@@ -74,7 +74,7 @@ jobs:
         with:
           status: ${{ github.event.workflow_run.conclusion }}
           notification_title: "Deployment Successful"
-          message_format: ":rocket: <https://data-platform-find-moj-data-prod.apps.live.cloud-platform.service.justice.gov.uk/|New Production Deployment>"
+          message_format: ":rocket: <https://find-moj-data.service.justice.gov.uk/|New Production Deployment>"
           footer: "Linked Repo <${{github.server_url}}/${{github.repository}}|${{github.repository}}> | <${{github.server_url}}/${{github.repository}}/actions/runs/${{github.event.workflow_run.id}}|View>"
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_ASK_DATA_CATALOGUE }}
diff --git a/deployments/templates/ingress.yml b/deployments/templates/ingress.yml
index f4545588..644f3c50 100644
--- a/deployments/templates/ingress.yml
+++ b/deployments/templates/ingress.yml
@@ -13,22 +13,10 @@ metadata:
 spec:
   ingressClassName: modsec
   tls:
-    - hosts:
-        - ${NAMESPACE}.apps.live.cloud-platform.service.justice.gov.uk
     - hosts:
         - ${EXTERNAL_DOMAIN_PREFIX}find-moj-data.service.justice.gov.uk
       secretName: find-moj-data-cert # pragma: allowlist secret
   rules:
-    - host: ${NAMESPACE}.apps.live.cloud-platform.service.justice.gov.uk
-      http:
-        paths:
-          - path: /
-            pathType: ImplementationSpecific
-            backend:
-              service:
-                name: find-moj-data-service # this should match the metadata.name in service.yml
-                port:
-                  number: 80
     - host: ${EXTERNAL_DOMAIN_PREFIX}find-moj-data.service.justice.gov.uk
       http:
         paths: