.github/workflows/.deploy.yml

@@ -0,0 +1,116 @@
+name: .Deploys
+
+on:
+  workflow_call:
+    inputs:
+      ### Typical / recommended
+      autoscaling:
+        description: Autoscaling enabled or not for the deployments
+        required: false
+        type: string
+        default: 'true'
+      environment:
+        description: Environment name; omit for PRs
+        required: false
+        type: string
+      tag:
+        description: Container tag; usually PR number
+        required: false
+        type: string
+        default: ${{ github.event.number }}
+      triggers:
+        description: Paths to trigger a deploy; omit=always; e.g. ('backend/' 'frontend/')
+        required: false
+        type: string
+
+      ### Usually a bad idea / not recommended
+      directory:
+        description: "Chart directory"
+        default: "charts/${{ github.event.repository.name }}"
+        required: false
+        type: string
+      timeout-minutes:
+        description: "Timeout minutes"
+        default: 10
+        required: false
+        type: number
+      values:
+        description: "Values file"
+        default: "values.yaml"
+        required: false
+        type: string
+      params:
+        description: "Extra parameters to pass to helm upgrade"
+        default: ""
+        required: false
+        type: string
+      release_name:
+        description: "Release name"
+        default: ${{ github.event.repository.name }}
+        required: false
+        type: string
+
+
+jobs:
+
+  deploys:
+    name: Helm
+    environment: ${{ inputs.environment }}
+    runs-on: ubuntu-24.04
+    timeout-minutes: ${{ inputs.timeout-minutes }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Stop pre-existing deployments on PRs (status = pending-upgrade)
+        if: github.event_name == 'pull_request'
+        uses: bcgov/action-oc-runner@v1.0.0
+        with:
+          oc_namespace: ${{ vars.oc_namespace }}
+          oc_token: ${{ secrets.oc_token }}
+          oc_server: ${{ vars.oc_server }}
+          triggers: ${{ inputs.triggers }}
+          commands: |
+            # Interrupt any previous deployments (PR only)
+            PREVIOUS=$(helm status ${{ inputs.release_name }} -o json | jq .info.status || true)
+            if [[ ${PREVIOUS} =~ pending ]]; then
+              echo "Rollback triggered"
+              helm rollback ${{ inputs.release_name }} || \
+                helm uninstall ${{ inputs.release_name }}
+            fi
+
+      - name: Deploy
+        uses: bcgov/action-oc-runner@v1.0.0
+        with:
+          oc_namespace: ${{ vars.oc_namespace }}
+          oc_token: ${{ secrets.oc_token }}
+          oc_server: ${{ vars.oc_server }}
+          triggers: ${{ inputs.triggers }}
+          commands: |
+            # If directory provided, cd to it
+            [ -z "${{ inputs.directory }}" ]|| cd ${{ inputs.directory }}
+            # Deploy Helm Chart
+            helm dependency update
+            helm package --app-version="v${{ inputs.tag }}" --version=${{ inputs.tag }} .
+            cp ./${{ github.event.repository.name }}-${{ inputs.tag }}.tgz pubcode.tgz
+            ls -la
+            helm upgrade  ${{ inputs.release_name }} pubcode.tgz \
+              --set global.autoscaling=${{ inputs.autoscaling }} \
+              --set-string global.repository="${{ github.repository }}" \
+              --set-string global.secrets.emailRecipients="${{ secrets.EMAIL_RECIPIENTS }}" \
+              --set-string global.secrets.chesTokenURL="${{ secrets.CHES_TOKEN_URL }}" \
+              --set-string global.secrets.chesClientID="${{ secrets.CHES_CLIENT_ID }}" \
+              --set-string global.secrets.chesClientSecret="${{ secrets.CHES_CLIENT_SECRET }}" \
+              --set-string global.secrets.chesAPIURL="${{ secrets.CHES_API_URL }}" \
+              --set-string global.secrets.databaseAdminPassword="${{ secrets.DB_PWD }}" \
+                ${{ inputs.params }} \
+              --install \
+              --wait \
+              --atomic \
+              --timeout ${{ inputs.timeout-minutes }}m \
+              --values ${{ inputs.values }}
+
+
+            # print history 
+            helm history ${{ inputs.release_name }} || true
+
+            # Remove old build runs, build pods and deployment pods
+            oc delete po --field-selector=status.phase==Succeeded

.github/workflows/merge.yml

@@ -13,8 +13,8 @@ concurrency:
 jobs:
   semantic-version:
     outputs:
-      semanticVersion: ${{ steps.changelog.outputs.version }}
-      tag: ${{ steps.changelog.outputs.tag }}
+      semanticVersion: ${{ steps.changelog.outputs.version }} # this is without v 1.0.0
+      tag: ${{ steps.changelog.outputs.tag }} # this is with v, v1.0.0
       clean_changelog: ${{ steps.changelog.outputs.clean_changelog }}
     runs-on: ubuntu-24.04
     timeout-minutes: 1
@@ -43,36 +43,22 @@ jobs:
         with:
           registry: ghcr.io
           repository: ${{ github.repository }}/${{ matrix.package }}
-          target: test
-          tags: ${{ needs.semantic-version.outputs.semanticVersion }}
+          target: latest
+          tags: |
+            ${{ needs.semantic-version.outputs.semanticVersion }}
+            ${{ needs.semantic-version.outputs.tag }}
 
   deploys:
     name: TEST Deployments
     needs: [retag-images, semantic-version]
-    environment: test
-    runs-on: ubuntu-24.04
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-      - uses: redhat-actions/openshift-tools-installer@v1
-        with:
-          oc: "4"
-      - name: Deploy
-        shell: bash
-        run: |
-          # Allow pipefail, since we could be catching oc create errors
-          set +o pipefail
-
-          # Login to OpenShift (NOTE: project command is a safeguard)
-          oc login --token=${{ secrets.oc_token }} --server=${{ vars.oc_server }}
-          oc project ${{ vars.oc_namespace }}
-          
-          cd charts/pubcode
-          
-          # Deploy Helm Chart
-          helm dependency update
-          helm upgrade --install --wait --atomic pubcode-test --values values.yaml --set-string global.repository=${{ github.repository }}  --set-string api.containers[0].tag="${{ needs.semantic-version.outputs.semanticVersion }}" --set-string frontend.containers[0].tag="${{ needs.semantic-version.outputs.semanticVersion }}" --set-string global.secrets.emailRecipients="${{ secrets.EMAIL_RECIPIENTS }}" --set-string global.secrets.chesTokenURL="${{ secrets.CHES_TOKEN_URL }}" --set-string global.secrets.chesClientID="${{ secrets.CHES_CLIENT_ID }}" --set-string global.secrets.chesClientSecret="${{ secrets.CHES_CLIENT_SECRET }}" --set-string global.secrets.chesAPIURL="${{ secrets.CHES_API_URL }}" --set-string global.secrets.databaseAdminPassword="${{ secrets.DB_PWD }}" --set-string namespace="${{ vars.oc_namespace }}"  --timeout 5m .
-
+    uses: ./.github/workflows/.deploy.yml
+    secrets: inherit
+    with:
+      autoscaling: true
+      environment: test
+      tag: ${{ needs.semantic-version.outputs.semanticVersion }} # this is without v
+      release_name: pubcode-test
+      params: --set-string api.containers[0].tag="${{ needs.semantic-version.outputs.tag }}" --set-string frontend.containers[0].tag="${{ needs.semantic-version.outputs.tag }}"
   tests:
     name: Tests
     needs: [deploys]
@@ -83,29 +69,19 @@ jobs:
   deploys-prod:
     name: PROD Deployments
     needs: [semantic-version, tests]
-    environment: prod
+    uses: ./.github/workflows/.deploy.yml
+    secrets: inherit
+    with:
+      autoscaling: true
+      environment: prod
+      tag: ${{ needs.semantic-version.outputs.semanticVersion }}
+      release_name: pubcode
+      params: --set-string api.containers[0].tag="${{ needs.semantic-version.outputs.tag }}" --set-string frontend.containers[0].tag="${{ needs.semantic-version.outputs.tag }}"
+  github_release:    
+    name: Create Release
+    needs: [semantic-version, deploys-prod]
     runs-on: ubuntu-24.04
-    timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v4
-      - uses: redhat-actions/openshift-tools-installer@v1
-        with:
-          oc: "4"
-      - name: Deploy
-        shell: bash
-        run: |
-          # Allow pipefail, since we could be catching oc create errors
-          set +o pipefail
-
-          # Login to OpenShift (NOTE: project command is a safeguard)
-          oc login --token=${{ secrets.oc_token }} --server=${{ vars.oc_server }}
-          oc project ${{ vars.oc_namespace }}
-
-          # Deploy Helm Chart
-          cd charts/pubcode
-          helm dependency update
-          helm upgrade --install --wait --atomic pubcode --values values.yaml --set-string global.repository=${{ github.repository }}  --set-string api.containers[0].tag="${{ needs.semantic-version.outputs.semanticVersion }}" --set-string frontend.containers[0].tag="${{ needs.semantic-version.outputs.semanticVersion }}" --set-string global.secrets.emailRecipients="${{ secrets.EMAIL_RECIPIENTS }}" --set-string global.secrets.chesTokenURL="${{ secrets.CHES_TOKEN_URL }}" --set-string global.secrets.chesClientID="${{ secrets.CHES_CLIENT_ID }}" --set-string global.secrets.chesClientSecret="${{ secrets.CHES_CLIENT_SECRET }}" --set-string global.secrets.chesAPIURL="${{ secrets.CHES_API_URL }}" --set-string global.secrets.databaseAdminPassword="${{ secrets.DB_PWD }}" --set-string namespace="${{ vars.oc_namespace }}"  --timeout 5m .
-
       - name: Create Release
         uses: softprops/action-gh-release@v2
         continue-on-error: true

.github/workflows/pr-close.yml

@@ -10,34 +10,15 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # Clean up OpenShift when PR closed, no conditions
-  cleanup-openshift:
-    name: Cleanup OpenShift
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: redhat-actions/openshift-tools-installer@v1
-        with:
-          oc: "4"
-      - name: Remove OpenShift artifacts
-        run: |
-          oc login --token=${{ secrets.OC_TOKEN }} --server=${{ vars.OC_SERVER }}
-          oc project ${{ vars.OC_NAMESPACE }}
-
-          # Remove old build runs, build pods and deployment pods
-          helm uninstall pubcode-${{ github.event.number }}
-
-  # If merged into main, then handle any image promotions
-  image-promotions:
-    name: Image Promotions
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
-    runs-on: ubuntu-24.04
-    strategy:
-      matrix:
-        package: [api, database, frontend]
-    steps:
-      - uses: shrink/actions-docker-registry-tag@v4
-        with:
-          registry: ghcr.io
-          repository: ${{ github.repository }}/${{ matrix.package }}
-          target: ${{ github.event.number }}
-          tags: test
+  cleanup:
+    name: Cleanup and Image Promotion
+    uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v0.8.3
+    permissions:
+      packages: write
+    secrets:
+      oc_namespace: ${{ vars.OC_NAMESPACE }}
+      oc_token: ${{ secrets.OC_TOKEN }}
+    with:
+      cleanup: helm
+      packages: api database frontend
+

.github/workflows/pr-open.yml

@@ -19,7 +19,7 @@ jobs:
       pull-requests: write
     steps:
       - name: PR Greeting
-        uses: bcgov-nr/action-pr-description-add@v1.2.0
+        uses: bcgov/action-pr-description-add@v1.2.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           add_markdown: |
@@ -44,11 +44,11 @@ jobs:
         package: [api, frontend, database]
     steps:
       - uses: actions/checkout@v4
-      - uses: bcgov-nr/action-builder-ghcr@v2.3.0
+      - uses: bcgov/action-builder-ghcr@v2.3.0
         with:
           package: ${{ matrix.package }}
           tag: ${{ github.sha }}
-          tag_fallback: test
+          tag_fallback: latest
           token: ${{ secrets.GITHUB_TOKEN }}
           triggers: ('${{ matrix.package }}/')
 
@@ -62,57 +62,26 @@ jobs:
   deploys:
     name: Deploys
     needs: [builds]
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: redhat-actions/openshift-tools-installer@v1
-        with:
-          oc: "4"
-      - name: Deploy to OpenShift
-        shell: bash
-        run: |
-          # Expand for deployment steps
-          set +o pipefail
-    
-          oc login --token=${{ secrets.oc_token }} --server=${{ vars.oc_server }}
-          oc project ${{ vars.oc_namespace }} # Safeguard!
-
-          # Deploy Helm Chart
-          cd charts/pubcode
-          helm dependency update
-          helm upgrade --install --wait --atomic  pubcode-${{ github.event.number }}  \
-          --set-string global.repository=${{ github.repository }}  \
-          --set-string api.containers[0].tag="${{ github.sha }}" \
-          --set-string api.containers[0].resources.limits.cpu="250m" \
-          --set-string api.containers[0].resources.limits.memory="250Mi" \
-          --set-string api.containers[0].resources.requests.cpu="100m" \
-          --set-string api.containers[0].resources.requests.memory="150Mi" \
-          --set api.autoscaling.minReplicas=1 \
-          --set api.autoscaling.maxReplicas=1 \
-          --set frontend.autoscaling.minReplicas=1 \
-          --set frontend.autoscaling.maxReplicas=1 \
-          --set-string frontend.containers[0].tag="${{ github.sha }}" \
-          --set-string frontend.containers[0].resources.limits.cpu="200m" \
-          --set-string frontend.containers[0].resources.limits.memory="150Mi" \
-          --set-string frontend.containers[0].resources.requests.cpu="100m" \
-          --set-string frontend.containers[0].resources.requests.memory="50Mi" \
-          --set-string database.containers[0].resources.limits.cpu="500m" \
-          --set-string database.containers[0].resources.limits.memory="450Mi" \
-          --set-string database.containers[0].resources.requests.cpu="100m" \
-          --set-string database.containers[0].resources.requests.memory="150Mi" \
-          --set-string database.initContainers[0].resources.limits.cpu="500m" \
-          --set-string database.initContainers[0].resources.limits.memory="450Mi" \
-          --set-string database.initContainers[0].resources.requests.cpu="100m" \
-          --set-string database.initContainers[0].resources.requests.memory="150Mi" \
-          --set-string database.pvc.size="350Mi" \
-          --set-string global.secrets.emailRecipients="${{ secrets.EMAIL_RECIPIENTS }}" \
-          --set-string global.secrets.chesTokenURL="${{ secrets.CHES_TOKEN_URL }}" \
-          --set-string global.secrets.chesClientID="${{ secrets.CHES_CLIENT_ID }}" \
-          --set-string global.secrets.chesClientSecret="${{ secrets.CHES_CLIENT_SECRET }}" \
-          --set-string global.secrets.chesAPIURL="${{ secrets.CHES_API_URL }}" \
-          --set-string global.secrets.databaseAdminPassword="${{ secrets.DB_PWD }}" \
-          --set-string global.env.VITE_SCHEMA_BRANCH=${{ github.event.pull_request.head.ref }}  \
-          --set-string namespace="${{ vars.oc_namespace }}" -f values.yaml --timeout 5m  .
+    uses: ./.github/workflows/.deploy.yml
+    secrets: inherit
+    with:
+      autoscaling: false
+      tag: ${{ github.event.number }}
+      release_name: pubcode-${{ github.event.number }}
+      params: |
+            --set-string global.repository=${{ github.repository }}  \
+            --set-string api.containers[0].tag="${{ github.sha }}" \
+            --set-string api.containers[0].resources.requests.cpu="30m" \
+            --set-string api.containers[0].resources.requests.memory="50Mi" \
+            --set-string frontend.containers[0].tag="${{ github.sha }}" \
+            --set-string frontend.containers[0].resources.requests.cpu="30m" \
+            --set-string frontend.containers[0].resources.requests.memory="50Mi" \
+            --set-string database.containers[0].resources.requests.cpu="30m" \
+            --set-string database.containers[0].resources.requests.memory="50Mi" \
+            --set-string database.initContainers[0].resources.requests.cpu="30m" \
+            --set-string database.initContainers[0].resources.requests.memory="50Mi" \
+            --set-string database.pvc.size="350Mi" \
+            --set-string global.env.VITE_SCHEMA_BRANCH=${{ github.event.pull_request.head.ref }} \
 
   tests:
     name: Tests

api/Dockerfile

@@ -1,5 +1,4 @@
-# Build static files
-FROM node:22.12.0-slim AS build
+FROM node:22 AS build
 WORKDIR /app
 COPY *.json ./
 RUN npm ci --omit=dev --ignore-scripts