Allow autoscaling in PRs, some simplification (#921)

bcgov · Mar 21, 2024 · e4e2a67 · e4e2a67
1 parent 0635cb8
commit e4e2a67
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -104,8 +104,6 @@ jobs:
             file: backend/openshift.deploy.yml
             overwrite: true
             parameters:
-              -p MIN_REPLICAS=1
-              -p MAX_REPLICAS=1
               -p BUILD=snapshot-${{ needs.init.outputs.tag }}
               -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
             verification_path: "actuator/health"
@@ -118,17 +116,13 @@ jobs:
             parameters:
               -p VITE_SPAR_BUILD_VERSION=snapshot-${{ needs.init.outputs.tag }}
               -p VITE_NRSPARWEBAPP_VERSION=dev
-              -p MIN_REPLICAS=1
-              -p MAX_REPLICAS=1
               -p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
               -p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
           - name: oracle-api
             file: oracle-api/openshift.deploy.yml
             overwrite: true
             parameters:
               -p NR_SPAR_ORACLE_API_VERSION=snapshot-${{ needs.init.outputs.tag }}
-              -p MIN_REPLICAS=1
-              -p MAX_REPLICAS=1
               -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
             triggers: ('common/' 'oracle-api/')
             verification_path: "actuator/health"
@@ -142,8 +136,10 @@ jobs:
           overwrite: ${{ matrix.overwrite }}
           penetration_test: false
           parameters:
-            -p ZONE=${{ needs.init.outputs.tag }}
+            -p MIN_REPLICAS=1
+            -p MAX_REPLICAS=2
             -p NAME=${{ github.event.repository.name }}
+            -p ZONE=${{ needs.init.outputs.tag }}
             ${{ matrix.parameters }}
           triggers: ${{ matrix.triggers }}
           verification_path: ${{ matrix.verification_path}}

diff --git a/common/openshift.fluentbit.yml b/common/openshift.fluentbit.yml
@@ -40,6 +40,10 @@ parameters:
     description: Requested Memory per pod (in gigabytes Gi or megabytes Mi ex. 500Mi)
     displayName: Memory Request
     value: 16Mi
+  - name: MIN_REPLICAS
+    description: Dummy value for workflow convenience
+  - name: MAX_REPLICAS
+    description: Dummy value for workflow convenience
 objects:
   - kind: DeploymentConfig
     apiVersion: v1

diff --git a/database/openshift.deploy.yml b/database/openshift.deploy.yml
@@ -37,6 +37,10 @@ parameters:
     displayName: Database Volume Capacity
     required: true
     value: 256Mi
+  - name: MIN_REPLICAS
+    description: Dummy value for workflow convenience
+  - name: MAX_REPLICAS
+    description: Dummy value for workflow convenience
 objects:
   - kind: PersistentVolumeClaim
     apiVersion: v1