From 1c275da3a4c2614b00a03795cd14611b6d6ce62d Mon Sep 17 00:00:00 2001
From: bill-moj <bill.yeung@digital.justice.gov.uk>
Date: Mon, 16 Dec 2024 17:40:20 +0000
Subject: [PATCH] Enable deploy to preprod and prod

---
 .github/workflows/pipeline.yml                | 40 +++++++++----------
 .../hmpps-allocate-key-workers-ui/values.yaml |  2 +-
 helm_deploy/values-dev.yaml                   |  2 -
 helm_deploy/values-preprod.yaml               |  2 -
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 39cc975..f3c4a76 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -71,23 +71,23 @@ jobs:
     with:
       environment: 'dev'
       app_version: '${{ needs.build.outputs.app_version }}'
-  # deploy_preprod:
-  #   name: Deploy to pre-production environment
-  #   needs:
-  #     - build
-  #     - deploy_dev
-  #   uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@v2 # WORKFLOW_VERSION
-  #   secrets: inherit
-  #   with:
-  #     environment: 'preprod'
-  #     app_version: '${{ needs.build.outputs.app_version }}'
-  # deploy_prod:
-  #   name: Deploy to production environment
-  #   needs:
-  #     - build
-  #     - deploy_preprod
-  #   uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@v2 # WORKFLOW_VERSION
-  #   secrets: inherit
-  #   with:
-  #     environment: 'prod'
-  #     app_version: '${{ needs.build.outputs.app_version }}'
+  deploy_preprod:
+    name: Deploy to pre-production environment
+    needs:
+      - build
+      - deploy_dev
+    uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@v2 # WORKFLOW_VERSION
+    secrets: inherit
+    with:
+      environment: 'preprod'
+      app_version: '${{ needs.build.outputs.app_version }}'
+  deploy_prod:
+    name: Deploy to production environment
+    needs:
+      - build
+      - deploy_preprod
+    uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@v2 # WORKFLOW_VERSION
+    secrets: inherit
+    with:
+      environment: 'prod'
+      app_version: '${{ needs.build.outputs.app_version }}'
diff --git a/helm_deploy/hmpps-allocate-key-workers-ui/values.yaml b/helm_deploy/hmpps-allocate-key-workers-ui/values.yaml
index b52253a..696d7ce 100644
--- a/helm_deploy/hmpps-allocate-key-workers-ui/values.yaml
+++ b/helm_deploy/hmpps-allocate-key-workers-ui/values.yaml
@@ -5,7 +5,7 @@ generic-service:
   # the IRSA service account name for accessing AWS resources
   # serviceAccountName: "hmpps-allocate-key-workers-ui"
 
-  replicaCount: 4
+  replicaCount: 2
 
   image:
     repository: ghcr.io/ministryofjustice/hmpps-allocate-key-workers-ui
diff --git a/helm_deploy/values-dev.yaml b/helm_deploy/values-dev.yaml
index c389ced..ccc262f 100644
--- a/helm_deploy/values-dev.yaml
+++ b/helm_deploy/values-dev.yaml
@@ -2,8 +2,6 @@
 # Per environment values which override defaults in hmpps-allocate-key-workers-ui/values.yaml
 
 generic-service:
-  replicaCount: 2
-
   ingress:
     host: allocate-key-workers-dev.hmpps.service.justice.gov.uk
 
diff --git a/helm_deploy/values-preprod.yaml b/helm_deploy/values-preprod.yaml
index 9ee16cb..d0fe8bd 100644
--- a/helm_deploy/values-preprod.yaml
+++ b/helm_deploy/values-preprod.yaml
@@ -2,8 +2,6 @@
 # Per environment values which override defaults in hmpps-allocate-key-workers-ui/values.yaml
 
 generic-service:
-  replicaCount: 2
-
   ingress:
     host: allocate-key-workers-preprod.hmpps.service.justice.gov.uk