Skip to content

Commit

Permalink
MAP-1602 fixing merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@michalnawrockidj
michalnawrockidj committed Sep 18, 2024
1 parent 4958df3 commit a54348a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 185 deletions.
34 changes: 2 additions & 32 deletions helm_deploy/values-dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,16 @@ generic-service:
NOMIS_AUTH_URL: https://sign-in-dev.hmpps.service.justice.gov.uk/auth
PRISON_API_URL: https://prison-api-dev.prison.service.justice.gov.uk
PRISONER_SEARCH_API_URL: https://prisoner-search-dev.prison.service.justice.gov.uk
LOCATIONS_INSIDE_PRISON_API_URL: https://locations-inside-prison-api-dev.hmpps.service.justice.gov.uk
NOMIS_MAPPING_API_URL: https://nomis-sync-prisoner-mapping-dev.hmpps.service.justice.gov.uk
EXIT_LOCATION_URL: https://digital-dev.prison.service.justice.gov.uk/
EMAIL_LOCATION_URL: https://dev.use-of-force.service.justice.gov.uk
TOKENVERIFICATION_API_URL: https://token-verification-api-dev.prison.service.justice.gov.uk
DPS_URL: https://digital-dev.prison.service.justice.gov.uk/
COMPONENT_API_URL: https://frontend-components-dev.hmpps.service.justice.gov.uk
ENVIRONMENT_NAME: 'DEV'
HMPPS_MANAGE_USERS_API_URL: https://manage-users-api-dev.hmpps.service.justice.gov.uk

<<<<<<< HEAD
INGRESS_URL: https://dev.use-of-force.service.justice.gov.uk
=======
image:
repository: quay.io/hmpps/use-of-force
tag: latest
port: 3000

ingress:
enabled: true
enable_allow_list: false
host: dev.use-of-force.service.justice.gov.uk
cert_secret: use-of-force-cert
path: /

env:
NOMIS_AUTH_URL: https://sign-in-dev.hmpps.service.justice.gov.uk/auth
PRISON_API_URL: https://prison-api-dev.prison.service.justice.gov.uk
LOCATIONS_INSIDE_PRISON_API_URL: https://locations-inside-prison-api-dev.hmpps.service.justice.gov.uk
NOMIS_MAPPING_API_URL: https://nomis-sync-prisoner-mapping-dev.hmpps.service.justice.gov.uk
PRISONER_SEARCH_API_URL: https://prisoner-search-dev.prison.service.justice.gov.uk
EXIT_LOCATION_URL: https://digital-dev.prison.service.justice.gov.uk/
EMAIL_LOCATION_URL: https://dev.use-of-force.service.justice.gov.uk
TOKENVERIFICATION_API_URL: https://token-verification-api-dev.prison.service.justice.gov.uk
TOKENVERIFICATION_API_ENABLED: true
FEATURE_FLAG_OUTAGE_BANNER_ENABLED: false
FEATURE_FLAG_REMOVE_CELL_LOCATION_AGENCIES: 'HMI'
DPS_URL: https://digital-dev.prison.service.justice.gov.uk/
COMPONENT_API_URL: "https://frontend-components-dev.hmpps.service.justice.gov.uk"
ENVIRONMENT_NAME: 'DEV'
HMPPS_MANAGE_USERS_API_URL: https://manage-users-api-dev.hmpps.service.justice.gov.uk
>>>>>>> main

generic-data-analytics-extractor:
args: "extract_table_names.py && extract_psql_all_tables_to_csv.sh && upload_data_file_to_data_platform.sh"
Expand Down
155 changes: 2 additions & 153 deletions helm_deploy/values-preprod.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ generic-service:
env:
NOMIS_AUTH_URL: https://sign-in-preprod.hmpps.service.justice.gov.uk/auth
PRISON_API_URL: https://prison-api-preprod.prison.service.justice.gov.uk
LOCATIONS_INSIDE_PRISON_API_URL: https://locations-inside-prison-api-preprod.hmpps.service.justice.gov.uk
NOMIS_MAPPING_API_URL: https://nomis-sync-prisoner-mapping-preprod.hmpps.service.justice.gov.uk
PRISONER_SEARCH_API_URL: https://prisoner-search-preprod.prison.service.justice.gov.uk
EXIT_LOCATION_URL: https://digital-preprod.prison.service.justice.gov.uk/
EMAIL_LOCATION_URL: https://preprod.use-of-force.service.justice.gov.uk
Expand All @@ -17,159 +19,6 @@ generic-service:
HMPPS_MANAGE_USERS_API_URL: https://manage-users-api-preprod.hmpps.service.justice.gov.uk
INGRESS_URL: https://preprod.use-of-force.service.justice.gov.uk

<<<<<<< HEAD
allowlist:
office: "217.33.148.210/32"
quantum: "62.25.109.197/32"
quantum_alt: "212.137.36.230/32"
health-kick: "35.177.252.195/32"
digitalprisons1: "52.56.112.98/32"
digitalprisons2: "52.56.118.154/32"
mojvpn: "81.134.202.29/32"
j5-phones-1: "35.177.125.252/32"
j5-phones-2: "35.177.137.160/32"
sodexo-northumberland: "88.98.48.10/32"
sodexo-northumberland2: "51.148.47.137/32"
sodoxeo-forest-bank: "51.155.85.249/32"
sodexo-peterborough: "51.155.55.241/32"
serco: "217.22.14.0/24"
ark-nps-hmcts-ttp1: "195.59.75.0/24"
ark-nps-hmcts-ttp2: "194.33.192.0/25"
ark-nps-hmcts-ttp3: "194.33.193.0/25"
ark-nps-hmcts-ttp4: "194.33.196.0/25"
ark-nps-hmcts-ttp5: "194.33.197.0/25"
moj-official-ark-c-expo-e: "51.149.249.0/29"
moj-official-ark-c-vodafone: "194.33.248.0/29"
moj-official-ark-f-vodafone: "194.33.249.0/29"
moj-official-ark-f-expo-e: "51.149.249.32/29"
oakwood-01: "217.161.76.184/29"
oakwood-02: "217.161.76.192/29"
oakwood-1: "217.161.76.187/32"
oakwood-2: "217.161.76.195/32"
oakwood-3: "217.161.76.186/32"
oakwood-4: "217.161.76.194/32"
durham-tees-valley: "51.179.197.1/32"
interservfls: "51.179.196.131/32"
sodexo1: "80.86.46.16/32"
sodexo2: "80.86.46.17/32"
sodexo3: "80.86.46.18/32"
sodexo4: "51.148.9.201"
cloudplatform-live1-1: "35.178.209.113/32"
cloudplatform-live1-2: "3.8.51.207/32"
cloudplatform-live1-3: "35.177.252.54/32"
dxc_webproxy1: "195.92.38.20/32"
dxc_webproxy2: "195.92.38.21/32"
dxc_webproxy3: "195.92.38.22/32"
dxc_webproxy4: "195.92.38.23/32"
moj-official-tgw-prod: "51.149.250.0/24"
moj-official-tgw-preprod: "51.149.251.0/24"
crc-rrp: "62.253.83.37/32"
crc-pp-wwm: "5.153.255.210/32"
fivewells-1: "20.49.214.199/32"
fivewells-2: "20.49.214.228/32"
fivewells-3: "195.89.157.56/29"
fivewells-4: "195.59.215.184/29"
fivewells-5: "51.149.250.0/24"
fivewells-6: "51.149.249.0/29"
fivewells-7: "194.33.249.0/29"
fivewells-8: "51.149.249.32/29"
fivewells-9: "194.33.248.0/29"
global-protect: "35.176.93.186/32"
petty-france-wifi: "213.121.161.112/28"
azure-landing-zone-public-egress-1: "20.26.11.71/32"
azure-landing-zone-public-egress-2: "20.26.11.108/32"
=======
image:
repository: quay.io/hmpps/use-of-force
tag: latest
port: 3000

ingress:
enabled: true
enable_allow_list: true
host: preprod.use-of-force.service.justice.gov.uk
cert_secret: use-of-force-cert
path: /

env:
NOMIS_AUTH_URL: https://sign-in-preprod.hmpps.service.justice.gov.uk/auth
PRISON_API_URL: "https://prison-api-preprod.prison.service.justice.gov.uk"
LOCATIONS_INSIDE_PRISON_API_URL: https://locations-inside-prison-api-preprod.hmpps.service.justice.gov.uk
NOMIS_MAPPING_API_URL: https://nomis-sync-prisoner-mapping-preprod.hmpps.service.justice.gov.uk
PRISONER_SEARCH_API_URL: https://prisoner-search-preprod.prison.service.justice.gov.uk
EXIT_LOCATION_URL: https://digital-preprod.prison.service.justice.gov.uk/
EMAIL_LOCATION_URL: https://preprod.use-of-force.service.justice.gov.uk
TOKENVERIFICATION_API_URL: https://token-verification-api-preprod.prison.service.justice.gov.uk
TOKENVERIFICATION_API_ENABLED: true
FEATURE_FLAG_OUTAGE_BANNER_ENABLED: false
FEATURE_FLAG_REMOVE_CELL_LOCATION_AGENCIES: 'HMI'
DPS_URL: https://digital-preprod.prison.service.justice.gov.uk/
COMPONENT_API_URL: "https://frontend-components-preprod.hmpps.service.justice.gov.uk"
ENVIRONMENT_NAME: 'PRE-PRODUCTION'
HMPPS_MANAGE_USERS_API_URL: https://manage-users-api-preprod.hmpps.service.justice.gov.uk

allow_list:
office: "217.33.148.210/32"
quantum: "62.25.109.197/32"
quantum_alt: "212.137.36.230/32"
health-kick: "35.177.252.195/32"
digitalprisons1: "52.56.112.98/32"
digitalprisons2: "52.56.118.154/32"
mojvpn: "81.134.202.29/32"
j5-phones-1: "35.177.125.252/32"
j5-phones-2: "35.177.137.160/32"
sodexo-northumberland: "88.98.48.10/32"
sodexo-northumberland2: "51.148.47.137/32"
sodoxeo-forest-bank: "51.155.85.249/32"
sodexo-peterborough: "51.155.55.241/32"
serco: "217.22.14.0/24"
ark-nps-hmcts-ttp1: "195.59.75.0/24"
ark-nps-hmcts-ttp2: "194.33.192.0/25"
ark-nps-hmcts-ttp3: "194.33.193.0/25"
ark-nps-hmcts-ttp4: "194.33.196.0/25"
ark-nps-hmcts-ttp5: "194.33.197.0/25"
moj-official-ark-c-expo-e: "51.149.249.0/29"
moj-official-ark-c-vodafone: "194.33.248.0/29"
moj-official-ark-f-vodafone: "194.33.249.0/29"
moj-official-ark-f-expo-e: "51.149.249.32/29"
oakwood-01: "217.161.76.184/29"
oakwood-02: "217.161.76.192/29"
oakwood-1: "217.161.76.187/32"
oakwood-2: "217.161.76.195/32"
oakwood-3: "217.161.76.186/32"
oakwood-4: "217.161.76.194/32"
durham-tees-valley: "51.179.197.1/32"
interservfls: "51.179.196.131/32"
sodexo1: "80.86.46.16/32"
sodexo2: "80.86.46.17/32"
sodexo3: "80.86.46.18/32"
sodexo4: "51.148.9.201"
cloudplatform-live1-1: "35.178.209.113/32"
cloudplatform-live1-2: "3.8.51.207/32"
cloudplatform-live1-3: "35.177.252.54/32"
dxc_webproxy1: "195.92.38.20/32"
dxc_webproxy2: "195.92.38.21/32"
dxc_webproxy3: "195.92.38.22/32"
dxc_webproxy4: "195.92.38.23/32"
moj-official-tgw-prod: "51.149.250.0/24"
moj-official-tgw-preprod: "51.149.251.0/24"
crc-rrp: "62.253.83.37/32"
crc-pp-wwm: "5.153.255.210/32"
fivewells-1: "20.49.214.199/32"
fivewells-2: "20.49.214.228/32"
fivewells-3: "195.89.157.56/29"
fivewells-4: "195.59.215.184/29"
fivewells-5: "51.149.250.0/24"
fivewells-6: "51.149.249.0/29"
fivewells-7: "194.33.249.0/29"
fivewells-8: "51.149.249.32/29"
fivewells-9: "194.33.248.0/29"
global-protect: "35.176.93.186/32"
petty-france-wifi: "213.121.161.112/28"
azure-landing-zone-public-egress-1: "20.26.11.71/32"
azure-landing-zone-public-egress-2: "20.26.11.108/32"
>>>>>>> main

generic-data-analytics-extractor:
serviceAccountName: use-of-force-preprod-to-ap-s3
cronJobSchedule: "0 21 * * *"

0 comments on commit a54348a

Please sign in to comment.