Merge pull request #33982 from hmcts/FPET-1115-Part2

FPET-1115-config to bring up pods for AAT, ITHC, Perftest and Prod
hmcts · Aug 29, 2024 · 6f0dfc4 · 6f0dfc4
2 parents a303131 + 01d77c1
commit 6f0dfc4
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 1 deletion.
diff --git a/apps/fis/aat/base/kustomization.yaml b/apps/fis/aat/base/kustomization.yaml
@@ -14,3 +14,4 @@ patches:
   - path: ../../fis-ds-update-web/aat.yaml
   - path: ../../fis-ds-web/aat.yaml
   - path: ../../serviceaccount/aat.yaml
+  - path: ../../fis-bulk-scan-api/aat.yaml
diff --git a/apps/fis/automation/kustomization.yaml b/apps/fis/automation/kustomization.yaml
@@ -4,6 +4,8 @@ resources:
   - ../fis-bulk-scan-api/image-repo.yaml
   - ../fis-bulk-scan-api/image-policy.yaml
   - ../fis-bulk-scan-api/demo-image-policy.yaml
+  - ../fis-bulk-scan-api/ithc-image-policy.yaml
+  - ../fis-bulk-scan-api/perftest-image-policy.yaml
   - ../fis-ds-web/image-repo.yaml
   - ../fis-ds-web/image-policy.yaml
   - ../fis-cos-api/image-repo.yaml

diff --git a/apps/fis/base/kustomization.yaml b/apps/fis/base/kustomization.yaml
@@ -7,4 +7,5 @@ resources:
   - ../fis-ds-web/fis-ds-web.yaml
   - ../fis-ds-update-web/fis-ds-update-web.yaml
   - ../../base/workload-identity
+  - ../fis-bulk-scan-api/fis-bulk-scan-api.yaml
 namespace: fis
diff --git a/apps/fis/demo/base/kustomization.yaml b/apps/fis/demo/base/kustomization.yaml
@@ -4,7 +4,6 @@ resources:
   - ../../base
   - ../../../rbac/nonprod-role.yaml
   - ../../fis-cos-api/fis-cos-api.yaml
-  - ../../fis-bulk-scan-api/fis-bulk-scan-api.yaml
   - ../../../base/slack-provider/demo
 namespace: fis
 patches:

diff --git a/apps/fis/fis-bulk-scan-api/aat.yaml b/apps/fis/fis-bulk-scan-api/aat.yaml
@@ -0,0 +1,9 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: fis-bulk-scan-api
+spec:
+  releaseName: fis-bulk-scan-api
+  values:
+    java:
+      image: hmctspublic.azurecr.io/fis/bulk-scan-api:prod-28eb736-20240828134206 #{"$imagepolicy": "flux-system:fis-bulk-scan-api"}
diff --git a/apps/fis/fis-bulk-scan-api/ithc-image-policy.yaml b/apps/fis/fis-bulk-scan-api/ithc-image-policy.yaml
@@ -0,0 +1,7 @@
+apiVersion: image.toolkit.fluxcd.io/v1beta1
+kind: ImagePolicy
+metadata:
+  name: ithc-fis-bulk-scan-api
+spec:
+  imageRepositoryRef:
+    name: fis-bulk-scan-api
diff --git a/apps/fis/fis-bulk-scan-api/ithc.yaml b/apps/fis/fis-bulk-scan-api/ithc.yaml
@@ -0,0 +1,9 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: fis-bulk-scan-api
+spec:
+  releaseName: fis-bulk-scan-api
+  values:
+    java:
+      image: hmctspublic.azurecr.io/fis/bulk-scan-api:prod-28eb736-20240828134206 #{"$imagepolicy": "flux-system:ithc-fis-bulk-scan-api"}
diff --git a/apps/fis/fis-bulk-scan-api/perftest-image-policy.yaml b/apps/fis/fis-bulk-scan-api/perftest-image-policy.yaml
@@ -0,0 +1,7 @@
+apiVersion: image.toolkit.fluxcd.io/v1beta1
+kind: ImagePolicy
+metadata:
+  name: perftest-fis-bulk-scan-api
+spec:
+  imageRepositoryRef:
+    name: fis-bulk-scan-api
diff --git a/apps/fis/fis-bulk-scan-api/perftest.yaml b/apps/fis/fis-bulk-scan-api/perftest.yaml
@@ -0,0 +1,9 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: fis-bulk-scan-api
+spec:
+  releaseName: fis-bulk-scan-api
+  values:
+    java:
+      image: hmctspublic.azurecr.io/fis/bulk-scan-api:prod-28eb736-20240828134206 #{"$imagepolicy": "flux-system:perftest-fis-bulk-scan-api"}
diff --git a/apps/fis/ithc/base/kustomization.yaml b/apps/fis/ithc/base/kustomization.yaml
@@ -13,3 +13,4 @@ patches:
   - path: ../../fis-ds-update-web/ithc.yaml
   - path: ../../fis-ds-web/ithc.yaml
   - path: ../../serviceaccount/ithc.yaml
+  - path: ../../fis-bulk-scan-api/ithc.yaml
diff --git a/apps/fis/perftest/base/kustomization.yaml b/apps/fis/perftest/base/kustomization.yaml
@@ -13,3 +13,4 @@ patches:
   - path: ../../fis-ds-update-web/perftest.yaml
   - path: ../../fis-ds-web/perftest.yaml
   - path: ../../serviceaccount/perftest.yaml
+  - path: ../../fis-bulk-scan-api/perftest.yaml