Skip to content

Commit

Permalink
Merge branch 'master' into DTSPO-18332_TestChanges
Browse files Browse the repository at this point in the history
  • Loading branch information
louisehuyton authored Jan 6, 2025
2 parents 90823c1 + dae19c7 commit 1915499
Show file tree
Hide file tree
Showing 26 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions apps/darts-modernisation/darts-api/darts-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ spec:
values:
java:
replicas: 2
image: sdshmctspublic.azurecr.io/darts/api:prod-b0e6ad3-20250106111443 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-ecc3aa8-20250106145429 # {"$imagepolicy": "flux-system:darts-api"}
disableTraefikTls: true
memoryRequests: '3G'
memoryLimits: '4G'
cpuRequests: '2000m'
cpuLimits: '3000m'
function:
image: sdshmctspublic.azurecr.io/darts/api:prod-b0e6ad3-20250106111443 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-ecc3aa8-20250106145429 # {"$imagepolicy": "flux-system:darts-api"}
memoryRequests: '2G'
memoryLimits: '3G'
darts-portal:
Expand Down
2 changes: 1 addition & 1 deletion apps/darts-modernisation/darts-api/demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ spec:
IS_MOCK_ARM_RPO_DOWNLOAD_CSV: false
RESET_POD: true
function:
image: sdshmctspublic.azurecr.io/darts/api:prod-b0e6ad3-20250106111443 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-ecc3aa8-20250106145429 # {"$imagepolicy": "flux-system:darts-api"}
environment:
ARM_URL: https://www.test.court-tribunal-records-archive.service.justice.gov.uk
2 changes: 1 addition & 1 deletion apps/darts-modernisation/darts-api/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ spec:
pdb:
enabled: false
function:
image: sdshmctspublic.azurecr.io/darts/api:prod-b0e6ad3-20250106111443 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-ecc3aa8-20250106145429 # {"$imagepolicy": "flux-system:darts-api"}
environment:
ARM_URL: https://www.court-tribunal-records-archive.service.justice.gov.uk
2 changes: 1 addition & 1 deletion apps/darts-modernisation/darts-api/stg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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-b0e6ad3-20250106111443 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-ecc3aa8-20250106145429 # {"$imagepolicy": "flux-system:darts-api"}
environment:
ARM_URL: http://darts-stub-services.staging.platform.hmcts.net
2 changes: 1 addition & 1 deletion apps/darts-modernisation/darts-api/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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-b0e6ad3-20250106111443 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-ecc3aa8-20250106145429 # {"$imagepolicy": "flux-system:darts-api"}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
values:
java:
ingressHost: darts-automated-tasks.{{ .Values.global.environment }}.platform.hmcts.net
image: sdshmctspublic.azurecr.io/darts/api:prod-b0e6ad3-20250106111443 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-ecc3aa8-20250106145429 # {"$imagepolicy": "flux-system:darts-api"}
disableTraefikTls: true
memoryRequests: '3G'
memoryLimits: '4G'
Expand All @@ -29,7 +29,7 @@ spec:
NOTIFICATION_SCHEDULER_ENABLED: false
NOTIFICATION_SCHEDULER_CRON: '-'
function:
image: sdshmctspublic.azurecr.io/darts/api:prod-b0e6ad3-20250106111443 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-ecc3aa8-20250106145429 # {"$imagepolicy": "flux-system:darts-api"}
minReplicaCount: 0
maxReplicaCount: 0
# only poll every 24 hours, to prevent DB sessions
Expand Down
2 changes: 1 addition & 1 deletion apps/juror/juror-api/demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
values:
java:
# Uncomment and edit the line below to fix the environment at a specific image
image: sdshmctspublic.azurecr.io/juror/api:pr-830-a57a547-20250106123644 # {"$imagepolicy": "flux-system:juror-api-pr"}
image: sdshmctspublic.azurecr.io/juror/api:pr-830-19b5af2-20250106161520 # {"$imagepolicy": "flux-system:juror-api-pr"}
ingressHost: juror-api.demo.platform.hmcts.net
environment:
RUN_DB_MIGRATION_ON_STARTUP: true
2 changes: 1 addition & 1 deletion apps/juror/juror-api/ithc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
values:
java:
# Uncomment and edit the line below to fix the environment at a specific image
image: sdshmctspublic.azurecr.io/juror/api:pr-830-a57a547-20250106123644 # {"$imagepolicy": "flux-system:juror-api-pr"}
image: sdshmctspublic.azurecr.io/juror/api:pr-830-19b5af2-20250106161520 # {"$imagepolicy": "flux-system:juror-api-pr"}
ingressHost: juror-api.ithc.platform.hmcts.net
environment:
RUN_DB_MIGRATION_ON_STARTUP: true
Expand Down
4 changes: 2 additions & 2 deletions apps/met/batch-jobs/batch-jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
releaseName: libragob-batch-housekeeping
interval: 5m
values:
image: hmctspublic.azurecr.io/libragob/housekeeping:prod-518d4efc-1736155769 #{"$imagepolicy": "flux-system:libragob-batch-housekeeping"}
image: hmctspublic.azurecr.io/libragob/housekeeping:prod-ba82e423-1736178221 #{"$imagepolicy": "flux-system:libragob-batch-housekeeping"}
schedule: "*/1 * * * *"
suspend: false
kind: CronJob
Expand All @@ -34,7 +34,7 @@ spec:
releaseName: libragob-batch-ams-reporting
interval: 5m
values:
image: hmctspublic.azurecr.io/libragob/ams-reporting:prod-518d4efc-1736155768 #{"$imagepolicy": "flux-system:libragob-batch-ams-reporting"}
image: hmctspublic.azurecr.io/libragob/ams-reporting:prod-ba82e423-1736178222 #{"$imagepolicy": "flux-system:libragob-batch-ams-reporting"}
schedule: "*/1 * * * *"
suspend: false
kind: CronJob
Expand Down
4 changes: 2 additions & 2 deletions apps/met/batch-jobs/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
releaseName: libragob-batch-housekeeping
values:
kind: CronJob
image: hmctspublic.azurecr.io/libragob/housekeeping:prod-518d4efc-1736155769 #{"$imagepolicy": "flux-system:libragob-batch-housekeeping"}
image: hmctspublic.azurecr.io/libragob/housekeeping:prod-ba82e423-1736178221 #{"$imagepolicy": "flux-system:libragob-batch-housekeeping"}
schedule: "0 19 * * *"
suspend: false
keyVaults:
Expand Down Expand Up @@ -43,7 +43,7 @@ spec:
releaseName: libragob-batch-ams-reporting
values:
kind: CronJob
image: hmctspublic.azurecr.io/libragob/ams-reporting:prod-518d4efc-1736155768 #{"$imagepolicy": "flux-system:libragob-batch-ams-reporting"}
image: hmctspublic.azurecr.io/libragob/ams-reporting:prod-ba82e423-1736178222 #{"$imagepolicy": "flux-system:libragob-batch-ams-reporting"}
schedule: "*/5 * * * *"
suspend: false
keyVaults:
Expand Down
4 changes: 2 additions & 2 deletions apps/met/batch-jobs/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
releaseName: libragob-batch-housekeeping
values:
kind: CronJob
image: hmctspublic.azurecr.io/libragob/housekeeping:prod-518d4efc-1736155769 #{"$imagepolicy": "flux-system:libragob-batch-housekeeping"}
image: hmctspublic.azurecr.io/libragob/housekeeping:prod-ba82e423-1736178221 #{"$imagepolicy": "flux-system:libragob-batch-housekeeping"}
schedule: "0 19 * * *"
suspend: true
keyVaults:
Expand Down Expand Up @@ -43,7 +43,7 @@ spec:
releaseName: libragob-batch-ams-reporting
values:
kind: CronJob
image: hmctspublic.azurecr.io/libragob/ams-reporting:prod-518d4efc-1736155768 #{"$imagepolicy": "flux-system:libragob-batch-ams-reporting"}
image: hmctspublic.azurecr.io/libragob/ams-reporting:prod-ba82e423-1736178222 #{"$imagepolicy": "flux-system:libragob-batch-ams-reporting"}
schedule: "*/15 * * * *"
suspend: false
keyVaults:
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-cleanup-live-events/demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
jobKind: CronJob
job:
schedule: "30 17 * * *" # 5:30 PM UTC
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
AZURE_SUBSCRIPTION_ID: c68a4bed-4c3d-4956-af51-4ae164c1957c
PLATFORM_ENV_TAG: Demo
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-cleanup-live-events/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ spec:
jobKind: CronJob
job:
schedule: "0 20 * * *" # 8pm every day
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
MEDIA_SERVICE: MediaKind
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-cleanup-live-events/stg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
jobKind: CronJob
job:
schedule: "30 17 * * *" # 5:30 PM UTC
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
AZURE_SUBSCRIPTION_ID: 74dacd4f-a248-45bb-a2f0-af700dc4cf68
PLATFORM_ENV_TAG: Staging
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-cleanup-live-events/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
jobKind: CronJob
job:
schedule: "30 17 * * *" # 5:30 PM UTC
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
AZURE_SUBSCRIPTION_ID: 3eec5bde-7feb-4566-bfb6-805df6e10b90
PLATFORM_ENV_TAG: Test
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-cleanup-streaming-locators/demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
jobKind: CronJob
job:
schedule: "30 18 * * *" # 6:30 PM UTC
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
AZURE_SUBSCRIPTION_ID: c68a4bed-4c3d-4956-af51-4ae164c1957c
PLATFORM_ENV_TAG: Demo
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-cleanup-streaming-locators/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ spec:
jobKind: CronJob
job:
schedule: "0 0 * * *" # 0:00 PM UTC
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
MEDIA_SERVICE: MediaKind
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-cleanup-streaming-locators/stg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
jobKind: CronJob
job:
schedule: "30 18 * * *" # 6:30 PM UTC
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
AZURE_SUBSCRIPTION_ID: 74dacd4f-a248-45bb-a2f0-af700dc4cf68
PLATFORM_ENV_TAG: Staging
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-cleanup-streaming-locators/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
jobKind: CronJob
job:
schedule: "30 18 * * *" # 6:30 PM UTC
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
AZURE_SUBSCRIPTION_ID: 3eec5bde-7feb-4566-bfb6-805df6e10b90
PLATFORM_ENV_TAG: Test
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-close-pending-cases/demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
suspend: false
disableActiveClusterCheck: true
schedule: "0 * * * *"
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
AZURE_SUBSCRIPTION_ID: c68a4bed-4c3d-4956-af51-4ae164c1957c
PLATFORM_ENV_TAG: Demo
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-close-pending-cases/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ spec:
suspend: false
disableActiveClusterCheck: true
schedule: "0 * * * *"
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
MEDIA_SERVICE: MediaKind
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-close-pending-cases/stg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
job:
suspend: false
schedule: "0 * * * *"
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
AZURE_SUBSCRIPTION_ID: 74dacd4f-a248-45bb-a2f0-af700dc4cf68
PLATFORM_ENV_TAG: Staging
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-api-cron-close-pending-cases/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
jobKind: CronJob
job:
schedule: "0 * * * *"
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
environment:
AZURE_SUBSCRIPTION_ID: 3eec5bde-7feb-4566-bfb6-805df6e10b90
PLATFORM_ENV_TAG: Test
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-api/pre-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
values:
java:
replicas: 2
image: sdshmctspublic.azurecr.io/pre/api:prod-71a3b98-20250106092430 # {"$imagepolicy": "flux-system:pre-api"}
image: sdshmctspublic.azurecr.io/pre/api:prod-65dfcd6-20250106160228 # {"$imagepolicy": "flux-system:pre-api"}
disableTraefikTls: true
memoryRequests: '1792Mi'
memoryLimits: '2048Mi'
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-portal/demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
values:
nodejs:
replicas: 2
image: sdshmctspublic.azurecr.io/pre/portal:prod-aaac0f3-20250106141758 # {"$imagepolicy": "flux-system:pre-portal"}
image: sdshmctspublic.azurecr.io/pre/portal:prod-9cfaa72-20250106154200 # {"$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
Expand Down
2 changes: 1 addition & 1 deletion apps/pre/pre-portal/pre-portal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
values:
nodejs:
replicas: 2
image: sdshmctspublic.azurecr.io/pre/portal:prod-aaac0f3-20250106141758 # {"$imagepolicy": "flux-system:pre-portal"}
image: sdshmctspublic.azurecr.io/pre/portal:prod-9cfaa72-20250106154200 # {"$imagepolicy": "flux-system:pre-portal"}
disableTraefikTls: true
cpuRequests: '50m'
cpuLimits: '500m'
Expand Down

0 comments on commit 1915499

Please sign in to comment.