Resolve merge conflict

hmcts · May 15, 2024 · 3962b37 · 3962b37
2 parents f7b39bf + 2a1c993
commit 3962b37
Show file tree

Hide file tree

Showing 8 changed files with 6,759 additions and 4,436 deletions.
diff --git a/apps/azure-devops/azure-devops-agent-keda/ptlsbox.yaml b/apps/azure-devops/azure-devops-agent-keda/ptlsbox.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: azure-devops
 spec:
   values:
+    image: hmctspublic.azurecr.io/azure-devops-agent:pr-37-66b71fba-1715782209
     environment:
       AZP_POOL: hmcts-sds-ptlsbox
     triggers:

diff --git a/apps/darts-modernisation/darts-api/darts-api.yaml b/apps/darts-modernisation/darts-api/darts-api.yaml
@@ -16,11 +16,11 @@ spec:
   values:
     java:
       replicas: 2
-      image: sdshmctspublic.azurecr.io/darts/api:prod-908d03e-20240515143301 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-3bbdc57-20240515150844 # {"$imagepolicy": "flux-system:darts-api"}
       disableTraefikTls: true
       memoryRequests: '2G'
       memoryLimits: '3G'
     function:
-      image: sdshmctspublic.azurecr.io/darts/api:prod-908d03e-20240515143301 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-3bbdc57-20240515150844 # {"$imagepolicy": "flux-system:darts-api"}
       memoryRequests: '2G'
       memoryLimits: '3G'
diff --git a/apps/darts-modernisation/darts-api/prod.yaml b/apps/darts-modernisation/darts-api/prod.yaml
@@ -20,4 +20,4 @@ spec:
       pdb:
         enabled: false
     function:
-      image: sdshmctspublic.azurecr.io/darts/api:prod-908d03e-20240515143301 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-3bbdc57-20240515150844 # {"$imagepolicy": "flux-system:darts-api"}
diff --git a/apps/darts-modernisation/darts-api/stg.yaml b/apps/darts-modernisation/darts-api/stg.yaml
@@ -17,4 +17,4 @@ spec:
         ACTIVE_DIRECTORY_B2C_AUTH_URI: https://hmctsstgextid.b2clogin.com/hmctsstgextid.onmicrosoft.com
         ARM_URL: http://darts-stub-services.staging.platform.hmcts.net
     function:
-      image: sdshmctspublic.azurecr.io/darts/api:prod-908d03e-20240515143301 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-3bbdc57-20240515150844 # {"$imagepolicy": "flux-system:darts-api"}
diff --git a/apps/darts-modernisation/darts-api/test.yaml b/apps/darts-modernisation/darts-api/test.yaml
@@ -14,4 +14,4 @@ spec:
         ACTIVE_DIRECTORY_B2C_AUTH_URI: https://hmctsstgextid.b2clogin.com/hmctsstgextid.onmicrosoft.com
         ARM_URL: http://darts-stub-services.test.platform.hmcts.net
     function:
-      image: sdshmctspublic.azurecr.io/darts/api:prod-908d03e-20240515143301 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-3bbdc57-20240515150844 # {"$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,12 +16,12 @@ spec:
   values:
     java:
       ingressHost: darts-automated-tasks.{{ .Values.global.environment }}.platform.hmcts.net
-      image: sdshmctspublic.azurecr.io/darts/api:prod-908d03e-20240515143301 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-3bbdc57-20240515150844 # {"$imagepolicy": "flux-system:darts-api"}
       disableTraefikTls: true
       memoryRequests: '3G'
       memoryLimits: '4G'
     function:
-      image: sdshmctspublic.azurecr.io/darts/api:prod-908d03e-20240515143301 # {"$imagepolicy": "flux-system:darts-api"}
+      image: sdshmctspublic.azurecr.io/darts/api:prod-3bbdc57-20240515150844 # {"$imagepolicy": "flux-system:darts-api"}
       minReplicaCount: 0
       maxReplicaCount: 0
       triggers:

diff --git a/apps/flux-system/base/image-update-automation.yaml b/apps/flux-system/base/image-update-automation.yaml
@@ -1,4 +1,4 @@
-apiVersion: image.toolkit.fluxcd.io/v1beta1
+apiVersion: image.toolkit.fluxcd.io/v1beta2
 kind: ImageUpdateAutomation
 metadata:
   name: imageautomation
@@ -16,7 +16,7 @@ spec:
       author:
         email: [email protected]
         name: fluxcdbot
-      messageTemplate: '{{range .Updated.Images}}{{println .}}{{end}}'
+      messageTemplate: "{{range .Updated.Images}}{{println .}}{{end}}"
     push:
       branch: master
   update:

diff --git a/apps/flux-system/ptl/base/gotk-components.yaml b/apps/flux-system/ptl/base/gotk-components.yaml