diff --git a/.circleci/config.yml b/.circleci/config.yml index 32201350a..53ae00e91 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: diff --git a/compose/court-case-service.yml b/compose/court-case-service.yml index 4c65c982d..18ca48d49 100644 --- a/compose/court-case-service.yml +++ b/compose/court-case-service.yml @@ -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 diff --git a/helm_deploy/prepare-a-case/templates/NOTES.txt b/helm_deploy/prepare-a-case/templates/NOTES.txt deleted file mode 100644 index b48ccb23e..000000000 --- a/helm_deploy/prepare-a-case/templates/NOTES.txt +++ /dev/null @@ -1,4 +0,0 @@ -Application is running at: -{{- if .Values.ingress.enabled }} - https://{{ .Values.ingress.host }}{{ $.Values.ingress.path }} -{{- end }} \ No newline at end of file diff --git a/helm_deploy/prepare-a-case/templates/ingress.yaml b/helm_deploy/prepare-a-case/templates/ingress.yaml deleted file mode 100644 index 7afe8ca1d..000000000 --- a/helm_deploy/prepare-a-case/templates/ingress.yaml +++ /dev/null @@ -1,37 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "app.fullname" . -}} -{{- $ingressPath := .Values.ingress.path -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - app: {{ template "app.name" . }} - chart: {{ template "app.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: - {{ if .Values.ingress.enable_whitelist }}nginx.ingress.kubernetes.io/whitelist-source-range: {{ include "app.joinListWithComma" .Values.whitelist | quote }}{{ end }} - nginx.ingress.kubernetes.io/custom-http-errors: "418" - external-dns.alpha.kubernetes.io/set-identifier: {{ $fullName }}-{{ .Release.Namespace }}-{{ .Values.ingress.contextColour }} - {{- with .Values.ingress.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - ingressClassName: "modsec" - tls: - - hosts: - - {{ .Values.ingress.host }} - {{ if .Values.ingress.cert_secret }}secretName: {{ .Values.ingress.cert_secret }}{{ end }} - rules: - - host: {{ .Values.ingress.host }} - http: - paths: - - path: {{ $ingressPath }} - pathType: ImplementationSpecific - backend: - service: - name: {{ $fullName }} - port: - name: http -{{- end }} diff --git a/helm_deploy/prepare-a-case/values-dev.yaml b/helm_deploy/prepare-a-case/values-dev.yaml new file mode 100644 index 000000000..e514b4ec8 --- /dev/null +++ b/helm_deploy/prepare-a-case/values-dev.yaml @@ -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 diff --git a/helm_deploy/prepare-a-case/values-live.yaml b/helm_deploy/prepare-a-case/values-live.yaml deleted file mode 100644 index b70a32000..000000000 --- a/helm_deploy/prepare-a-case/values-live.yaml +++ /dev/null @@ -1,4 +0,0 @@ -ingress: - contextColour: green - annotations: - external-dns.alpha.kubernetes.io/aws-weight: "100" diff --git a/helm_deploy/prepare-a-case/values-preprod.yaml b/helm_deploy/prepare-a-case/values-preprod.yaml new file mode 100644 index 000000000..e74e26cc0 --- /dev/null +++ b/helm_deploy/prepare-a-case/values-preprod.yaml @@ -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 diff --git a/helm_deploy/prepare-a-case/values-prod.yaml b/helm_deploy/prepare-a-case/values-prod.yaml new file mode 100644 index 000000000..762a292b2 --- /dev/null +++ b/helm_deploy/prepare-a-case/values-prod.yaml @@ -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 diff --git a/helm_deploy/prepare-a-case/values.yaml b/helm_deploy/prepare-a-case/values.yaml new file mode 100644 index 000000000..825c9731a --- /dev/null +++ b/helm_deploy/prepare-a-case/values.yaml @@ -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 diff --git a/helm_deploy/values-dev.yaml b/helm_deploy/values-dev.yaml deleted file mode 100644 index 84b46dd1b..000000000 --- a/helm_deploy/values-dev.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -minReplicaCount: 1 -maxReplicaCount: 1 - -image: - repository: quay.io/hmpps/prepare-a-case - tag: latest - pullPolicy: Always - port: 3000 - -ingress: - enabled: true - enable_whitelist: true - host: prepare-a-case-dev.apps.live-1.cloud-platform.service.justice.gov.uk - path: / - -env: - PAC_ENV: dev - COURT_CASE_SERVICE_URL: https://court-case-service-dev.apps.live-1.cloud-platform.service.justice.gov.uk - CASES_PER_PAGE: 20 - 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" - ENABLE_PAST_CASES_NAVIGATION: true - ENABLE_CASE_COMMENTS: true - ENABLE_CASE_PROGRESS: true - ENABLE_APP_INSIGHTS: true - ENABLE_HEARING_OUTCOMES: true - ENABLE_WORKFLOW: true - CASE_TRACKING_PRE_PILOT_USERS: All - CASE_SEARCH_USERS: all - ENABLE_SERVERSIDE_PAGING: true - ENABLE_MOVE_TO_RESULTED_ACTION: true - -whitelist: - dac: "194.75.245.154" - office: "217.33.148.210/32" - health-kick: "35.177.252.195/32" - mojvpn: "81.134.202.29/32" - cloudplatform-live1-1: "35.178.209.113/32" - cloudplatform-live1-2: "3.8.51.207/32" - cloudplatform-live1-3: "35.177.252.54/32" - global-protect: "35.176.93.186/32" - global-protect-2: "51.149.250.0/24" diff --git a/helm_deploy/values-preprod.yaml b/helm_deploy/values-preprod.yaml deleted file mode 100644 index cc10f976b..000000000 --- a/helm_deploy/values-preprod.yaml +++ /dev/null @@ -1,54 +0,0 @@ -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -minReplicaCount: 2 -maxReplicaCount: 4 - -image: - repository: quay.io/hmpps/prepare-a-case - tag: latest - pullPolicy: Always - port: 3000 - -ingress: - enabled: true - enable_whitelist: true - host: prepare-a-case-preprod.apps.live-1.cloud-platform.service.justice.gov.uk - path: / - -env: - PAC_ENV: preprod - COURT_CASE_SERVICE_URL: https://court-case-service-preprod.apps.live-1.cloud-platform.service.justice.gov.uk - CASES_PER_PAGE: 20 - 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" - ENABLE_PAST_CASES_NAVIGATION: true - ENABLE_CASE_COMMENTS: true - ENABLE_CASE_PROGRESS: true - ENABLE_APP_INSIGHTS: true - ENABLE_HEARING_OUTCOMES: true - CASE_TRACKING_PRE_PILOT_USERS: joana.aguia,tony.howard,tfe58u,ravishankar.challapalli - CASE_SEARCH_USERS: all - ENABLE_SERVERSIDE_PAGING: true - ENABLE_MOVE_TO_RESULTED_ACTION: false - -whitelist: - office: "217.33.148.210/32" - health-kick: "35.177.252.195/32" - mojvpn: "81.134.202.29/32" - cloudplatform-live1-1: "35.178.209.113/32" - cloudplatform-live1-2: "3.8.51.207/32" - cloudplatform-live1-3: "35.177.252.54/32" - ark-internet-1: "194.33.192.0/25" - ark-internet-2: "194.33.196.0/25" - moj-official-aws-preprod: "51.149.251.0/24" - global-protect: "35.176.93.186/32" - -resources: - cpu: - limit: 1000m - request: 50m - memory: - limit: 500Mi - request: 100Mi diff --git a/helm_deploy/values-prod.yaml b/helm_deploy/values-prod.yaml deleted file mode 100644 index 7edf801d3..000000000 --- a/helm_deploy/values-prod.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -minReplicaCount: 2 -maxReplicaCount: 4 - -image: - repository: quay.io/hmpps/prepare-a-case - tag: latest - pullPolicy: Always - port: 3000 - -ingress: - enabled: true - enable_whitelist: true - host: prepare-case-probation.service.justice.gov.uk - cert_secret: court-probation-cert-secret - path: / - -env: - PAC_ENV: prod - COURT_CASE_SERVICE_URL: https://court-case-service.apps.live-1.cloud-platform.service.justice.gov.uk - CASES_PER_PAGE: 20 - 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" - ENABLE_PAST_CASES_NAVIGATION: true - ENABLE_CASE_COMMENTS: true - ENABLE_CASE_PROGRESS: true - ENABLE_APP_INSIGHTS: true - ENABLE_HEARING_OUTCOMES: true - CASE_TRACKING_PRE_PILOT_USERS: ZAP37S,BEVERLEYWILLMOTTNPS,ZRX14Y,wyi97r,mdy87w,sarahclarkenps,bethanylilleynps,jenniferrawlingsnps,maxholgatenps,wjf65j,xzu68s,CZE89A,serenacannannps,qgd46q,santoshchakrabartnps - CASE_SEARCH_USERS: all - ENABLE_SERVERSIDE_PAGING: true - ENABLE_MOVE_TO_RESULTED_ACTION: false - -whitelist: - office: "217.33.148.210/32" - health-kick: "35.177.252.195/32" - mojvpn: "81.134.202.29/32" - cloudplatform-live1-1: "35.178.209.113/32" - cloudplatform-live1-2: "3.8.51.207/32" - cloudplatform-live1-3: "35.177.252.54/32" - ark-internet-1: "194.33.192.0/25" - ark-internet-2: "194.33.196.0/25" - moj-official-aws-prod: "51.149.250.0/24" - global-protect: "35.176.93.186/32" - -resources: - cpu: - limit: 1000m - request: 50m - memory: - limit: 500Mi - request: 100Mi