From 33035d3b1dda3faeea745a05e134cba05389da97 Mon Sep 17 00:00:00 2001
From: arun <arun.kumar@hmcts.net>
Date: Tue, 14 Jul 2026 16:36:09 +0100
Subject: [PATCH 1/2] HDPI-3460: run ccd-case-disposer in preview envs every 10
 mins

---
 charts/pcs-api/Chart.yaml                     |  6 +-
 .../pcs-api/values.ccd.preview.template.yaml  | 56 +++++++++++++++++++
 charts/pcs-api/values.yaml                    |  2 +
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/charts/pcs-api/Chart.yaml b/charts/pcs-api/Chart.yaml
index 6bd2fa4843..679342554c 100644
--- a/charts/pcs-api/Chart.yaml
+++ b/charts/pcs-api/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.0"
 description: A Helm chart for pcs-api App
 name: pcs-api
 home: https://github.com/hmcts/pcs-api
-version: 0.0.73
+version: 0.0.74
 maintainers:
   - name: HMCTS pcs team
 dependencies:
@@ -34,3 +34,7 @@ dependencies:
     version: 1.7.18
     repository: 'oci://hmctsprod.azurecr.io/helm'
     condition: ccd-case-document-am-api.enabled
+  - name: ccd-case-disposer
+    version: 0.2.38
+    repository: 'oci://hmctsprod.azurecr.io/helm'
+    condition: ccd-case-disposer.enabled
diff --git a/charts/pcs-api/values.ccd.preview.template.yaml b/charts/pcs-api/values.ccd.preview.template.yaml
index 4e4b515f9a..5616617c97 100644
--- a/charts/pcs-api/values.ccd.preview.template.yaml
+++ b/charts/pcs-api/values.ccd.preview.template.yaml
@@ -240,3 +240,59 @@ ccd-case-document-am-api:
         secrets:
           - name: ccd-case-document-am-api-s2s-secret
             alias: CASE_DOCUMENT_AM_API_S2S_SECRET
+
+# LAU's ccd-case-disposer, pointed at THIS preview environment's CCD database and Elasticsearch.
+# LAU's own scheduled instance can never reach a preview env (the CCD DB is on a private endpoint
+# in the preview VNet and ES is an in-cluster service), so we run their chart here instead.
+# Hard-deletes PCS cases whose resolved_ttl has passed, i.e. cases deleted via deleteThisCase.
+# Preview only: disabled by default in values.yaml. Credentials come from the ccd key vault.
+ccd-case-disposer:
+  enabled: true
+  global:
+    jobKind: CronJob
+    enableKeyVaults: true
+    # preview is not an "active cron cluster", so without this the job chart suspends the CronJob
+    disableActiveClusterCheck: true
+  job:
+    kind: CronJob
+    suspend: false
+    schedule: "*/10 * * * *"
+    startingDeadlineSeconds: 180
+    concurrencyPolicy: Forbid
+    releaseNameOverride: ${SERVICE_NAME}-case-disposer
+    image: hmctsprod.azurecr.io/ccd/case-disposer:latest
+    aadIdentityName: ccd
+    keyVaults:
+      ccd:
+        secrets:
+          - name: app-insights-connection-string
+            alias: app-insights-connection-string
+          - name: idam-case-disposer-system-user-username
+            alias: IDAM_CASE_DISPOSER_SYSTEM_USER_USERNAME
+          - name: idam-case-disposer-system-user-password
+            alias: IDAM_CASE_DISPOSER_SYSTEM_USER_PASSWORD
+          - name: idam-case-disposer-client-secret
+            alias: IDAM_CASE_DISPOSER_CLIENT_SECRET
+          - name: ccd-case-disposer-s2s-secret
+            alias: IDAM_KEY_CCD_CASE_DISPOSER
+    secrets:
+      DATA_STORE_DB_PASSWORD:
+        secretRef: "{{ .Values.global.postgresSecret }}"
+        key: PASSWORD
+    environment:
+      DATA_STORE_DB_HOST: '{{ tpl .Values.global.postgresHostname $ }}'
+      DATA_STORE_DB_PORT: 5432
+      DATA_STORE_DB_NAME: "{{ .Values.global.databaseNamePrefix }}data-store"
+      DATA_STORE_DB_USERNAME: "{{ .Values.global.postgresUsername }}"
+      DATA_STORE_DB_OPTIONS: "?sslmode=require"
+      ELASTIC_SEARCH_ENABLED: true
+      ELASTIC_SEARCH_DATA_NODES_HOSTS: "http://{{ .Release.Name }}-es-master:9200"
+      DELETE_CASE_TYPES: "PCS"
+      SIMULATED_CASE_TYPES:
+      CASE_COLLECTOR_VERSION: 2
+      DEFINITION_STORE_HOST: http://${SERVICE_NAME}-ccd-definition-store
+      DOCUMENT_STORE_HOST: http://dm-store-aat.service.core-compute-aat.internal
+      ROLE_ASSIGNMENT_HOST: http://am-role-assignment-service-aat.service.core-compute-aat.internal
+      LOG_AND_AUDIT_HOST: http://lau-case-backend-aat.service.core-compute-aat.internal
+      IDAM_API_URL: https://idam-api.aat.platform.hmcts.net
+      IDAM_S2S_URL: http://rpe-service-auth-provider-aat.service.core-compute-aat.internal
diff --git a/charts/pcs-api/values.yaml b/charts/pcs-api/values.yaml
index 53dd7fcd63..ffb9f47ea9 100644
--- a/charts/pcs-api/values.yaml
+++ b/charts/pcs-api/values.yaml
@@ -64,3 +64,5 @@ wiremock:
   enabled: false
 ccd-case-document-am-api:
   enabled: false
+ccd-case-disposer:
+  enabled: false

From 9ffff394112308d5ae240430e66931d846006d8f Mon Sep 17 00:00:00 2001
From: hmcts-jenkins-j-to-z
 <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com>
Date: Thu, 16 Jul 2026 10:27:43 +0000
Subject: [PATCH 2/2] Bumping chart version/ fixing aliases

---
 charts/pcs-api/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/pcs-api/Chart.yaml b/charts/pcs-api/Chart.yaml
index 679342554c..bda56ef30c 100644
--- a/charts/pcs-api/Chart.yaml
+++ b/charts/pcs-api/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.0"
 description: A Helm chart for pcs-api App
 name: pcs-api
 home: https://github.com/hmcts/pcs-api
-version: 0.0.74
+version: 0.0.75
 maintainers:
   - name: HMCTS pcs team
 dependencies: