Merge branch 'master' into sdp-udpate-dev-shir

hmcts · Jan 20, 2025 · e5885fe · e5885fe
2 parents 1538fa0 + 9f10263
commit e5885fe
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 13 deletions.
diff --git a/apps/darts-modernisation/darts-api/darts-api.yaml b/apps/darts-modernisation/darts-api/darts-api.yaml
@@ -16,14 +16,14 @@ spec:
   values:
     java:
       replicas: 2
-      image: sdshmctspublic.azurecr.io/darts/api:prod-ba3152b-20250117184533 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-9839545-20250120162244 # {"$imagepolicy": "flux-system:darts-api"}
       disableTraefikTls: true
       memoryRequests: '3G'
       memoryLimits: '4G'
       cpuRequests: '2000m'
       cpuLimits: '3000m'
     function:
-      image: sdshmctspublic.azurecr.io/darts/api:prod-ba3152b-20250117184533 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-9839545-20250120162244 # {"$imagepolicy": "flux-system:darts-api"}
       memoryRequests: '2G'
       memoryLimits: '3G'
     darts-portal:

diff --git a/apps/darts-modernisation/darts-api/demo.yaml b/apps/darts-modernisation/darts-api/demo.yaml
@@ -24,6 +24,6 @@ spec:
         IS_MOCK_ARM_RPO_DOWNLOAD_CSV: false
         RESET_POD: true
     function:
-      image: sdshmctspublic.azurecr.io/darts/api:prod-ba3152b-20250117184533 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-9839545-20250120162244 # {"$imagepolicy": "flux-system:darts-api"}
       environment:
         ARM_URL: https://www.test.court-tribunal-records-archive.service.justice.gov.uk
diff --git a/apps/darts-modernisation/darts-api/prod.yaml b/apps/darts-modernisation/darts-api/prod.yaml
@@ -28,6 +28,6 @@ spec:
       pdb:
         enabled: false
     function:
-      image: sdshmctspublic.azurecr.io/darts/api:prod-ba3152b-20250117184533 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-9839545-20250120162244 # {"$imagepolicy": "flux-system:darts-api"}
       environment:
         ARM_URL: https://www.court-tribunal-records-archive.service.justice.gov.uk
diff --git a/apps/darts-modernisation/darts-api/stg.yaml b/apps/darts-modernisation/darts-api/stg.yaml
@@ -23,6 +23,6 @@ spec:
         IS_MOCK_ARM_RPO_DOWNLOAD_CSV: true
         MODERNISED_DARTS_START_DATE: '2024-12-01'
     function:
-      image: sdshmctspublic.azurecr.io/darts/api:prod-ba3152b-20250117184533 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-9839545-20250120162244 # {"$imagepolicy": "flux-system:darts-api"}
       environment:
         ARM_URL: http://darts-stub-services.staging.platform.hmcts.net
diff --git a/apps/darts-modernisation/darts-api/test.yaml b/apps/darts-modernisation/darts-api/test.yaml
@@ -23,4 +23,4 @@ spec:
         MODERNISED_DARTS_START_DATE: '2024-10-01'
         IS_MOCK_ARM_RPO_DOWNLOAD_CSV: true
     function:
-      image: sdshmctspublic.azurecr.io/darts/api:prod-ba3152b-20250117184533 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-9839545-20250120162244 # {"$imagepolicy": "flux-system:darts-api"}
diff --git a/apps/darts-modernisation/darts-automated-tasks/darts-automated-tasks.yaml b/apps/darts-modernisation/darts-automated-tasks/darts-automated-tasks.yaml
@@ -16,7 +16,7 @@ spec:
   values:
     java:
       ingressHost: darts-automated-tasks.{{ .Values.global.environment }}.platform.hmcts.net
-      image: sdshmctspublic.azurecr.io/darts/api:prod-ba3152b-20250117184533 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-9839545-20250120162244 # {"$imagepolicy": "flux-system:darts-api"}
       disableTraefikTls: true
       memoryRequests: '3G'
       memoryLimits: '4G'
@@ -29,7 +29,7 @@ spec:
         NOTIFICATION_SCHEDULER_ENABLED: false
         NOTIFICATION_SCHEDULER_CRON: '-'
     function:
-      image: sdshmctspublic.azurecr.io/darts/api:prod-ba3152b-20250117184533 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-9839545-20250120162244 # {"$imagepolicy": "flux-system:darts-api"}
       minReplicaCount: 0
       maxReplicaCount: 0
       # only poll every 24 hours, to prevent DB sessions

diff --git a/apps/darts-modernisation/darts-portal/darts-portal.yaml b/apps/darts-modernisation/darts-portal/darts-portal.yaml
@@ -15,5 +15,5 @@ spec:
   values:
     nodejs:
       replicas: 2
-      image: sdshmctspublic.azurecr.io/darts/portal:prod-e19a42d-20250117104621 # {"$imagepolicy": "flux-system:darts-portal"}
+      image: sdshmctspublic.azurecr.io/darts/portal:prod-7f01a99-20250120164330 # {"$imagepolicy": "flux-system:darts-portal"}
       disableTraefikTls: true
diff --git a/apps/pre/pre-portal/demo.yaml b/apps/pre/pre-portal/demo.yaml
@@ -8,7 +8,7 @@ spec:
   values:
     nodejs:
       replicas: 2
-      image: sdshmctspublic.azurecr.io/pre/portal:prod-80d1363-20250120102742 # {"$imagepolicy": "flux-system:pre-portal"}
+      image: sdshmctspublic.azurecr.io/pre/portal:prod-0cdc701-20250120164738 # {"$imagepolicy": "flux-system:pre-portal"}
       ingressHost: pre-portal.demo.platform.hmcts.net
       environment:
         PRE_API_URL: https://sds-api-mgmt.demo.platform.hmcts.net/pre-api

diff --git a/apps/pre/pre-portal/pre-portal.yaml b/apps/pre/pre-portal/pre-portal.yaml
@@ -15,7 +15,7 @@ spec:
   values:
     nodejs:
       replicas: 2
-      image: sdshmctspublic.azurecr.io/pre/portal:prod-80d1363-20250120102742 # {"$imagepolicy": "flux-system:pre-portal"}
+      image: sdshmctspublic.azurecr.io/pre/portal:prod-0cdc701-20250120164738 # {"$imagepolicy": "flux-system:pre-portal"}
       disableTraefikTls: true
       cpuRequests: '50m'
       cpuLimits: '500m'

diff --git a/apps/vh/user-api/dev.yaml b/apps/vh/user-api/dev.yaml
@@ -8,4 +8,4 @@ spec:
   values:
     java:
       ingressHost: vh-user-api.dev.platform.hmcts.net
-      image: sdshmctspublic.azurecr.io/vh/user-api:dev-663443c-202501201510 #{"$imagepolicy": "flux-system:vh-user-api-dev"}
+      image: sdshmctspublic.azurecr.io/vh/user-api:dev-3609c86-202501201718 #{"$imagepolicy": "flux-system:vh-user-api-dev"}
diff --git a/apps/vh/video-web/dev.yaml b/apps/vh/video-web/dev.yaml
@@ -10,4 +10,4 @@ spec:
       ingressHost: vh-video-web.dev.platform.hmcts.net
       ingressAnnotations:
         external-dns.alpha.kubernetes.io/exclude: "true"
-      image: sdshmctspublic.azurecr.io/vh/video-web:dev-273443a-202501161404 # {"$imagepolicy": "flux-system:vh-video-web-dev"}
+      image: sdshmctspublic.azurecr.io/vh/video-web:dev-2b1f818-202501201712 # {"$imagepolicy": "flux-system:vh-video-web-dev"}
diff --git a/bin/v2/postgres-setup.sh b/bin/v2/postgres-setup.sh
@@ -102,6 +102,7 @@ resources:
   - ../../../base
   - ../../../azureserviceoperator-system/resources/resource-group.yaml
   - ../../../azureserviceoperator-system/resources/flexibleserver-postgres.yaml
+  - ../../../azureserviceoperator-system/resources/flexibleserver-postgres-config.yaml
   - ../sops-secrets
 namespace: $NAMESPACE_NAME
 patches: