chore(ci): crunchy deployer action

.github/workflows/.deployer.yml

@@ -41,7 +41,13 @@ on:
       db_user:
         description: The database user
         required: false
+        default: 'app'
         type: string
+      debug:
+        description: Debug mode
+        default: false
+        required: false
+        type: boolean
 
       ### Usually a bad idea / not recommended
       timeout-minutes:
@@ -74,26 +80,23 @@ on:
 permissions: {}
 
 jobs:
-  deployer-db:
-    name: Database
-    uses: ./.github/workflows/.deployer-db.yml
-    secrets:
-      oc_namespace: ${{ secrets.OC_NAMESPACE }}
-      oc_token: ${{ secrets.OC_TOKEN }}
-    with:
-      environment: ${{ inputs.environment }}
-      triggers: ${{ inputs.triggers }}
-
   deploy:
     name: Stack
-    needs: deployer-db
     environment: ${{ inputs.environment }}
     runs-on: ubuntu-24.04
     outputs:
       tag: ${{ inputs.tag || steps.pr.outputs.pr }}
       triggered: ${{ steps.deploy.outputs.triggered }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: bcgov/action-crunchy@v1.0.0
+        name: Deploy Crunchy
+        id: deploy_crunchy
+        with:
+          oc_namespace: ${{ secrets.OC_NAMESPACE }}
+          oc_token: ${{ secrets.OC_TOKEN }}
+          environment: ${{ inputs.environment }}
+          values_file: charts/crunchy/values.yml
+          triggers: ${{ inputs.triggers }}
 
       # Variables
       - if: inputs.tag  == ''
@@ -140,6 +143,11 @@ jobs:
                 helm uninstall ${{ steps.vars.outputs.release }}
             fi
 
+      - uses: actions/checkout@v4
+      - name: Debug Values File
+        if: inputs.debug == 'true'
+        run: ls -l charts/crunchy/values.yml
+
       - name: Helm Deploy
         id: deploy
         uses: bcgov/action-oc-runner@8e5c7737c90e5854c8378555aa933a8eb119ad83 # v1.2.0
@@ -148,6 +156,7 @@ jobs:
           oc_token: ${{ secrets.oc_token }}
           oc_server: ${{ vars.oc_server }}
           triggers: ${{ inputs.triggers }}
+          ref: ${{ github.ref }}
           commands: |
             # Deploy
 
@@ -157,12 +166,13 @@ jobs:
             # Helm package
             sed -i 's/^name:.*/name: ${{ github.event.repository.name }}/' Chart.yaml
             helm package -u . --app-version="tag-${{ steps.vars.outputs.tag }}_run-${{ github.run_number }}" --version=${{ steps.pr.outputs.pr || steps.vars.outputs.version }}
-
+            # print the values.yaml file to see the values being used
             # Helm upgrade/rollout
             helm upgrade \
               --set-string global.repository=${{ github.repository }} \
-              --set-string global.tag=${{ steps.vars.outputs.tag }} \
-              --set-string global.config.databaseUser=${{ inputs.db_user }} \
+              --set-string global.tag="${{ steps.vars.outputs.tag }}" \
+              --set-string global.config.databaseUser="${{ inputs.db_user }}" \
+              --set-string global.databaseAlias="${{ steps.deploy_crunchy.outputs.release }}-crunchy" \
               ${{ inputs.params }} \
               --install --wait ${{ inputs.atomic && '--atomic' || '' }} ${{ steps.vars.outputs.release }} \
               --timeout ${{ inputs.timeout-minutes }}m \

.github/workflows/pr-close.yml

@@ -28,36 +28,9 @@ jobs:
     name: Remove DB User from Crunchy
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Remove PR user and database from crunchy
-        continue-on-error: true
-        uses: bcgov/action-oc-runner@8e5c7737c90e5854c8378555aa933a8eb119ad83 # v1.2.0
+      - uses: bcgov/action-crunchy@v1.0.0
+        name: Remove PR Specific User
         with:
           oc_namespace: ${{ secrets.oc_namespace }}
           oc_token: ${{ secrets.oc_token }}
           oc_server: ${{ vars.oc_server }}
-          commands: |
-            # check if postgres-crunchy exists or else exit
-            oc get PostgresCluster/postgres-crunchy || exit 0
-
-            # Remove the user from the crunchy cluster yaml and apply the changes
-            USER_TO_REMOVE='{"databases":["app-${{ github.event.number }}"],"name":"app-${{ github.event.number }}"}'
-
-            echo 'getting current users from crunchy'
-            CURRENT_USERS=$(oc get PostgresCluster/postgres-crunchy -o json | jq '.spec.users')
-            echo "${CURRENT_USERS}"
-
-            # Remove the user from the list, 
-            UPDATED_USERS=$(echo "${CURRENT_USERS}" | jq --argjson user "${USER_TO_REMOVE}" 'map(select(. != $user))')
-
-            PATCH_JSON=$(jq -n --argjson users "${UPDATED_USERS}" '{"spec": {"users": $users}}')
-            oc patch PostgresCluster/postgres-crunchy --type=merge -p "${PATCH_JSON}"
-
-            # get primary crunchy pod and remove the role and db
-            CRUNCHY_PG_PRIMARY_POD_NAME=$(oc get pods -l postgres-operator.crunchydata.com/role=master -o json | jq -r '.items[0].metadata.name')
-
-            echo "${CRUNCHY_PG_PRIMARY_POD_NAME}"
-            # Terminate all connections to the database before trying terminate and Drop the databse and role right after
-            oc exec -it "${CRUNCHY_PG_PRIMARY_POD_NAME}" -- bash -c "psql -U postgres -d postgres -c \"SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = 'app-${{ github.event.number }}' AND pid <> pg_backend_pid();\" && \psql -U postgres -d postgres -c \"DROP DATABASE \\\"app-${{ github.event.number }}\\\";\" && \psql -U postgres -d postgres -c \"DROP ROLE \\\"app-${{ github.event.number }}\\\";\""
-            echo 'database and role deleted'

.github/workflows/pr-open.yml

@@ -44,10 +44,10 @@ jobs:
       triggers: ('backend/' 'frontend/' 'migrations/' 'charts/')
 
   tests:
-    name: Tests
-    if: needs.deploys.outputs.triggered == 'true'
-    needs: [deploys]
-    uses: ./.github/workflows/.tests.yml
+     name: Tests
+     if: needs.deploys.outputs.triggered == 'true'
+     needs: [deploys]
+     uses: ./.github/workflows/.tests.yml
 
   results:
     name: PR Results

backend/package.json

@@ -1,5 +1,5 @@
 {
-  "author": "BC Government Forestry Suite of Applications Starter Template",
+  "author": "NRIDS",
   "license": "Apache-2.0",
   "main": "index.js",
   "scripts": {

charts/app/templates/secret.yaml

@@ -6,10 +6,16 @@
 {{- $databaseName := printf ""}}
 {{- $hostWithoutPort := printf ""}}
 {{- if .Values.crunchy.enabled}}
-  {{- $secretName := printf "postgres-crunchy-pguser-%s" .Values.global.config.databaseUser }}
+  {{- $secretName := printf "%s-pguser-%s" .Values.global.databaseAlias .Values.global.config.databaseUser }}
   {{- $databaseUser = .Values.global.config.databaseUser}}
-  {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace $secretName ) | default dict }}
-  {{- $secretData := (get $secretObj "data") | default dict }}
+  {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace $secretName ) }}
+  {{- if not $secretObj }}
+    {{- fail (printf "Secret %s not found in namespace %s" $secretName .Release.Namespace) }}
+  {{- end }}
+  {{- $secretData := (get $secretObj "data") }}
+  {{- if not $secretData }}
+    {{- fail (printf "Secret %s data not found in namespace %s" $secretName .Release.Namespace) }}
+  {{- end }}
   {{- $databasePassword = get $secretData "password"  }}
   {{- $databaseName = b64dec (get $secretData "dbname") }}
   {{- $host = printf "%s:%s" (b64dec (get $secretData "host")) (b64dec (get $secretData "port")) }}