Merge branch 'master' into renovate/node-problem-detector-node-proble…

…m-detector-2.x
hmcts · May 17, 2023 · 4b408b6 · 4b408b6
2 parents 0d685a2 + ec4acf9
commit 4b408b6
Show file tree

Hide file tree

Showing 74 changed files with 218 additions and 155 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ on:
     branches:
       - master
 jobs:
-  build:
+  static_tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -21,11 +21,37 @@ jobs:
         run: ./tests/install-yq.sh
       - name: Verify CODEOWNERs
         run: ./tests/code-owner-check.sh
-      - name: Static File checks
-        run: ./tests/static-file-checks.sh
-      - name: Kustomize Testsv2
-        run: ./tests/test-kustomize-v2.sh
+      - name: Image Policy Tests
+        run: ./tests/image-policy-exists.sh
       - name: Lint Tests
         run: ./tests/lint-yaml.sh
       - name: Fluxv2 Image Automation
-        run: ./tests/flux-v2-image-automation.sh
+        run: ./tests/flux-v2-image-automation.sh
+  schema:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        environment: [sbox, sbox-intsvc, preview, ptl-intsvc, ithc, perftest, demo, aat, prod]
+        cluster: ["00", "01"]
+        exclude:
+          - environment: sbox-intsvc
+            cluster: "01"
+          - environment: ptl-intsvc
+            cluster: "01"
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install yq
+        run: ./tests/install-yq.sh
+      - name: Install Flux CLI
+        run: |
+          FLUX_VERSION=$(yq eval 'select(.kind=="Namespace") | .metadata.labels."app.kubernetes.io/version"' apps/flux-system/base/gotk-components.yaml | sed 's/v//')
+          curl -s https://fluxcd.io/install.sh | sudo FLUX_VERSION=${FLUX_VERSION} bash
+      - name: Install kubeconform
+        run: |
+          set -ex
+          curl -sL https://github.com/yannh/kubeconform/releases/download/v0.6.1/kubeconform-linux-amd64.tar.gz | tar xz
+          cp kubeconform /usr/local/bin/
+          chmod +x /usr/local/bin/kubeconform
+      - name: Dry run and kubeconform ${{ matrix.environment }}-${{ matrix.cluster }}
+        run: ./tests/dry-run-kustomize.sh ${{ matrix.environment }} ${{ matrix.cluster }}
diff --git a/apps/adoption/adoption-web/demo.yaml b/apps/adoption/adoption-web/demo.yaml
@@ -8,7 +8,7 @@ spec:
   values:
     nodejs:
       readinessPeriod: 15
-      image: hmctspublic.azurecr.io/adoption/web:pr-1165-4e2da90-20230515114157 #{"$imagepolicy": "flux-system:demo-adoption-web"}
+      image: hmctspublic.azurecr.io/adoption/web:pr-1165-33ec4d8-20230517134852 #{"$imagepolicy": "flux-system:demo-adoption-web"}
       environment:
         PCQ_ENABLED: "true"
         APPINSIGHTS_KEY: '6c5278dd-ee76-4e7b-92f9-57b27ead382e'

diff --git a/apps/adoption/adoption-web/ithc.yaml b/apps/adoption/adoption-web/ithc.yaml
@@ -8,7 +8,7 @@ spec:
   values:
     nodejs:
       readinessPeriod: 15
-      image: hmctspublic.azurecr.io/adoption/web:pr-1165-4e2da90-20230515114157 #{"$imagepolicy": "flux-system:demo-adoption-web"}
+      image: hmctspublic.azurecr.io/adoption/web:pr-1165-33ec4d8-20230517134852 #{"$imagepolicy": "flux-system:demo-adoption-web"}
       environment:
         PCQ_ENABLED: "true"
         APPINSIGHTS_KEY: '811b0b32-53bb-4c50-ae35-279b5cd91c40'

diff --git a/apps/civil/civil-citizen-ui/civil-citizen-ui.yaml b/apps/civil/civil-citizen-ui/civil-citizen-ui.yaml
@@ -7,7 +7,7 @@ spec:
   releaseName: civil-citizen-ui
   values:
     nodejs:
-      image: hmctspublic.azurecr.io/civil/citizen-ui:prod-13fa536-20230517101934 #{"$imagepolicy": "flux-system:civil-citizen-ui"}
+      image: hmctspublic.azurecr.io/civil/citizen-ui:prod-034c208-20230517132055 #{"$imagepolicy": "flux-system:civil-citizen-ui"}
   chart:
     spec:
       chart: ./stable/civil-citizen-ui

diff --git a/apps/civil/civil-citizen-ui/demo.yaml b/apps/civil/civil-citizen-ui/demo.yaml
@@ -12,7 +12,7 @@ spec:
       readinessPeriod: 15
       useInterpodAntiAffinity: true
       ingressHost: civil-citizen-ui.demo.platform.hmcts.net
-      image: hmctspublic.azurecr.io/civil/citizen-ui:prod-13fa536-20230517101934 #{"$imagepolicy": "flux-system:civil-citizen-ui"}
+      image: hmctspublic.azurecr.io/civil/citizen-ui:prod-034c208-20230517132055 #{"$imagepolicy": "flux-system:civil-citizen-ui"}
       environment:
         GA_TRACKING_ID: UA-97111056-1
         FEATURE_TESTING_SUPPORT: true

diff --git a/apps/civil/civil-general-applications/civil-general-applications.yaml b/apps/civil/civil-general-applications/civil-general-applications.yaml
@@ -9,7 +9,7 @@ spec:
     java:
       replicas: 2
       useInterpodAntiAffinity: true
-      image: hmctspublic.azurecr.io/civil/general-applications:prod-ddd56cc-20230515161904 #{"$imagepolicy": "flux-system:civil-general-applications"}
+      image: hmctspublic.azurecr.io/civil/general-applications:prod-683e7d2-20230517130153 #{"$imagepolicy": "flux-system:civil-general-applications"}
       environment:
   chart:
     spec:

diff --git a/apps/civil/civil-general-applications/demo.yaml b/apps/civil/civil-general-applications/demo.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   values:
     java:
-      image: hmctspublic.azurecr.io/civil/general-applications:prod-ddd56cc-20230515161904 #{"$imagepolicy": "flux-system:civil-general-applications"}
+      image: hmctspublic.azurecr.io/civil/general-applications:prod-683e7d2-20230517130153 #{"$imagepolicy": "flux-system:civil-general-applications"}
       keyVaults:
         civil:
           resourceGroup: civil

diff --git a/apps/civil/civil-service/civil-service.yaml b/apps/civil/civil-service/civil-service.yaml
@@ -9,7 +9,7 @@ spec:
     java:
       replicas: 2
       useInterpodAntiAffinity: true
-      image: hmctspublic.azurecr.io/civil/service:prod-a6f87d0-20230516154613 #{"$imagepolicy": "flux-system:civil-service"}
+      image: hmctspublic.azurecr.io/civil/service:prod-e6c47b5-20230517132906 #{"$imagepolicy": "flux-system:civil-service"}
       environment:
   chart:
     spec:

diff --git a/apps/civil/civil-service/demo.yaml b/apps/civil/civil-service/demo.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   values:
     java:
-      image: hmctspublic.azurecr.io/civil/service:prod-a6f87d0-20230516154613 #{"$imagepolicy": "flux-system:civil-service"}
+      image: hmctspublic.azurecr.io/civil/service:prod-e6c47b5-20230517132906 #{"$imagepolicy": "flux-system:civil-service"}
       keyVaults:
         civil:
           resourceGroup: civil

diff --git a/apps/civil/civil-service/ithc.yaml b/apps/civil/civil-service/ithc.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   values:
     java:
-      image: hmctspublic.azurecr.io/civil/service:prod-a6f87d0-20230516154613 #{"$imagepolicy": "flux-system:civil-service"}
+      image: hmctspublic.azurecr.io/civil/service:prod-e6c47b5-20230517132906 #{"$imagepolicy": "flux-system:civil-service"}
       keyVaults:
         civil:
           resourceGroup: civil

diff --git a/apps/cnp/plum-frontend/plum-frontend-demo-publicaccess.yaml b/apps/cnp/plum-frontend/plum-frontend-demo-publicaccess.yaml
@@ -15,7 +15,7 @@ spec:
   values:
     nodejs:
       ingressHost: plum-public.demo.platform.hmcts.net
-      image: hmctspublic.azurecr.io/plum/frontend:prod-18d7f4c-20230517073445 # {"$imagepolicy": "flux-system:plum-frontend"}
+      image: hmctspublic.azurecr.io/plum/frontend:prod-81c5cae-20230517102343 # {"$imagepolicy": "flux-system:plum-frontend"}
       startupPeriod: 120
       startupFailureThreshold: 3
       environment:

diff --git a/apps/cnp/plum-frontend/plum-frontend.yaml b/apps/cnp/plum-frontend/plum-frontend.yaml
@@ -14,7 +14,7 @@ spec:
       interval: 1m
   values:
     nodejs:
-      image: hmctspublic.azurecr.io/plum/frontend:prod-18d7f4c-20230517073445 # {"$imagepolicy": "flux-system:plum-frontend"}
+      image: hmctspublic.azurecr.io/plum/frontend:prod-81c5cae-20230517102343 # {"$imagepolicy": "flux-system:plum-frontend"}
       startupPeriod: 120
       startupFailureThreshold: 3
       environment:

diff --git a/apps/docmosis/docmosis/aat.yaml b/apps/docmosis/docmosis/aat.yaml
@@ -5,4 +5,4 @@ metadata:
 spec:
   values:
     ingressHost: docmosis.aat.platform.hmcts.net
-    image: hmctsprivate.azurecr.io/docmosis:aat-a55fcf2-378995 #{"$imagepolicy": "flux-system:aat-docmosis"}
+    image: hmctsprivate.azurecr.io/docmosis:aat-ae5c086-379323 #{"$imagepolicy": "flux-system:aat-docmosis"}
diff --git a/apps/docmosis/docmosis/demo.yaml b/apps/docmosis/docmosis/demo.yaml
@@ -5,4 +5,4 @@ metadata:
 spec:
   values:
     ingressHost: docmosis.demo.platform.hmcts.net
-    image: hmctsprivate.azurecr.io/docmosis:demo-a55fcf2-378995 #{"$imagepolicy": "flux-system:demo-docmosis"}
+    image: hmctsprivate.azurecr.io/docmosis:demo-ae5c086-379323 #{"$imagepolicy": "flux-system:demo-docmosis"}
diff --git a/apps/docmosis/docmosis/docmosis.yaml b/apps/docmosis/docmosis/docmosis.yaml
@@ -15,7 +15,7 @@ spec:
     ingressSessionAffinity:
       enabled: true
     envFromSecret: docmosis-secret
-    image: hmctsprivate.azurecr.io/docmosis:prod-a55fcf2-378995 #{"$imagepolicy": "flux-system:docmosis"}
+    image: hmctsprivate.azurecr.io/docmosis:prod-ae5c086-379323 #{"$imagepolicy": "flux-system:docmosis"}
     java:
       memoryRequests: '1024Mi'
       cpuRequests: '1000m'

diff --git a/apps/docmosis/docmosis/ithc.yaml b/apps/docmosis/docmosis/ithc.yaml
@@ -5,4 +5,4 @@ metadata:
 spec:
   values:
     ingressHost: docmosis.ithc.platform.hmcts.net
-    image: hmctsprivate.azurecr.io/docmosis:ithc-a55fcf2-378995 #{"$imagepolicy": "flux-system:ithc-docmosis"}
+    image: hmctsprivate.azurecr.io/docmosis:ithc-ae5c086-379323 #{"$imagepolicy": "flux-system:ithc-docmosis"}
diff --git a/apps/docmosis/docmosis/perftest.yaml b/apps/docmosis/docmosis/perftest.yaml
@@ -5,6 +5,6 @@ metadata:
 spec:
   values:
     ingressHost: docmosis.perftest.platform.hmcts.net
-    image: hmctsprivate.azurecr.io/docmosis:perftest-a55fcf2-378995 #{"$imagepolicy": "flux-system:perftest-docmosis"}
+    image: hmctsprivate.azurecr.io/docmosis:perftest-ae5c086-379323 #{"$imagepolicy": "flux-system:perftest-docmosis"}
     java:
       memoryRequests: '2Gi'
diff --git a/apps/docmosis/docmosis/sbox.yaml b/apps/docmosis/docmosis/sbox.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   values:
     ingressHost: docmosis.sandbox.platform.hmcts.net
-    image: hmctsprivate.azurecr.io/docmosis:sandbox-a55fcf2-378995 #{"$imagepolicy": "flux-system:sandbox-docmosis"}
+    image: hmctsprivate.azurecr.io/docmosis:sandbox-ae5c086-379323 #{"$imagepolicy": "flux-system:sandbox-docmosis"}
     environment:
       DOCMOSIS_RENDER_USEURL: https://docmosis.sandbox.platform.hmcts.net
       DOCMOSIS_TORNADO_RENDER_USEURL: https://docmosis.sandbox.platform.hmcts.net
diff --git a/apps/dtsse/dtsse-ardoq-adapter/dtsse-ardoq-adapter.yaml b/apps/dtsse/dtsse-ardoq-adapter/dtsse-ardoq-adapter.yaml
@@ -7,7 +7,7 @@ spec:
   interval: 1m
   values:
     nodejs:
-      image: hmctspublic.azurecr.io/dtsse/ardoq-adapter:prod-15958df-20230516155836 #{"$imagepolicy": "flux-system:dtsse-ardoq-adapter"}
+      image: hmctspublic.azurecr.io/dtsse/ardoq-adapter:prod-0eb2a59-20230517114920 #{"$imagepolicy": "flux-system:dtsse-ardoq-adapter"}
       keyVaults:
         dtsse:
           secrets:

diff --git a/apps/em/em-media-viewer/em-media-viewer.yaml b/apps/em/em-media-viewer/em-media-viewer.yaml
@@ -8,7 +8,7 @@ spec:
     nodejs:
       replicas: 1
       useInterpodAntiAffinity: true
-      image: hmctspublic.azurecr.io/em/media-viewer:prod-54caf21-20230516091347 #{"$imagepolicy": "flux-system:em-media-viewer"}
+      image: hmctspublic.azurecr.io/em/media-viewer:prod-be05c88-20230517115550 #{"$imagepolicy": "flux-system:em-media-viewer"}
       environment:
         VAR_T3: trigger6
   chart:

diff --git a/apps/et/et-cos/perftest.yaml b/apps/et/et-cos/perftest.yaml
@@ -6,7 +6,7 @@ spec:
   releaseName: et-cos
   values:
     java:
-      image: hmctspublic.azurecr.io/et/cos:pr-923-f5fe91d-20230509155716 #{"$imagepolicy": "flux-system:perftest-et-cos"}
+      image: hmctspublic.azurecr.io/et/cos:pr-923-1a48e78-20230517104636 #{"$imagepolicy": "flux-system:perftest-et-cos"}
       environment:
         REFERRAL_TEMPLATE_ID: 92d9c506-c3ca-4063-996b-270861c38261
         ET3RESPONSE_NOTIFICATION_TRIBUNAL_TEMPLATE_ID: f4ac25fc-f452-4bee-b224-3e7fc8341ed3

diff --git a/apps/et/et-sya/demo.yaml b/apps/et/et-sya/demo.yaml
@@ -7,5 +7,5 @@ spec:
   releaseName: et-sya
   values:
     nodejs:
-      image: hmctspublic.azurecr.io/et/sya:pr-737-ef0d866-20230511113800 #{"$imagepolicy": "flux-system:demo-et-sya"}
+      image: hmctspublic.azurecr.io/et/sya:pr-737-ec66ae2-20230517125002 #{"$imagepolicy": "flux-system:demo-et-sya"}
       ingressHost: et-sya.demo.platform.hmcts.net
diff --git a/apps/family-public-law/fpl-case-service/fpl-case-service.yaml b/apps/family-public-law/fpl-case-service/fpl-case-service.yaml
@@ -14,7 +14,7 @@ spec:
       readinessTimeout: 5
       readinessPeriod: 15
       useInterpodAntiAffinity: true
-      image: hmctspublic.azurecr.io/fpl/case-service:prod-14930ef-20230517093033 #{"$imagepolicy": "flux-system:fpl-case-service"}
+      image: hmctspublic.azurecr.io/fpl/case-service:prod-081d3a2-20230517103019 #{"$imagepolicy": "flux-system:fpl-case-service"}
   chart:
     spec:
       chart: ./stable/fpl-case-service

diff --git a/apps/family-public-law/fpl-case-service/ithc.yaml b/apps/family-public-law/fpl-case-service/ithc.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   values:
     java:
-      image: hmctspublic.azurecr.io/fpl/case-service:prod-14930ef-20230517093033 #{"$imagepolicy": "flux-system:fpl-case-service"}
+      image: hmctspublic.azurecr.io/fpl/case-service:prod-081d3a2-20230517103019 #{"$imagepolicy": "flux-system:fpl-case-service"}
       ingressHost: fpl-case-service-ithc.service.core-compute-ithc.internal
       environment:
         RELEASE: AGAIN

diff --git a/apps/fees-pay/ccpay-payment-api-int/demo.yaml b/apps/fees-pay/ccpay-payment-api-int/demo.yaml
@@ -6,7 +6,7 @@ spec:
   releaseName: ccpay-payment-api-int
   values:
     java:
-      image: hmctspublic.azurecr.io/payment/api:pr-1418-78f3627-20230516104847 #{"$imagepolicy": "flux-system:demo-int-ccpay-payment-app"}
+      image: hmctspublic.azurecr.io/payment/api:pr-1418-63834b0-20230517131307 #{"$imagepolicy": "flux-system:demo-int-ccpay-payment-app"}
       imagePullPolicy: Always
       environment:
         DUMMY_RESTART_VAR: false

diff --git a/apps/financial-remedy/finrem-cos/ithc-image-policy.yaml b/apps/financial-remedy/finrem-cos/ithc-image-policy.yaml
@@ -2,6 +2,8 @@ apiVersion: image.toolkit.fluxcd.io/v1beta1
 kind: ImagePolicy
 metadata:
   name: ithc-finrem-cos
+  annotations:
+  hmcts.github.com/prod-automated: enabled
 spec:
   imageRepositoryRef:
     name: finrem-cos
diff --git a/apps/financial-remedy/finrem-cos/ithc.yaml b/apps/financial-remedy/finrem-cos/ithc.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   values:
     java:
-      image: hmctspublic.azurecr.io/finrem/cos:pr-799 #{"$imagepolicy": "flux-system:ithc-finrem-cos"}
+      image: hmctspublic.azurecr.io/finrem/cos:prod-3f273de-20230511115643 #{"$imagepolicy": "flux-system:ithc-finrem-cos"}
       replicas: 3
       autoscaling:
         enabled: true
@@ -21,4 +21,5 @@ spec:
         PAYMENT_API_URL: "http://payment-api-ithc.service.core-compute-ithc.internal"
         DOCUMENT_MANAGEMENT_STORE_URL: "http://dm-store-ithc.service.core-compute-ithc.internal"
         SEND_LETTER_SERVICE_BASEURL: "http://rpe-send-letter-service-ithc.service.core-compute-ithc.internal"
-        VAR_FLUX_V2: trigger
+        FEATURE_SEND_LETTER_RECIPIENT_CHECK: false
+        VAR_FLUX_V2: trigger2
diff --git a/apps/flux-system/aat/base/kustomization.yaml b/apps/flux-system/aat/base/kustomization.yaml
@@ -3,4 +3,6 @@ kind: Kustomization
 resources:
   - ../../base
   - ../../base/gotk-components.yaml
-  - aks-sops-aadpodidentity.yaml
+  - aks-sops-aadpodidentity.yaml
+patchesStrategicMerge:
+  - ../../base/patches/kustomize-controller-patch.yaml
diff --git a/apps/flux-system/base/kustomization.yaml b/apps/flux-system/base/kustomization.yaml
@@ -6,6 +6,4 @@ resources:
   - hmcts-charts-gitrepo.yaml
   - hmctspublic-helmrepo.yaml
   - hmcts-stable-charts-gitrepo.yaml
-  - plum-recipe-receiver-gitrepo.yaml
-patchesStrategicMerge:
-  - patches/kustomize-controller-patch.yaml
+  - plum-recipe-receiver-gitrepo.yaml
diff --git a/apps/flux-system/demo/base/kustomization.yaml b/apps/flux-system/demo/base/kustomization.yaml
@@ -3,4 +3,6 @@ kind: Kustomization
 resources:
   - ../../base
   - ../../base/gotk-components.yaml
-  - aks-sops-aadpodidentity.yaml
+  - aks-sops-aadpodidentity.yaml
+patchesStrategicMerge:
+  - ../../base/patches/kustomize-controller-patch.yaml
diff --git a/apps/flux-system/ithc/base/kustomization.yaml b/apps/flux-system/ithc/base/kustomization.yaml
@@ -3,4 +3,6 @@ kind: Kustomization
 resources:
   - ../../base
   - ../../base/gotk-components.yaml
-  - aks-sops-aadpodidentity.yaml
+  - aks-sops-aadpodidentity.yaml
+patchesStrategicMerge:
+  - ../../base/patches/kustomize-controller-patch.yaml
diff --git a/apps/flux-system/perftest/base/kustomization.yaml b/apps/flux-system/perftest/base/kustomization.yaml
@@ -3,4 +3,6 @@ kind: Kustomization
 resources:
   - ../../base
   - ../../base/gotk-components.yaml
-  - aks-sops-aadpodidentity.yaml
+  - aks-sops-aadpodidentity.yaml
+patchesStrategicMerge:
+  - ../../base/patches/kustomize-controller-patch.yaml
diff --git a/apps/flux-system/preview/base/kustomization.yaml b/apps/flux-system/preview/base/kustomization.yaml
@@ -3,4 +3,6 @@ kind: Kustomization
 resources:
   - ../../base
   - ../../base/gotk-components.yaml
-  - aks-sops-aadpodidentity.yaml
+  - aks-sops-aadpodidentity.yaml
+patchesStrategicMerge:
+  - ../../base/patches/kustomize-controller-patch.yaml
diff --git a/apps/flux-system/prod/base/kustomization.yaml b/apps/flux-system/prod/base/kustomization.yaml
@@ -3,4 +3,6 @@ kind: Kustomization
 resources:
   - ../../base
   - ../../base/gotk-components.yaml
-  - aks-sops-aadpodidentity.yaml
+  - aks-sops-aadpodidentity.yaml
+patchesStrategicMerge:
+  - ../../base/patches/kustomize-controller-patch.yaml
diff --git a/apps/flux-system/ptl-intsvc/base/kustomization.yaml b/apps/flux-system/ptl-intsvc/base/kustomization.yaml
@@ -2,10 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: flux-system
 resources:
+  - ../../base
   - ./gotk-components.yaml
   - ../../automation
   - ../../base/image-update-automation.yaml
   - aks-sops-aadpodidentity.yaml
 
 patchesStrategicMerge:
-  - ../../base/patches/image-automation-components-patch.yaml
+  - ../../base/patches/kustomize-controller-patch.yaml
+  - ../../base/patches/image-automation-components-patch.yaml
diff --git a/apps/flux-system/sbox-intsvc/base/kustomization.yaml b/apps/flux-system/sbox-intsvc/base/kustomization.yaml
@@ -2,4 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../base
-  - aks-sops-aadpodidentity.yaml
+  - ../../base/gotk-components.yaml
+  - aks-sops-aadpodidentity.yaml
+patchesStrategicMerge:
+  - ../../base/patches/kustomize-controller-patch.yaml
diff --git a/apps/flux-system/sbox/base/kustomization.yaml b/apps/flux-system/sbox/base/kustomization.yaml
@@ -2,4 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../base
+  - ../../base/gotk-components.yaml
   - aks-sops-aadpodidentity.yaml
+patchesStrategicMerge:
+  - ../../base/patches/kustomize-controller-patch.yaml
diff --git a/apps/hmc/hmc-hmi-inbound-adapter-int/demo.yaml b/apps/hmc/hmc-hmi-inbound-adapter-int/demo.yaml
@@ -6,4 +6,4 @@ metadata:
 spec:
   values:
     java:
-      image: hmctspublic.azurecr.io/hmc/hmi-inbound-adapter:prod-dc7f927-20230503160649 #{"$imagepolicy": "flux-system:demo-hmc-hmi-inbound-adapter"}
+      image: hmctspublic.azurecr.io/hmc/hmi-inbound-adapter:prod-d39979c-20230517111629 #{"$imagepolicy": "flux-system:demo-hmc-hmi-inbound-adapter"}
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ metadata: @@
     spec:
       values:
         java:
-          image: hmctspublic.azurecr.io/hmc/hmi-inbound-adapter:prod-dc7f927-20230503160649 #{"$imagepolicy": "flux-system:demo-hmc-hmi-inbound-adapter"}
+          image: hmctspublic.azurecr.io/hmc/hmi-inbound-adapter:prod-d39979c-20230517111629 #{"$imagepolicy": "flux-system:demo-hmc-hmi-inbound-adapter"}