Skip to content

Commit

Permalink
Merge branch 'master' into PUB-2682-Deploy-ListType-Subscription
Browse files Browse the repository at this point in the history
  • Loading branch information
junaidiqbalmoj committed Dec 5, 2024
2 parents 111ede2 + 0a98513 commit d3ce516
Show file tree
Hide file tree
Showing 29 changed files with 34 additions and 32 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-fc81390-20241204154506 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-d67903f-20241205110323 # {"$imagepolicy": "flux-system:darts-api"}
disableTraefikTls: true
memoryRequests: '3G'
memoryLimits: '4G'
cpuRequests: '2000m'
cpuLimits: '3000m'
function:
image: sdshmctspublic.azurecr.io/darts/api:prod-fc81390-20241204154506 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-d67903f-20241205110323 # {"$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 @@ -23,6 +23,6 @@ spec:
ARM_RPO_DURATION: 24h
IS_MOCK_ARM_RPO_DOWNLOAD_CSV: false
function:
image: sdshmctspublic.azurecr.io/darts/api:prod-fc81390-20241204154506 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-d67903f-20241205110323 # {"$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-fc81390-20241204154506 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-d67903f-20241205110323 # {"$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 @@ -22,6 +22,6 @@ spec:
PROCESS_E2E_ARM_RPO: true
IS_MOCK_ARM_RPO_DOWNLOAD_CSV: true
function:
image: sdshmctspublic.azurecr.io/darts/api:prod-fc81390-20241204154506 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-d67903f-20241205110323 # {"$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-fc81390-20241204154506 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-d67903f-20241205110323 # {"$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-fc81390-20241204154506 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-d67903f-20241205110323 # {"$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-fc81390-20241204154506 # {"$imagepolicy": "flux-system:darts-api"}
image: sdshmctspublic.azurecr.io/darts/api:prod-d67903f-20241205110323 # {"$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/darts-modernisation/darts-gateway/darts-gateway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ spec:
values:
java:
replicas: 2
image: sdshmctspublic.azurecr.io/darts/gateway:prod-3b9d792-20241203090624 # {"$imagepolicy": "flux-system:darts-gateway"}
image: sdshmctspublic.azurecr.io/darts/gateway:prod-75cbfea-20241205094025 # {"$imagepolicy": "flux-system:darts-gateway"}
disableTraefikTls: true
2 changes: 1 addition & 1 deletion apps/darts-modernisation/darts-portal/darts-portal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ spec:
values:
nodejs:
replicas: 2
image: sdshmctspublic.azurecr.io/darts/portal:prod-a24ff4b-20241204100527 # {"$imagepolicy": "flux-system:darts-portal"}
image: sdshmctspublic.azurecr.io/darts/portal:prod-e2ac64a-20241205085402 # {"$imagepolicy": "flux-system:darts-portal"}
disableTraefikTls: true
4 changes: 2 additions & 2 deletions apps/darts-modernisation/darts-proxy/darts-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ spec:
values:
java:
replicas: 1
image: sdshmctspublic.azurecr.io/darts/proxy:prod-d9ec4a5-20241202085405 # {"$imagepolicy": "flux-system:darts-proxy"}
image: sdshmctspublic.azurecr.io/darts/proxy:prod-4472e9b-20241204192933 # {"$imagepolicy": "flux-system:darts-proxy"}
disableTraefikTls: true
memoryRequests: '2G'
memoryLimits: '3G'
function:
image: sdshmctspublic.azurecr.io/darts/proxy:prod-d9ec4a5-20241202085405 # {"$imagepolicy": "flux-system:darts-proxy"}
image: sdshmctspublic.azurecr.io/darts/proxy:prod-4472e9b-20241204192933 # {"$imagepolicy": "flux-system:darts-proxy"}
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ spec:
interval: 1m
values:
java:
image: sdshmctspublic.azurecr.io/darts/stub-services:prod-fa82fb6-20241202105444 # {"$imagepolicy": "flux-system:darts-stub-services"}
image: sdshmctspublic.azurecr.io/darts/stub-services:prod-2aaf847-20241205073759 # {"$imagepolicy": "flux-system:darts-stub-services"}
disableTraefikTls: true
2 changes: 1 addition & 1 deletion apps/jenkins/jenkins/jenkins-controller-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ metadata:
spec:
values:
controller:
tag: 2.488-815
tag: 2.488-816
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ metadata:
spec:
values:
controller:
tag: 2.488-815
tag: 2.488-816
2 changes: 1 addition & 1 deletion apps/juror/juror-bureau/demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
values:
nodejs:
# Uncomment and edit the line below to fix the environment at a specific image
image: sdshmctspublic.azurecr.io/juror/bureau:pr-843-ebdd407-20241204153410 # {"$imagepolicy": "flux-system:juror-bureau-pr"}
image: sdshmctspublic.azurecr.io/juror/bureau:pr-843-37b3676-20241205094451 # {"$imagepolicy": "flux-system:juror-bureau-pr"}
ingressHost: juror.demo.apps.hmcts.net
environment:
SKIP_SSO: true
2 changes: 1 addition & 1 deletion apps/juror/juror-bureau/ithc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
values:
nodejs:
# Uncomment and edit the line below to fix the environment at a specific image
image: sdshmctspublic.azurecr.io/juror/bureau:pr-843-ebdd407-20241204153410 # {"$imagepolicy": "flux-system:juror-bureau-pr"}
image: sdshmctspublic.azurecr.io/juror/bureau:pr-843-37b3676-20241205094451 # {"$imagepolicy": "flux-system:juror-bureau-pr"}
ingressHost: juror.ithc.apps.hmcts.net
environment:
SKIP_SSO: true
2 changes: 1 addition & 1 deletion apps/opal/opal-frontend/opal-frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ spec:
interval: 1m
values:
nodejs:
image: sdshmctspublic.azurecr.io/opal/frontend:prod-0f47cdf-20241204134011 # {"$imagepolicy": "flux-system:opal-frontend"}
image: sdshmctspublic.azurecr.io/opal/frontend:prod-b5f2337-20241205112008 # {"$imagepolicy": "flux-system:opal-frontend"}
disableTraefikTls: true
4 changes: 2 additions & 2 deletions apps/pre/pre-api-cron-close-pending-cases/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ spec:
global:
jobKind: CronJob
job:
suspend: true
suspend: false
disableActiveClusterCheck: true
schedule: "0 * * * *"
schedule: "*/5 * * * *"
image: sdshmctspublic.azurecr.io/pre/api:prod-e53315d-20241203152200 # {"$imagepolicy": "flux-system:pre-api"}
environment:
MEDIA_SERVICE: MediaKind
2 changes: 1 addition & 1 deletion apps/pre/pre-api/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ spec:
AZURE_SUBSCRIPTION_ID: 5ca62022-6aa2-4cee-aaa7-e7536c8d566c
PLATFORM_ENV_TAG: Production
MEDIA_SERVICE: MediaKind
TRIGGER: init-1
TRIGGER: init-2
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-fb800d3-20241204120126 # {"$imagepolicy": "flux-system:pre-portal"}
image: sdshmctspublic.azurecr.io/pre/portal:prod-c26ba05-20241205102734 # {"$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-fb800d3-20241204120126 # {"$imagepolicy": "flux-system:pre-portal"}
image: sdshmctspublic.azurecr.io/pre/portal:prod-c26ba05-20241205102734 # {"$imagepolicy": "flux-system:pre-portal"}
disableTraefikTls: true
cpuRequests: '50m'
cpuLimits: '500m'
Expand Down
2 changes: 2 additions & 0 deletions apps/pre/pre-portal/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ spec:
AMS_AZURE_MEDIA_SERVICES: https://preamsprod-ukso1.streaming.media.azure.net
AMS_AZURE_MEDIA_SERVICES_KEY_DELIVERY: https://preamsprod.keydelivery.uksouth.media.azure.net
USE_MK_ON_WATCH_PAGE: true
TS_AND_CS_REDIRECT_ENABLED: false
ENABLE_CASE_STATE_COLUMN: false
TRIGGER: init-1
2 changes: 1 addition & 1 deletion apps/toffee/recipe-backend/demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
values:
java:
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-8f2c31c-20241204080445 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-a5fc625-20241205082342 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
ingressHost: toffee-recipe-backend.demo.platform.hmcts.net
useWorkloadIdentity: true
workloadClientID: ${WORKLOAD_IDENTITY_ID}
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-backend/ithc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
values:
java:
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-8f2c31c-20241204080445 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-a5fc625-20241205082342 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
ingressHost: toffee-recipe-backend.ithc.platform.hmcts.net
useWorkloadIdentity: true
workloadClientID: ${WORKLOAD_IDENTITY_ID}
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-backend/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
values:
java:
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-8f2c31c-20241204080445 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-a5fc625-20241205082342 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
ingressHost: toffee-recipe-backend.platform.hmcts.net
useWorkloadIdentity: true
workloadClientID: ${WORKLOAD_IDENTITY_ID}
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-backend/sbox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
values:
java:
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-8f2c31c-20241204080445 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-a5fc625-20241205082342 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
ingressHost: toffee-recipe-backend.sandbox.platform.hmcts.net
useWorkloadIdentity: true
workloadClientID: ${WORKLOAD_IDENTITY_ID}
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-backend/stg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
spec:
values:
java:
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-8f2c31c-20241204080445 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-a5fc625-20241205082342 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
ingressHost: toffee-recipe-backend.staging.platform.hmcts.net
useWorkloadIdentity: true
workloadClientID: ${WORKLOAD_IDENTITY_ID}
Expand Down
2 changes: 1 addition & 1 deletion apps/toffee/recipe-backend/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
values:
java:
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-8f2c31c-20241204080445 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
image: sdshmctspublic.azurecr.io/toffee/recipe-backend:prod-a5fc625-20241205082342 #{"$imagepolicy": "flux-system:toffee-recipe-backend"}
ingressHost: toffee-recipe-backend.test.platform.hmcts.net
useWorkloadIdentity: true
workloadClientID: ${WORKLOAD_IDENTITY_ID}
Expand Down
2 changes: 1 addition & 1 deletion apps/vh/video-api/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
values:
java:
ingressHost: vh-video-api.dev.platform.hmcts.net
image: sdshmctspublic.azurecr.io/vh/video-api:dev-4e6337c-202411291455 #{"$imagepolicy": "flux-system:vh-video-api-dev"}
image: sdshmctspublic.azurecr.io/vh/video-api:dev-517cb50-202412050954 #{"$imagepolicy": "flux-system:vh-video-api-dev"}
keyVaults:
vh-infra-core:
excludeEnvironmentSuffix: false
Expand Down
2 changes: 1 addition & 1 deletion apps/vh/video-api/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ spec:
values:
java:
ingressHost: vh-video-api.test.platform.hmcts.net
image: sdshmctspublic.azurecr.io/vh/video-api:test-4e6337c-202412031930 #{"$imagepolicy": "flux-system:vh-video-api-test"}
image: sdshmctspublic.azurecr.io/vh/video-api:test-517cb50-202412051146 #{"$imagepolicy": "flux-system:vh-video-api-test"}
2 changes: 1 addition & 1 deletion apps/vh/video-web/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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-675b5ce-202412041624 # {"$imagepolicy": "flux-system:vh-video-web-dev"}
image: sdshmctspublic.azurecr.io/vh/video-web:dev-db81970-202412051118 # {"$imagepolicy": "flux-system:vh-video-web-dev"}

0 comments on commit d3ce516

Please sign in to comment.