Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix discrepancies between fv URLs across deployments and ingress (UAT/STG/PROD) #122

Merged
merged 1 commit into from
Jan 22, 2024
Merged

Fix discrepancies between fv URLs across deployments and ingress (UAT/STG/PROD) #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kube/app/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ spec:
{{ end }}
- name: FILE_VAULT_URL
{{ if eq .KUBE_NAMESPACE .PROD_ENV }}
value: https://fv.{{ .APP_NAME }}.homeoffice.gov.uk/file
value: https://fv-paf.sas.homeoffice.gov.uk/file
{{ else if eq .KUBE_NAMESPACE .STG_ENV }}
value: https://fv-paf.stg.sas.homeoffice.gov.uk/file
{{ else if eq .KUBE_NAMESPACE .UAT_ENV }}
Expand Down
12 changes: 6 additions & 6 deletions kube/file-vault/file-vault-deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ spec:
value: "0"
- name: FILE_VAULT_URL
{{ if eq .KUBE_NAMESPACE .PROD_ENV }}
value: https://fv.prod.{{ .APP_NAME }}.homeoffice.gov.uk
value: fv-paf.sas.homeoffice.gov.uk
{{ else if eq .KUBE_NAMESPACE .STG_ENV }}
value: https://fv-stg.prod.{{ .APP_NAME }}.homeoffice.gov.uk
value: fv-paf.stg.sas.homeoffice.gov.uk
{{ else if eq .KUBE_NAMESPACE .UAT_ENV }}
value: https://fv-uat.notprod.{{ .APP_NAME }}.homeoffice.gov.uk
value: fv-paf.uat.sas-notprod.homeoffice.gov.uk
{{ else if eq .KUBE_NAMESPACE .BRANCH_ENV }}
value: https://fv-{{ .DRONE_SOURCE_BRANCH }}.{{ .BRANCH_ENV }}.homeoffice.gov.uk
- name: DEBUG
Expand Down Expand Up @@ -115,11 +115,11 @@ spec:
key: id
- name: PROXY_REDIRECTION_URL
{{ if eq .KUBE_NAMESPACE .PROD_ENV }}
value: https://fv.prod.{{ .APP_NAME }}.homeoffice.gov.uk
value: fv-paf.sas.homeoffice.gov.uk
{{ else if eq .KUBE_NAMESPACE .STG_ENV }}
value: https://fv-stg.prod.{{ .APP_NAME }}.homeoffice.gov.uk
value: fv-paf.stg.sas.homeoffice.gov.uk
{{ else if eq .KUBE_NAMESPACE .UAT_ENV }}
value: https://fv-uat.notprod.{{ .APP_NAME }}.homeoffice.gov.uk
value: fv-paf.uat.sas-notprod.homeoffice.gov.uk
{{ else if eq .KUBE_NAMESPACE .BRANCH_ENV }}
value: https://fv-{{ .DRONE_SOURCE_BRANCH }}.{{ .BRANCH_ENV }}.homeoffice.gov.uk
{{ end }}
Expand Down
4 changes: 2 additions & 2 deletions kube/file-vault/file-vault-ingress.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
{{ else if eq .KUBE_NAMESPACE .STG_ENV }}
- fv-paf.stg.sas.homeoffice.gov.uk
{{ else if eq .KUBE_NAMESPACE .PROD_ENV }}
- fv-paf.homeoffice.gov.uk
- fv-paf.sas.homeoffice.gov.uk
{{ end }}
{{ if eq .KUBE_NAMESPACE .BRANCH_ENV }}
secretName: branch-tls-external
Expand All @@ -37,7 +37,7 @@ spec:
{{ else if eq .KUBE_NAMESPACE .STG_ENV }}
- host: fv-paf.stg.sas.homeoffice.gov.uk
{{ else if eq .KUBE_NAMESPACE .PROD_ENV }}
- host: fv-paf.homeoffice.gov.uk
- host: fv-paf.sas.homeoffice.gov.uk
{{ end }}
http:
paths:
Expand Down