From 962e96f31a35042f348afc76c0b4ccd12d748af6 Mon Sep 17 00:00:00 2001 From: "it.consulting@tutanota.com" Date: Mon, 24 Feb 2025 12:25:20 +0000 Subject: [PATCH 1/3] PAY-7598: Decommission Digital Bar (Flux):Prod [PAY-7598] (https://tools.hmcts.net/jira/browse/PAY-7598). --- apps/bar/automation/kustomization.yaml | 7 ------- apps/bar/bar-api/bar-api.yaml | 18 ------------------ apps/bar/bar-api/image-policy.yaml | 7 ------- apps/bar/bar-api/image-repo.yaml | 6 ------ apps/bar/bar-api/prod.yaml | 14 -------------- apps/bar/bar-web/bar-web.yaml | 18 ------------------ apps/bar/bar-web/image-policy.yaml | 7 ------- apps/bar/bar-web/image-repo.yaml | 6 ------ apps/bar/bar-web/prod.yaml | 15 --------------- apps/bar/base/kustomization.yaml | 8 -------- apps/bar/base/kustomize.yaml | 13 ------------- apps/bar/prod/base/kustomization.yaml | 10 ---------- apps/bar/serviceaccount/prod.yaml | 7 ------- apps/fees-pay/prod/00/kustomization.yaml | 2 -- clusters/prod/base/kustomization.yaml | 1 - 15 files changed, 139 deletions(-) delete mode 100644 apps/bar/automation/kustomization.yaml delete mode 100644 apps/bar/bar-api/bar-api.yaml delete mode 100644 apps/bar/bar-api/image-policy.yaml delete mode 100644 apps/bar/bar-api/image-repo.yaml delete mode 100644 apps/bar/bar-api/prod.yaml delete mode 100644 apps/bar/bar-web/bar-web.yaml delete mode 100644 apps/bar/bar-web/image-policy.yaml delete mode 100644 apps/bar/bar-web/image-repo.yaml delete mode 100644 apps/bar/bar-web/prod.yaml delete mode 100644 apps/bar/base/kustomization.yaml delete mode 100644 apps/bar/base/kustomize.yaml delete mode 100644 apps/bar/prod/base/kustomization.yaml delete mode 100644 apps/bar/serviceaccount/prod.yaml diff --git a/apps/bar/automation/kustomization.yaml b/apps/bar/automation/kustomization.yaml deleted file mode 100644 index f28e8cf40b85..000000000000 --- a/apps/bar/automation/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ../bar-web/image-repo.yaml - - ../bar-web/image-policy.yaml - - ../bar-api/image-repo.yaml - - ../bar-api/image-policy.yaml \ No newline at end of file diff --git a/apps/bar/bar-api/bar-api.yaml b/apps/bar/bar-api/bar-api.yaml deleted file mode 100644 index 9e2b373a3da0..000000000000 --- a/apps/bar/bar-api/bar-api.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: bar-api -spec: - releaseName: bar-api - values: - java: - replicas: 2 - image: hmctspublic.azurecr.io/bar/api:prod-0633d95-20250127160140 #{"$imagepolicy": "flux-system:bar-api"} - chart: - spec: - chart: ./stable/bar-api - sourceRef: - kind: GitRepository - name: hmcts-charts - namespace: flux-system - interval: 1m diff --git a/apps/bar/bar-api/image-policy.yaml b/apps/bar/bar-api/image-policy.yaml deleted file mode 100644 index 26f9bfbfc2c3..000000000000 --- a/apps/bar/bar-api/image-policy.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 -kind: ImagePolicy -metadata: - name: bar-api -spec: - imageRepositoryRef: - name: bar-api diff --git a/apps/bar/bar-api/image-repo.yaml b/apps/bar/bar-api/image-repo.yaml deleted file mode 100644 index 7341b56f55e7..000000000000 --- a/apps/bar/bar-api/image-repo.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta2 -kind: ImageRepository -metadata: - name: bar-api -spec: - image: hmctspublic.azurecr.io/bar/api diff --git a/apps/bar/bar-api/prod.yaml b/apps/bar/bar-api/prod.yaml deleted file mode 100644 index 03f648c5b1dd..000000000000 --- a/apps/bar/bar-api/prod.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: bar-api -spec: - releaseName: bar-api - values: - java: - replicas: 1 - autoscaling: - enabled: false - environment: - IDAM_CLIENT_BASE_URL: https://idam-api.platform.hmcts.net - DUMMY_RESTART_VAR: true \ No newline at end of file diff --git a/apps/bar/bar-web/bar-web.yaml b/apps/bar/bar-web/bar-web.yaml deleted file mode 100644 index 0613e6cf5edc..000000000000 --- a/apps/bar/bar-web/bar-web.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: bar-web -spec: - releaseName: bar-web - values: - nodejs: - replicas: 2 - image: hmctspublic.azurecr.io/bar/web:prod-0356103-20250117161444 #{"$imagepolicy": "flux-system:bar-web"} - chart: - spec: - chart: ./stable/bar-web - sourceRef: - kind: GitRepository - name: hmcts-charts - namespace: flux-system - interval: 1m diff --git a/apps/bar/bar-web/image-policy.yaml b/apps/bar/bar-web/image-policy.yaml deleted file mode 100644 index 72295b8a67b4..000000000000 --- a/apps/bar/bar-web/image-policy.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 -kind: ImagePolicy -metadata: - name: bar-web -spec: - imageRepositoryRef: - name: bar-web diff --git a/apps/bar/bar-web/image-repo.yaml b/apps/bar/bar-web/image-repo.yaml deleted file mode 100644 index ed3edbff6fd8..000000000000 --- a/apps/bar/bar-web/image-repo.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta2 -kind: ImageRepository -metadata: - name: bar-web -spec: - image: hmctspublic.azurecr.io/bar/web diff --git a/apps/bar/bar-web/prod.yaml b/apps/bar/bar-web/prod.yaml deleted file mode 100644 index 5af22e36012a..000000000000 --- a/apps/bar/bar-web/prod.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: bar-web -spec: - releaseName: bar-web - values: - nodejs: - replicas: 1 - autoscaling: - enabled: false - ingressHost: manage-payments.platform.hmcts.net - environment: - IDAM_API_URL: https://idam-api.platform.hmcts.net - IDAM_AUTHENTICATION_WEB_URL: https://hmcts-access.service.gov.uk diff --git a/apps/bar/base/kustomization.yaml b/apps/bar/base/kustomization.yaml deleted file mode 100644 index ff52503230f6..000000000000 --- a/apps/bar/base/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ../../base - - ../bar-web/bar-web.yaml - - ../bar-api/bar-api.yaml - - ../../base/workload-identity -namespace: bar diff --git a/apps/bar/base/kustomize.yaml b/apps/bar/base/kustomize.yaml deleted file mode 100644 index 1e27871223e0..000000000000 --- a/apps/bar/base/kustomize.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: bar - namespace: flux-system -spec: - path: ./apps/bar/${ENVIRONMENT}/base - postBuild: - substitute: - NAMESPACE: "bar" - TEAM_NOTIFICATION_CHANNEL: "bar-tech" - TEAM_AAD_GROUP_ID: 637c823a-d4d6-4cac-bb6c-dd8159309e0d - WI_NAME: bar diff --git a/apps/bar/prod/base/kustomization.yaml b/apps/bar/prod/base/kustomization.yaml deleted file mode 100644 index 85f1c1329598..000000000000 --- a/apps/bar/prod/base/kustomization.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ../../base - - ../../../base/slack-provider/prod -namespace: bar -patches: - - path: ../../bar-web/prod.yaml - - path: ../../bar-api/prod.yaml - - path: ../../serviceaccount/prod.yaml diff --git a/apps/bar/serviceaccount/prod.yaml b/apps/bar/serviceaccount/prod.yaml deleted file mode 100644 index e6c7dfeeb498..000000000000 --- a/apps/bar/serviceaccount/prod.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: ${NAMESPACE} - namespace: ${NAMESPACE} - annotations: - azure.workload.identity/client-id: "97bece6d-17cd-46c5-bce5-931b5b14618c" diff --git a/apps/fees-pay/prod/00/kustomization.yaml b/apps/fees-pay/prod/00/kustomization.yaml index 6b1d16d4c67a..9b8045a1cb2e 100644 --- a/apps/fees-pay/prod/00/kustomization.yaml +++ b/apps/fees-pay/prod/00/kustomization.yaml @@ -3,7 +3,6 @@ kind: Kustomization resources: - ../base - ../../card-payment-job/card-payment-job.yaml -- ../../bar-payment-job/bar-payment-job.yaml - ../../finrem-payment-job/finrem-payment-job.yaml - ../../pba-payment-job/pba-payment-job.yaml - ../../status-payment-job/status-payment-job.yaml @@ -11,7 +10,6 @@ resources: namespace: fees-pay patches: - path: ../../card-payment-job/prod-00.yaml -- path: ../../bar-payment-job/prod-00.yaml - path: ../../finrem-payment-job/prod-00.yaml - path: ../../pba-payment-job/prod-00.yaml - path: ../../status-payment-job/prod-00.yaml diff --git a/clusters/prod/base/kustomization.yaml b/clusters/prod/base/kustomization.yaml index a028a208c17c..6a90b4bc8152 100644 --- a/clusters/prod/base/kustomization.yaml +++ b/clusters/prod/base/kustomization.yaml @@ -23,7 +23,6 @@ resources: - ../../../apps/rpe/base/kustomize.yaml - ../../../apps/aac/base/kustomize.yaml - ../../../apps/am/base/kustomize.yaml - - ../../../apps/bar/base/kustomize.yaml - ../../../apps/bsp/base/kustomize.yaml - ../../../apps/camunda/base/kustomize.yaml - ../../../apps/ccd/base/kustomize.yaml From 8af4b2d0216e8edaf987e6d2d33dd15e600b5dd8 Mon Sep 17 00:00:00 2001 From: "it.consulting@tutanota.com" Date: Mon, 24 Feb 2025 12:35:55 +0000 Subject: [PATCH 2/3] PAY-7598: Decommission Digital Bar (Flux):Prod [PAY-7598] (https://tools.hmcts.net/jira/browse/PAY-7598). --- apps/flux-system/automation/kustomization.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/flux-system/automation/kustomization.yaml b/apps/flux-system/automation/kustomization.yaml index ef43093a62e4..b365d4d6e52f 100644 --- a/apps/flux-system/automation/kustomization.yaml +++ b/apps/flux-system/automation/kustomization.yaml @@ -10,7 +10,6 @@ resources: - ../../adoption/automation - ../../am/automation - ../../backstage/automation - - ../../bar/automation - ../../bsp/automation - ../../ccd/automation - ../../civil/automation From 9d14cd2e9ebf38ad3f09f830d6d9210e11dcbd5b Mon Sep 17 00:00:00 2001 From: "it.consulting@tutanota.com" Date: Tue, 4 Mar 2025 12:46:21 +0000 Subject: [PATCH 3/3] PAY-7598: Decommission Digital Bar (Flux):Production [PAY-7598] (https://tools.hmcts.net/jira/browse/PAY-7598). --- apps/fees-pay/automation/kustomization.yaml | 2 -- .../fees-pay/bar-csv-report/image-policy.yaml | 7 ----- apps/fees-pay/bar-csv-report/image-repo.yaml | 6 ----- .../bar-payment-job/bar-payment-job.yaml | 26 ------------------- apps/fees-pay/bar-payment-job/prod-00.yaml | 13 ---------- 5 files changed, 54 deletions(-) delete mode 100644 apps/fees-pay/bar-csv-report/image-policy.yaml delete mode 100644 apps/fees-pay/bar-csv-report/image-repo.yaml delete mode 100644 apps/fees-pay/bar-payment-job/bar-payment-job.yaml delete mode 100644 apps/fees-pay/bar-payment-job/prod-00.yaml diff --git a/apps/fees-pay/automation/kustomization.yaml b/apps/fees-pay/automation/kustomization.yaml index 4c4659c5c3a4..fa63a613ad57 100644 --- a/apps/fees-pay/automation/kustomization.yaml +++ b/apps/fees-pay/automation/kustomization.yaml @@ -40,8 +40,6 @@ resources: - ../pba-csv-report/demo-image-policy.yaml - ../pba-csv-report/demo-int-image-policy.yaml - ../pba-csv-report/image-policy.yaml - - ../bar-csv-report/image-repo.yaml - - ../bar-csv-report/image-policy.yaml - ../ccpay-refunds-api/perftest-image-policy.yaml - ../ccpay-refunds-api/ithc-image-policy.yaml - ../ccpay-refunds-api/image-repo.yaml diff --git a/apps/fees-pay/bar-csv-report/image-policy.yaml b/apps/fees-pay/bar-csv-report/image-policy.yaml deleted file mode 100644 index 2e2b58706dc1..000000000000 --- a/apps/fees-pay/bar-csv-report/image-policy.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 -kind: ImagePolicy -metadata: - name: bar-csv-report -spec: - imageRepositoryRef: - name: bar-csv-report diff --git a/apps/fees-pay/bar-csv-report/image-repo.yaml b/apps/fees-pay/bar-csv-report/image-repo.yaml deleted file mode 100644 index 5d049a7e52a2..000000000000 --- a/apps/fees-pay/bar-csv-report/image-repo.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta2 -kind: ImageRepository -metadata: - name: bar-csv-report -spec: - image: hmctspublic.azurecr.io/payment/jobs diff --git a/apps/fees-pay/bar-payment-job/bar-payment-job.yaml b/apps/fees-pay/bar-payment-job/bar-payment-job.yaml deleted file mode 100644 index fd238c8f1aee..000000000000 --- a/apps/fees-pay/bar-payment-job/bar-payment-job.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: bar-payment-job - namespace: fees-pay -spec: - releaseName: bar-payment-job - values: - job: - image: "hmctspublic.azurecr.io/payment/jobs:prod-b6fd756-20250303102521" #{"$imagepolicy": "flux-system:bar-csv-report"} - schedule: "30 2 * * *" - environment: - REPORT_NAME: bar-csv-report - global: - environment: prod - tenantId: "531ff96d-0ae9-462a-8d2d-bec7c0b42082" - enableKeyVaults: true - jobKind: CronJob - chart: - spec: - chart: ./stable/payment-jobs - sourceRef: - kind: GitRepository - name: hmcts-charts - namespace: flux-system - interval: 1m diff --git a/apps/fees-pay/bar-payment-job/prod-00.yaml b/apps/fees-pay/bar-payment-job/prod-00.yaml deleted file mode 100644 index 4e868ada8107..000000000000 --- a/apps/fees-pay/bar-payment-job/prod-00.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: bar-payment-job - namespace: fees-pay -spec: - releaseName: bar-payment-job - values: - job: - environment: - REPORT_NAME: bar-csv-report - global: - environment: prod