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.

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

chore: convert helm to allowlist and tidy - probably breaks nginx whi… #933

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ commands:
--install --wait --reset-values --timeout 360s \
--namespace=${KUBE_ENV_NAMESPACE} \
--description="${APP_VERSION} - ${CIRCLE_BUILD_URL}" \
--values ~/git/helm_deploy/values-<< parameters.env >>.yaml \
--values - \
--values ~/git/helm_deploy/prepare-a-case/values-live.yaml \
--values ~/git/helm_deploy/prepare-a-case/values.yaml \
--values ~/git/helm_deploy/prepare-a-case/values-<< parameters.env >>.yaml \
--set image.tag="${APP_VERSION}"
executors:
deployer:
Expand Down
2 changes: 1 addition & 1 deletion compose/court-case-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ networks:
services:

court-case-service:
image: docker.io/mojdigitalstudio/court-case-service:latest
image: quay.io/hmpps/court-case-service:latest
container_name: court-case-service
networks:
- hmpps
Expand Down
4 changes: 0 additions & 4 deletions helm_deploy/prepare-a-case/templates/NOTES.txt

This file was deleted.

37 changes: 0 additions & 37 deletions helm_deploy/prepare-a-case/templates/ingress.yaml

This file was deleted.

15 changes: 15 additions & 0 deletions helm_deploy/prepare-a-case/values-dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
minReplicaCount: 1
maxReplicaCount: 1

ingress:
host: prepare-a-case-dev.apps.live-1.cloud-platform.service.justice.gov.uk

env:
PAC_ENV: dev
COURT_CASE_SERVICE_URL: https://court-case-service-dev.apps.live-1.cloud-platform.service.justice.gov.uk
NOMIS_AUTH_URL: https://sign-in-dev.hmpps.service.justice.gov.uk/auth
USER_PREFERENCE_SERVICE_URL: https://hmpps-user-preferences-dev.hmpps.service.justice.gov.uk
CASE_SNAPSHOT_TIMES: "00:00,08:45,09:45,10:15,10:45,11:15,11:45,12:15,12:45,13:15,13:45,14:15,14:45,15:15,15:45,16:15,16:45,17:15,17:45"
CASE_TRACKING_PRE_PILOT_USERS: All
ENABLE_MOVE_TO_RESULTED_ACTION: true
ENABLE_WORKFLOW: true
4 changes: 0 additions & 4 deletions helm_deploy/prepare-a-case/values-live.yaml

This file was deleted.

22 changes: 22 additions & 0 deletions helm_deploy/prepare-a-case/values-preprod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
minReplicaCount: 2
maxReplicaCount: 4

ingress:
host: prepare-a-case-preprod.apps.live-1.cloud-platform.service.justice.gov.uk

env:
PAC_ENV: preprod
COURT_CASE_SERVICE_URL: https://court-case-service-preprod.apps.live-1.cloud-platform.service.justice.gov.uk
NOMIS_AUTH_URL: https://sign-in-preprod.hmpps.service.justice.gov.uk/auth
USER_PREFERENCE_SERVICE_URL: https://hmpps-user-preferences-preprod.hmpps.service.justice.gov.uk
CASE_SNAPSHOT_TIMES: "00:00,08:45,09:45,10:15,10:45,11:15,11:45,12:15,12:45,13:15,13:45,14:15,14:45,15:15,15:45,16:15,16:45,17:15,17:45"
CASE_TRACKING_PRE_PILOT_USERS: joana.aguia,tony.howard,tfe58u,ravishankar.challapalli
ENABLE_MOVE_TO_RESULTED_ACTION: false

resources:
cpu:
limit: 1000m
request: 50m
memory:
limit: 500Mi
request: 100Mi
23 changes: 23 additions & 0 deletions helm_deploy/prepare-a-case/values-prod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
minReplicaCount: 2
maxReplicaCount: 4

ingress:
host: prepare-case-probation.service.justice.gov.uk
cert_secret: court-probation-cert-secret

env:
PAC_ENV: prod
COURT_CASE_SERVICE_URL: https://court-case-service.apps.live-1.cloud-platform.service.justice.gov.uk
NOMIS_AUTH_URL: https://sign-in.hmpps.service.justice.gov.uk/auth
USER_PREFERENCE_SERVICE_URL: https://hmpps-user-preferences.hmpps.service.justice.gov.uk
CASE_SNAPSHOT_TIMES: "00:00,08:45,09:45"
CASE_TRACKING_PRE_PILOT_USERS: ZAP37S,BEVERLEYWILLMOTTNPS,ZRX14Y,wyi97r,mdy87w,sarahclarkenps,bethanylilleynps,jenniferrawlingsnps,maxholgatenps,wjf65j,xzu68s,CZE89A,serenacannannps,qgd46q,santoshchakrabartnps
ENABLE_MOVE_TO_RESULTED_ACTION: false

resources:
cpu:
limit: 1000m
request: 50m
memory:
limit: 500Mi
request: 100Mi
23 changes: 23 additions & 0 deletions helm_deploy/prepare-a-case/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
ingress:
enabled: true

image:
repository: quay.io/hmpps/prepare-a-case
tag: latest
pullPolicy: Always
port: 3000

allowlist:
groups:
- internal

env:
CASES_PER_PAGE: 20
ENABLE_PAST_CASES_NAVIGATION: true
ENABLE_CASE_COMMENTS: true
ENABLE_CASE_PROGRESS: true
ENABLE_APP_INSIGHTS: true
ENABLE_HEARING_OUTCOMES: true
CASE_SEARCH_USERS: all
ENABLE_SERVERSIDE_PAGING: true
ENABLE_MOVE_TO_RESULTED_ACTION: true
46 changes: 0 additions & 46 deletions helm_deploy/values-dev.yaml

This file was deleted.

54 changes: 0 additions & 54 deletions helm_deploy/values-preprod.yaml

This file was deleted.

55 changes: 0 additions & 55 deletions helm_deploy/values-prod.yaml

This file was deleted.