Merge branch 'master' into probate_demo

hmcts · Sep 20, 2024 · fcb6d58 · fcb6d58
2 parents 2e41307 + 7bbf925
commit fcb6d58
Show file tree

Hide file tree

Showing 607 changed files with 1,420 additions and 1,689 deletions.
diff --git a/apps/adoption/adoption-cos-api/aat.yaml b/apps/adoption/adoption-cos-api/aat.yaml
@@ -8,5 +8,5 @@ spec:
  values:
  java:
  environment:
- RELEASE: AGAIN
+ RELEASE: NOW
  APP_INSIGHTS_KEY: '273cc8cd-c511-49ae-9988-9debe01d54d5'
diff --git a/apps/adoption/adoption-cos-api/adoption-cos-api.yaml b/apps/adoption/adoption-cos-api/adoption-cos-api.yaml
@@ -16,7 +16,7 @@ spec:
  readinessTimeout: 5
  readinessPeriod: 15
  useInterpodAntiAffinity: true
- image: hmctspublic.azurecr.io/adoption/cos-api:prod-ba3c30a-20240703140916 #{"$imagepolicy": "flux-system:adoption-cos-api"}
+ image: hmctspublic.azurecr.io/adoption/cos-api:prod-614735d-20240918142518 #{"$imagepolicy": "flux-system:adoption-cos-api"}
  environment:
  LA_PORTAL_BASEURL: https://adoption-web.{{ .Values.global.environment }}.platform.hmcts.net/la-portal/kba-case-ref
  MULTI_CHILDREN_CUI_URL: https://adoption-web.{{ .Values.global.environment }}.platform.hmcts.net/new-application-redirect

diff --git a/apps/adoption/adoption-cos-api/demo.yaml b/apps/adoption/adoption-cos-api/demo.yaml
@@ -7,9 +7,9 @@ spec:
  interval: 1m
  values:
  java:
- image: hmctspublic.azurecr.io/adoption/cos-api:prod-ba3c30a-20240703140916 #{"$imagepolicy": "flux-system:demo-adoption-cos-api"}
+ image: hmctspublic.azurecr.io/adoption/cos-api:prod-614735d-20240918142518 #{"$imagepolicy": "flux-system:demo-adoption-cos-api"}
  environment:
- RELEASE: AGAIN
+ RELEASE: NOW
  APP_INSIGHTS_KEY: '6c5278dd-ee76-4e7b-92f9-57b27ead382e'
  LA_PORTAL_BASEURL: https://adoption-web.{{ .Values.global.environment }}.platform.hmcts.net/la-portal/kba-case-ref
  MULTI_CHILDREN_CUI_URL: https://adoption-web.{{ .Values.global.environment }}.platform.hmcts.net/new-application-redirect

diff --git a/apps/adoption/adoption-cos-api/ithc.yaml b/apps/adoption/adoption-cos-api/ithc.yaml
@@ -8,7 +8,7 @@ spec:
  values:
  java:
  environment:
- RELEASE: AGAIN
+ RELEASE: NOW
  APP_INSIGHTS_KEY: '811b0b32-53bb-4c50-ae35-279b5cd91c40'
  keyVaults:
  adoption:

diff --git a/apps/adoption/adoption-cos-api/perftest.yaml b/apps/adoption/adoption-cos-api/perftest.yaml
@@ -8,7 +8,7 @@ spec:
  values:
  java:
  environment:
- RELEASE: AGAIN
+ RELEASE: NOW
  APP_INSIGHTS_KEY: '8007ea1d-b655-4399-9d4c-b6bc0a4728fb'
  keyVaults:
  adoption:

diff --git a/...tion/adoption-cron-draft-case-deletion-alert/adoption-cron-draft-case-deletion-alert.yaml b/...tion/adoption-cron-draft-case-deletion-alert/adoption-cron-draft-case-deletion-alert.yaml
@@ -6,7 +6,7 @@ spec:
  releaseName: adoption-cron-draft-case-deletion-alert
  values:
  job:
- image: hmctspublic.azurecr.io/adoption/cos-api:prod-ba3c30a-20240703140916 #{"$imagepolicy": "flux-system:adoption-cos-api"}
+ image: hmctspublic.azurecr.io/adoption/cos-api:prod-614735d-20240918142518 #{"$imagepolicy": "flux-system:adoption-cos-api"}
  environment:
  TASK_NAME: AlertDraftCaseApplicantBeforeDeletionTask
  schedule: 0 3 * * *

diff --git a/apps/adoption/adoption-cron-draft-case-deletion-alert/ithc.yaml b/apps/adoption/adoption-cron-draft-case-deletion-alert/ithc.yaml
@@ -7,7 +7,7 @@ spec:
  values:
  job:
  ingressClass: traefik-private
- image: hmctspublic.azurecr.io/adoption/cos-api:prod-ba3c30a-20240703140916 #{"$imagepolicy": "flux-system:demo-adoption-cron-draft-case-deletion-alert"}
+ image: hmctspublic.azurecr.io/adoption/cos-api:prod-614735d-20240918142518 #{"$imagepolicy": "flux-system:demo-adoption-cron-draft-case-deletion-alert"}
  environment:
  VAR: trigger1
  global:

diff --git a/...ulti-child-draft-application-alert/adoption-cron-multi-child-draft-application-alert.yaml b/...ulti-child-draft-application-alert/adoption-cron-multi-child-draft-application-alert.yaml
@@ -6,7 +6,7 @@ spec:
  releaseName: adoption-multi-child-draft-application-alert
  values:
  job:
- image: hmctspublic.azurecr.io/adoption/cos-api:prod-ba3c30a-20240703140916 #{"$imagepolicy": "flux-system:adoption-cos-api"}
+ image: hmctspublic.azurecr.io/adoption/cos-api:prod-614735d-20240918142518 #{"$imagepolicy": "flux-system:adoption-cos-api"}
  environment:
  TASK_NAME: AlertMultiChildApplicationToSubmitTask
  schedule: 0 22 * * *

diff --git a/apps/adoption/adoption-cron-multi-child-draft-application-alert/ithc.yaml b/apps/adoption/adoption-cron-multi-child-draft-application-alert/ithc.yaml
@@ -7,7 +7,7 @@ spec:
  values:
  job:
  ingressClass: traefik-private
- image: hmctspublic.azurecr.io/adoption/cos-api:prod-ba3c30a-20240703140916 #{"$imagepolicy": "flux-system:demo-adoption-cron-draft-case-deletion-alert"}
+ image: hmctspublic.azurecr.io/adoption/cos-api:prod-614735d-20240918142518 #{"$imagepolicy": "flux-system:demo-adoption-cron-draft-case-deletion-alert"}
  environment:
  VAR: trigger1
  global:

diff --git a/apps/adoption/adoption-web/adoption-web.yaml b/apps/adoption/adoption-web/adoption-web.yaml
@@ -16,7 +16,7 @@ spec:
  readinessTimeout: 5
  readinessPeriod: 15
  useInterpodAntiAffinity: true
- image: hmctspublic.azurecr.io/adoption/web:prod-f10db8a-20240731114447 #{"$imagepolicy": "flux-system:adoption-web"}
+ image: hmctspublic.azurecr.io/adoption/web:prod-6a0e88e-20240918145435 #{"$imagepolicy": "flux-system:adoption-web"}
  environment:
  SOCIAL_WORKER_SUPPORTED_DOMAINS:
  - gov.uk
@@ -62,6 +62,8 @@ spec:
  - adoptersforadoption.com
  - diagrama.org
  - sloughchildrenfirst.co.uk
+ - adoptne.org.uk
+ - adoption-focus.org.uk
  COR_VAL: 'Cornwall Council'
  WOL_VAL: 'Wolverhampton City Council'
  SMC_VAL: 'Sandwell Metropolitan Council'

diff --git a/apps/adoption/adoption-web/demo-image-policy.yaml b/apps/adoption/adoption-web/demo-image-policy.yaml
@@ -2,6 +2,14 @@ apiVersion: image.toolkit.fluxcd.io/v1beta1
 kind: ImagePolicy
 metadata:
  name: demo-adoption-web
+ annotations:
+ hmcts.github.com/prod-automated: disabled
 spec:
+ filterTags:
+ pattern: '^pr-1580-[a-f0-9]+-(?P<ts>[0-9]+)'
+ extract: '$ts'
+ policy:
+ alphabetical:
+ order: asc
  imageRepositoryRef:
  name: adoption-web
diff --git a/apps/adoption/adoption-web/demo.yaml b/apps/adoption/adoption-web/demo.yaml
@@ -8,7 +8,7 @@ spec:
  values:
  nodejs:
  readinessPeriod: 15
- image: hmctspublic.azurecr.io/adoption/web:prod-f10db8a-20240731114447 #{"$imagepolicy": "flux-system:demo-adoption-web"}
+ image: hmctspublic.azurecr.io/adoption/web:pr-1580-e1aa6e4-20240919084901 #{"$imagepolicy": "flux-system:demo-adoption-web"}
  environment:
  PCQ_ENABLED: "true"
  APPINSIGHTS_KEY: '6c5278dd-ee76-4e7b-92f9-57b27ead382e'

diff --git a/apps/adoption/adoption-web/ithc.yaml b/apps/adoption/adoption-web/ithc.yaml
@@ -8,7 +8,7 @@ spec:
  values:
  nodejs:
  readinessPeriod: 15
- image: hmctspublic.azurecr.io/adoption/web:prod-f10db8a-20240731114447 #{"$imagepolicy": "flux-system:ithc-adoption-web"}
+ image: hmctspublic.azurecr.io/adoption/web:prod-6a0e88e-20240918145435 #{"$imagepolicy": "flux-system:ithc-adoption-web"}
  environment:
  PCQ_ENABLED: "true"
  APPINSIGHTS_KEY: '811b0b32-53bb-4c50-ae35-279b5cd91c40'

diff --git a/apps/am/am-judicial-booking-service/am-judicial-booking-service.yaml b/apps/am/am-judicial-booking-service/am-judicial-booking-service.yaml
@@ -17,7 +17,7 @@ spec:
  memory:
  enabled: false
  useInterpodAntiAffinity: true
- image: hmctspublic.azurecr.io/am/judicial-booking-service:prod-a628a30-20240904090949 #{"$imagepolicy": "flux-system:am-judicial-booking-service"}
+ image: hmctspublic.azurecr.io/am/judicial-booking-service:prod-5934f96-20240916161621 #{"$imagepolicy": "flux-system:am-judicial-booking-service"}
  chart:
  spec:
  chart: ./stable/am-judicial-booking-service

diff --git a/apps/am/am-judicial-booking-service/demo.yaml b/apps/am/am-judicial-booking-service/demo.yaml
@@ -5,6 +5,6 @@ metadata:
 spec:
  values:
  java:
- image: hmctspublic.azurecr.io/am/judicial-booking-service:prod-a628a30-20240904090949 #{"$imagepolicy": "flux-system:demo-am-judicial-booking-service"}
+ image: hmctspublic.azurecr.io/am/judicial-booking-service:prod-5934f96-20240916161621 #{"$imagepolicy": "flux-system:demo-am-judicial-booking-service"}
  environment:
  AM_INFO: true
diff --git a/apps/am/am-org-role-mapping-service/aat.yaml b/apps/am/am-org-role-mapping-service/aat.yaml
@@ -14,3 +14,4 @@ spec:
  AMQP_JRD_NEW_ASB_ENABLED: true
  AMQP_CRD_NEW_ASB_ENABLED: true
  DUMMY_VAR: true
+ REFRESH_JUDICIAL_FILTER_SOFT_DELETED_USERS: true
diff --git a/apps/am/am-org-role-mapping-service/am-org-role-mapping-service.yaml b/apps/am/am-org-role-mapping-service/am-org-role-mapping-service.yaml
@@ -17,7 +17,7 @@ spec:
  memory:
  enabled: false
  useInterpodAntiAffinity: true
- image: hmctspublic.azurecr.io/am/org-role-mapping-service:prod-2460bb8-20240905141202 #{"$imagepolicy": "flux-system:am-org-role-mapping-service"}
+ image: hmctspublic.azurecr.io/am/org-role-mapping-service:prod-c7492e2-20240919161013 #{"$imagepolicy": "flux-system:am-org-role-mapping-service"}
  chart:
  spec:
  chart: ./stable/am-org-role-mapping-service

diff --git a/apps/am/am-org-role-mapping-service/demo.yaml b/apps/am/am-org-role-mapping-service/demo.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
  values:
  java:
- image: hmctspublic.azurecr.io/am/org-role-mapping-service:prod-2460bb8-20240905141202 #{"$imagepolicy": "flux-system:demo-am-org-role-mapping-service"}
+ image: hmctspublic.azurecr.io/am/org-role-mapping-service:prod-c7492e2-20240919161013 #{"$imagepolicy": "flux-system:demo-am-org-role-mapping-service"}
  environment:
  AM_INFO: true
  APPLICATION_LOGGING_LEVEL: DEBUG

diff --git a/apps/am/am-role-assignment-batch-service/am-role-assignment-batch-service.yaml b/apps/am/am-role-assignment-batch-service/am-role-assignment-batch-service.yaml
@@ -7,7 +7,7 @@ spec:
  values:
  job:
  useInterpodAntiAffinity: true
- image: hmctspublic.azurecr.io/am/role-assignment-batch-service:prod-0a8f41f-20240904103349 #{"$imagepolicy": "flux-system:am-role-assignment-batch-service"}
+ image: hmctspublic.azurecr.io/am/role-assignment-batch-service:prod-209864f-20240916160111 #{"$imagepolicy": "flux-system:am-role-assignment-batch-service"}
  chart:
  spec:
  chart: ./stable/am-role-assignment-batch-service

diff --git a/apps/am/am-role-assignment-batch-service/demo.yaml b/apps/am/am-role-assignment-batch-service/demo.yaml
@@ -6,7 +6,7 @@ spec:
  values:
  job:
  schedule: "*/10 * * * *"
- image: hmctspublic.azurecr.io/am/role-assignment-batch-service:prod-0a8f41f-20240904103349 #{"$imagepolicy": "flux-system:demo-am-role-assignment-batch-service"}
+ image: hmctspublic.azurecr.io/am/role-assignment-batch-service:prod-209864f-20240916160111 #{"$imagepolicy": "flux-system:demo-am-role-assignment-batch-service"}
  environment:
  DELETE_ORG: false
  CCD_AM_MIGRATION_MASTER_FLAG: false

diff --git a/apps/am/am-role-assignment-refresh-batch/am-role-assignment-refresh-batch.yaml b/apps/am/am-role-assignment-refresh-batch/am-role-assignment-refresh-batch.yaml
@@ -7,7 +7,7 @@ spec:
  values:
  job:
  useInterpodAntiAffinity: true
- image: hmctspublic.azurecr.io/am/role-assignment-refresh-batch:prod-9843747-20240904091011 #{"$imagepolicy": "flux-system:am-role-assignment-refresh-batch"}
+ image: hmctspublic.azurecr.io/am/role-assignment-refresh-batch:prod-5ea8cb9-20240916160129 #{"$imagepolicy": "flux-system:am-role-assignment-refresh-batch"}
  chart:
  spec:
  chart: ./stable/am-role-assignment-refresh-batch

diff --git a/apps/am/am-role-assignment-refresh-batch/demo.yaml b/apps/am/am-role-assignment-refresh-batch/demo.yaml
@@ -9,4 +9,4 @@ spec:
  environment:
  DELETE_ORG: false
  AM_RAS_URL: http://am-role-assignment-service-demo.service.core-compute-demo.internal
- image: hmctspublic.azurecr.io/am/role-assignment-refresh-batch:prod-9843747-20240904091011 #{"$imagepolicy": "flux-system:demo-am-role-assignment-refresh-batch"}
+ image: hmctspublic.azurecr.io/am/role-assignment-refresh-batch:prod-5ea8cb9-20240916160129 #{"$imagepolicy": "flux-system:demo-am-role-assignment-refresh-batch"}
diff --git a/apps/am/am-role-assignment-service/am-role-assignment-service.yaml b/apps/am/am-role-assignment-service/am-role-assignment-service.yaml
@@ -18,7 +18,7 @@ spec:
  enabled: false
  useInterpodAntiAffinity: true
  readinessDelay: 45
- image: hmctspublic.azurecr.io/am/role-assignment-service:prod-26244aa-20240905100619 #{"$imagepolicy": "flux-system:am-role-assignment-service"}
+ image: hmctspublic.azurecr.io/am/role-assignment-service:prod-7c34b1a-20240919095303 #{"$imagepolicy": "flux-system:am-role-assignment-service"}
  chart:
  spec:
  chart: ./stable/am-role-assignment-service

diff --git a/apps/am/am-role-assignment-service/demo.yaml b/apps/am/am-role-assignment-service/demo.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
  values:
  java:
- image: hmctspublic.azurecr.io/am/role-assignment-service:prod-26244aa-20240905100619 #{"$imagepolicy": "flux-system:demo-am-role-assignment-service"}
+ image: hmctspublic.azurecr.io/am/role-assignment-service:prod-7c34b1a-20240919095303 #{"$imagepolicy": "flux-system:demo-am-role-assignment-service"}
  environment:
  AM_INFO: true
  APPLICATION_LOGGING_LEVEL: DEBUG