Roll backup into standard deployments

.github/workflows/.deploy.yml

@@ -105,21 +105,6 @@ jobs:
             ${{ github.event_name == 'pull_request' && '-p MEMORY_REQUEST=100Mi' || '' }}
             ${{ github.event_name == 'pull_request' && '-p MEMORY_LIMIT=200Mi' || '' }}
 
-      - name: Deploy Database Backup
-        if: steps.triggers.outputs.core == 'true' || steps.triggers.outputs.sync == 'true'
-        env:
-          CRONJOB: ${{ github.event.repository.name }}-${{ inputs.target }}-database-backup
-        uses: bcgov-nr/[email protected]
-        with:
-          file: common/openshift.backup.yml
-          oc_namespace: ${{ vars.OC_NAMESPACE }}
-          oc_server: ${{ secrets.OC_SERVER }}
-          oc_token: ${{ secrets.OC_TOKEN }}
-          oc_version: "4.13"
-          overwrite: true
-          parameters: -p ZONE=${{ env.ZONE }} -p PG_DB_IMAGE=postgis/postgis:15-master
-          post_rollout: oc create job --from=cronjob/${{ env.CRONJOB }} ${{ env.CRONJOB }}-$(date +%Y%m%d%H%M%S)
-
   deploy:
     name: Deploy
     environment: ${{ inputs.environment }}
@@ -129,24 +114,26 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        name: [backend, frontend, oracle-api]
+        name: [backend, backup, frontend, oracle-api]
         include:
           - name: backend
             file: backend/openshift.deploy.yml
-            overwrite: true
             parameters:
               -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.ca-central-1.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
             verification_path: "health"
+          - name: backup
+            file: common/openshift.backup.yml
+            parameters:
+              -p ZONE=${{ env.ZONE }} -p PG_DB_IMAGE=postgis/postgis:15-master
+            post_rollout: oc create job --from=cronjob/${{ env.CRONJOB }} ${{ env.CRONJOB }}-$(date +%Y%m%d%H%M%S)
           - name: frontend
             file: frontend/openshift.deploy.yml
-            overwrite: true
             parameters:
               -p FAM_MODDED_ZONE=${{ needs.init.outputs.fam-modded-zone }}
               -p VITE_SPAR_BUILD_VERSION=snapshot-${{ inputs.target || github.event.number }}
               -p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
           - name: oracle-api
             file: oracle-api/openshift.deploy.yml
-            overwrite: true
             parameters:
               -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.ca-central-1.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
               ${{ github.event_name == 'pull_request' && '-p CPU_LIMIT=100m' || '' }}
@@ -162,7 +149,7 @@ jobs:
           oc_namespace: ${{ vars.OC_NAMESPACE }}
           oc_server: ${{ vars.OC_SERVER }}
           oc_token: ${{ secrets.OC_TOKEN }}
-          overwrite: ${{ matrix.overwrite }}
+          overwrite: true
           parameters:
             -p TAG=${{ inputs.tag }}
             -p ZONE=${{ inputs.target }}

common/openshift.backup.yml

@@ -48,6 +48,12 @@ parameters:
   - name: PG_DB_IMAGE
     description: PostgreSQL Image (namespace/name:tag) to be used for backup
     required: true
+  - name: TAG
+    description: Dummy param, for convenience
+  - name: MIN_REPLICAS
+    description: Dummy param, for convenience
+  - name: MAX_REPLICAS
+    description: Dummy param, for convenience
 objects: 
   - kind: PersistentVolumeClaim
     apiVersion: v1