Skip to content

Commit

Permalink
CIV-14663 Use wa chart plus latest ccd and service bus (#4200)
Browse files Browse the repository at this point in the history 
* use wa chart

* Bumping chart version/ fixing aliases

* bump service bus chart version

* change preview config

* fix camunda config

* fix camunda config

* fix camunda config

* fix camunda config

* bump civil-service charts

* bump chart versions

* add postgresql chart

* add config

* fix indentation

* Update Chart.yaml

* correcting key vault entries

* clean up

* correct civil service to latest version

* Update Chart.yaml

* Update Chart.yaml

* remove the latest and set back old version of service bus

* few changes

* few corrections

* put back properties

* changes

* Update values.enableWA.preview.template.yaml

* few more changes

* Update values.enableWA.preview.template.yaml

* few changes

* Update values.preview.template.yaml

* Update values.enableWA.preview.template.yaml

* upgrade wa chart

* adding replica db

* cleaning up and increasing postgres cpu

* change to latest stable wa chart

* remove echo on unit test

---------

Co-authored-by: hmcts-jenkins-a-to-c <62422075+hmcts-jenkins-a-to-c[bot]@users.noreply.github.com>
Co-authored-by: vasudevganesanhmcts <[email protected]>
  • Loading branch information
@sankaviv1 @hmcts-jenkins-a-to-c @vasudevganesanhmcts
3 people authored Jul 25, 2024
1 parent f2c6444 commit 8b26dcf
Show file tree
Hide file tree
Showing 4 changed files with 156 additions and 192 deletions.
37 changes: 8 additions & 29 deletions charts/civil-citizen-ui/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: "1.1"
description: Helm chart for the HMCTS Civil Citizen Frontend service
name: civil-citizen-ui
home: https://github.com/hmcts/civil-citizen-ui
version: 0.0.92
version: 0.0.93
maintainers:
- name: HMCTS Civil Citizen Ui team

Expand All @@ -12,11 +12,11 @@ dependencies:
version: 3.1.0
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
- name: civil-service
version: 0.0.57
version: 0.0.67
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: civil-service.enabled
- name: ccd
version: 8.0.29
version: 9.0.21
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: ccd.enabled
- name: xui-webapp
Expand All @@ -28,41 +28,20 @@ dependencies:
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: idam-pr.enabled
- name: camunda-bpm
version: 0.0.43
version: 0.0.44
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: camunda-bpm.enabled
- name: servicebus
version: 1.0.4
version: 1.0.7
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: servicebus.enabled
- name: civil-general-applications
version: 0.0.60
version: 0.0.64
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: civil-general-applications.enabled
# WA
- name: wa-task-management-api
version: ~0.0.37
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: civil-wa.enabled
- name: wa-task-monitor
version: ~0.0.27
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: civil-wa.enabled
- name: wa-case-event-handler
version: 0.0.37
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: civil-wa.enabled
- name: wa-workflow-api
version: 0.0.36
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: civil-wa.enabled
# WA Crons
- name: wa-task-batch-service
version: ~0.0.15
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: civil-wa.enabled
- name: wa-message-cron-service
version: ~0.0.3
- name: wa
version: 1.0.6
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: civil-wa.enabled
# CCD message publisher
Expand Down
262 changes: 110 additions & 152 deletions charts/civil-citizen-ui/values.enableWA.preview.template.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,112 @@
civil-wa:
servicebus:
enabled: true
releaseNameOverride: ${SERVICE_NAME}-asb
resourceGroup: civil-aso-preview-rg
sbNamespace: civil-servicebus-preview # due to a bug https://github.com/kubernetes-sigs/kustomize/issues/5072 this value is set to civil, when this bug is resolved, the sbNamespace should be changed to the actual name of the Service Bus Namespace (civil-sb-preview)
setup:
topics:
- name: ccd-case-events
subscriptionNeeded: yes
requiresSession: true

global:
jobKind: CronJob

camunda-bpm:
enabled: false

civil-wa:
enabled: true

wa:
enabled: true
global:
postgresUsername: hmcts
postgresSecret: postgres
postgresHost: ${SERVICE_NAME}-postgresql
# postgresHost: civil-preview.postgres.database.azure.com
# databaseNamePrefix: "pr-${CHANGE_ID}-"
wa:
postgresql:
enabled: false
wa-case-event-handler:
java:
ingressHost: wa-case-event-handler-${SERVICE_FQDN}
releaseNameOverride: ${SERVICE_NAME}-wa-case-event-handler
secrets:
AZURE_SERVICE_BUS_CONNECTION_STRING:
secretRef: civil-sb-preview
key: connectionString
POSTGRES_PASSWORD:
secretRef: "{{ .Values.global.postgresSecret }}"
key: PASSWORD
disabled: true
environment:
CCD_URL: http://{{ .Release.Name }}-ccd-data-store-api
CAMUNDA_URL: http://{{ .Release.Name }}-camunda/engine-rest
CCD_SEARCH_URL: http://{{ .Release.Name }}-ccd-data-store-api
ROLE_ASSIGNMENT_URL: http://am-role-assignment-service-aat.service.core-compute-aat.internal
WA_WORKFLOW_API_URL: "http://{{ .Release.Name }}-wa-workflow-api"
WA_TASK_MANAGEMENT_API_URL: "http://{{ .Release.Name }}-wa-task-management-api"
AZURE_SERVICE_BUS_TOPIC_NAME: ${SERVICE_NAME}-asb-ccd-case-events
AZURE_SERVICE_BUS_SUBSCRIPTION_NAME: ${SERVICE_NAME}-asb-ccd-case-events
#AZURE_SERVICE_BUS_TOPIC_NAME: servicebus-topic-{{ .Release.Name }}-asb-ccd-case-events
AZURE_SERVICE_BUS_CCD_CASE_EVENTS_SUBSCRIPTION_NAME: ${SERVICE_NAME}-asb-ccd-case-events
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_CONNECTION_OPTIONS: "?stringtype=unspecified"
wa-task-monitor:
java:
ingressHost: wa-task-monitor-${SERVICE_FQDN}
environment:
WA_TASK_MANAGEMENT_API_URL: http://{{ .Release.Name }}-wa-task-management-api
ROLE_ASSIGNMENT_URL: http://am-role-assignment-service-aat.service.core-compute-aat.internal
wa-task-management-api:
java:
environment:
ROLE_ASSIGNMENT_URL: http://am-role-assignment-service-aat.service.core-compute-aat.internal
POSTGRES_CONNECTION_OPTIONS: "?stringtype=unspecified"
POSTGRES_HOST: "{{ .Release.Name }}-postgresql"
POSTGRES_REPLICA_HOST: "{{ .Release.Name }}-postgresql"
POSTGRES_REPLICA_PORT: 5432
POSTGRES_NAME: "cft_task_db"
POSTGRES_REPLICA_NAME: "cft_task_db_replica"
POSTGRES_USERNAME: postgres
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
REPLICATION_USERNAME: postgres
REPLICATION_PASSWORD: ${POSTGRES_PASSWORD}
SPRING_PROFILES_ACTIVE: "preview"
DB_READER_USERNAME: postgres
secrets:
POSTGRES_PASSWORD:
secretRef: "{{ .Values.global.postgresSecret }}"
key: PASSWORD
disabled: true
wa-workflow-api:
java:
environment:
DB_READER_USERNAME: "hmcts"
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_CONNECTION_OPTIONS: "?stringtype=unspecified"
CAMUNDA_URL: https://camunda-${SERVICE_FQDN}/engine-rest/
secrets:
POSTGRES_PASSWORD:
secretRef: "{{ .Values.global.postgresSecret }}"
key: PASSWORD
disabled: true
camunda-bpm:
java:
environment:
CAMUNDA_DB_USER_NAME: "hmcts"
CAMUNDA_DB_PASSWORD: ${POSTGRES_PASSWORD}
CAMUNDA_DB_CONN_OPTIONS: "?stringtype=unspecified"
CAMUNDA_DB_NAME: 'camunda'
TASK_MANAGEMENT_API_URL: http://{{ .Release.Name }}-wa-task-management-api
CAMUNDA_API_AUTH_ENABLED: false
secrets:
CAMUNDA_DB_PASSWORD:
secretRef: "{{ .Values.global.postgresSecret }}"
key: PASSWORD
disabled: true
ccd-message-publisher:
java:
ingressHost: ccd-message-publisher-${SERVICE_FQDN}
Expand All @@ -15,164 +118,19 @@ ccd-message-publisher:
alias: azure.application-insights.instrumentation-key
environment:
DATA_STORE_DB_HOST: "{{ .Release.Name }}-postgresql"
DATA_STORE_DB_NAME: data-store
DATA_STORE_DB_NAME: "data-store"
DATA_STORE_DB_USERNAME: hmcts
DATA_STORE_DB_PASSWORD: hmcts
DATA_STORE_DB_PASSWORD: ${POSTGRES_PASSWORD}
DATA_STORE_DB_OPTIONS: "?stringtype=unspecified"
CCD_CASE_EVENTS_DESTINATION: ${SERVICE_NAME}-asb-ccd-case-events
secrets:
SERVICE_BUS_CONNECTION_STRING:
secretRef: civil-sb-preview
key: connectionString

servicebus:
enabled: true
releaseNameOverride: ${SERVICE_NAME}-asb
resourceGroup: civil-aso-preview-rg
sbNamespace: civil-servicebus-preview # due to a bug https://github.com/kubernetes-sigs/kustomize/issues/5072 this value is set to civil, when this bug is resolved, the sbNamespace should be changed to the actual name of the Service Bus Namespace (civil-sb-preview)
setup:
topics:
- name: ccd-case-events
subscriptionNeeded: yes
requiresSession: true

wa-task-management-api:
java:
releaseNameOverride: ${SERVICE_NAME}-wa-task-management-api
ingressHost: wa-task-management-api-${SERVICE_FQDN}
keyVaults:
wa:
secrets:
- name: app-insights-connection-string
alias: app-insights-connection-string
- name: wa-system-username
alias: WA_SYSTEM_USERNAME
- name: wa-system-password
alias: WA_SYSTEM_PASSWORD
- name: wa-idam-client-secret
alias: WA_IDAM_CLIENT_SECRET
- name: s2s-secret-task-management-api
alias: S2S_SECRET_TASK_MANAGEMENT_API
- name: ld-secret
alias: LAUNCH_DARKLY_SDK_KEY
environment:
CAMUNDA_URL: http://{{ .Release.Name }}-camunda/engine-rest
ROLE_ASSIGNMENT_URL: http://am-role-assignment-service-aat.service.core-compute-aat.internal
POSTGRES_HOST: "{{ .Release.Name }}-postgresql"
POSTGRES_NAME: cft_task_db
POSTGRES_USERNAME: postgres
POSTGRES_PASSWORD: hmcts
POSTGRES_CONNECTION_OPTIONS: ""
CCD_URL: http://{{ .Release.Name }}-ccd-data-store-api

wa-task-monitor:
java:
ingressHost: wa-task-monitor-${SERVICE_FQDN}
releaseNameOverride: ${SERVICE_NAME}-wa-task-monitor
keyVaults:
wa:
secrets:
- name: app-insights-connection-string
alias: app-insights-connection-string
- name: s2s-secret-task-monitor
alias: S2S_SECRET_TASK_MONITOR
- name: wa-system-username
alias: WA_SYSTEM_USERNAME
- name: wa-system-password
alias: WA_SYSTEM_PASSWORD
- name: wa-idam-client-secret
alias: WA_IDAM_CLIENT_SECRET
environment:
CAMUNDA_URL: http://{{ .Release.Name }}-camunda/engine-rest
TASK_MANAGEMENT_SERVICE_URL: http://{{ .Release.Name }}-wa-task-management-api
WA_TASK_MANAGEMENT_API_URL: http://{{ .Release.Name }}-wa-task-management-api
CASE_EVENT_HANDLER_SERVICE_URL: http://{{ .Release.Name }}-wa-case-event-handler
CCD_SEARCH_URL: http://{{ .Release.Name }}-ccd-data-store-api
CCD_URL: http://{{ .Release.Name }}-ccd-data-store-api
ROLE_ASSIGNMENT_URL: http://am-role-assignment-service-aat.service.core-compute-aat.internal

wa-case-event-handler:
java:
ingressHost: wa-case-event-handler-${SERVICE_FQDN}
releaseNameOverride: ${SERVICE_NAME}-wa-case-event-handler
secrets:
AZURE_SERVICE_BUS_CONNECTION_STRING:
secretRef: civil-sb-preview
key: connectionString
keyVaults:
wa:
secrets:
- name: s2s-secret-case-event-handler
alias: S2S_SECRET_CASE_EVENT_HANDLER
- name: ld-secret
alias: LAUNCH_DARKLY_SDK_KEY
- name: wa-idam-client-secret
alias: WA_IDAM_CLIENT_SECRET
environment:
CAMUNDA_URL: http://{{ .Release.Name }}-camunda/engine-rest
CCD_URL: http://{{ .Release.Name }}-ccd-data-store-api
CCD_SEARCH_URL: http://{{ .Release.Name }}-ccd-data-store-api
ROLE_ASSIGNMENT_URL: http://am-role-assignment-service-aat.service.core-compute-aat.internal
WA_WORKFLOW_API_URL: http://{{ .Release.Name }}-wa-workflow-api
WA_TASK_MANAGEMENT_API_URL: http://{{ .Release.Name }}-wa-task-management-api
AZURE_SERVICE_BUS_TOPIC_NAME: ${SERVICE_NAME}-asb-ccd-case-events
AZURE_SERVICE_BUS_SUBSCRIPTION_NAME: ${SERVICE_NAME}-asb-ccd-case-events
#AZURE_SERVICE_BUS_TOPIC_NAME: servicebus-topic-{{ .Release.Name }}-asb-ccd-case-events
AZURE_SERVICE_BUS_CCD_CASE_EVENTS_SUBSCRIPTION_NAME: ${SERVICE_NAME}-asb-ccd-case-events
POSTGRES_HOST: "{{ .Release.Name }}-postgresql"
POSTGRES_NAME: wa-case-event-handler
POSTGRES_USERNAME: hmcts
POSTGRES_PASSWORD: hmcts
POSTGRES_CONNECTION_OPTIONS: ""

wa-workflow-api:
java:
ingressHost: wa-workflow-api-${SERVICE_FQDN}
releaseNameOverride: ${SERVICE_NAME}-wa-workflow-api
keyVaults:
wa:
secrets:
- name: app-insights-connection-string
alias: app-insights-connection-string
- name: s2s-secret-workflow-api
alias: S2S_SECRET_WORKFLOW_API
- name: ld-secret
alias: LAUNCH_DARKLY_SDK_KEY
environment:
CAMUNDA_URL: http://{{ .Release.Name }}-camunda/engine-rest
POSTGRES_HOST: "{{ .Release.Name }}-postgresql"
POSTGRES_NAME: wa_workflow_api
POSTGRES_USERNAME: hmcts
POSTGRES_PASSWORD: hmcts
POSTGRES_CONNECTION_OPTIONS: ""
TASK_MANAGEMENT_URL: http://{{ .Release.Name }}-wa-task-management-api

wa-message-cron-service:
job:
releaseNameOverride: ${SERVICE_NAME}-wa-message-cron-service
keyVaults:
wa:
secrets:
- s2s-secret-case-event-handler
environment:
WA_CASE_EVENT_HANDLER_SERVICE_URL: http://{{ .Release.Name }}-wa-case-event-handler

wa-task-batch-service:
job:
kind: CronJob
releaseNameOverride: ${SERVICE_NAME}-wa-task-batch-service
schedule: "*/5 * * * *"
aadIdentityName: wa
keyVaults:
wa:
secrets:
- s2s-secret-task-monitor
environment:
S2S_URL: "http://rpe-service-auth-provider-aat.service.core-compute-aat.internal"
S2S_MICROSERVICE_NAME_TASK_MONITOR: "wa_task_monitor"
WA_TASK_MONITOR_SERVICE_URL: http://{{ .Release.Name }}-wa-task-monitor
JOB_NAME: "INITIATION"
ALLOW_CONFIG_MUTATIONS: true
DATA_STORE_DB_PASSWORD:
secretRef: postgres
key: PASSWORD
disabled: true

xui-webapp:
nodejs:
Expand Down
Loading

0 comments on commit 8b26dcf

Please sign in to comment.