Skip to content

Commit

Permalink
Remove ingress rules for the old domain (#671)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
MatMoore committed Aug 14, 2024
1 parent d98514f commit 7b9bce9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
12 changes: 0 additions & 12 deletions deployments/templates/ingress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 7b9bce9

Please sign in to comment.