Merge remote-tracking branch 'origin' into ORV2-3259

bcgov · Jan 30, 2025 · 51f60e9 · 51f60e9
2 parents 342b72e + 1647c8d
commit 51f60e9
Show file tree

Hide file tree

Showing 60 changed files with 1,766 additions and 973 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -18,7 +18,7 @@ jobs:
   # https://github.com/github/codeql-action
   codeql:
     name: CodeQL
-    if: ${{ ! github.event.pull_request.draft }}
+    if: (! github.event.pull_request.draft)
     runs-on: ubuntu-22.04
     timeout-minutes: 5
     steps:
@@ -38,7 +38,7 @@ jobs:
   # https://github.com/marketplace/actions/aqua-security-trivy
   trivy:
     name: Trivy Security Scan
-    if: ${{ ! github.event.pull_request.draft }}
+    if: (! github.event.pull_request.draft)
     runs-on: ubuntu-22.04
     timeout-minutes: 1
     steps:
@@ -60,7 +60,7 @@ jobs:
 
   tests:
     name: Tests
-    if: ${{ ! github.event.pull_request.draft }}
+    if: (! github.event.pull_request.draft)
     runs-on: ubuntu-22.04
     timeout-minutes: 5
     services:

diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
@@ -8,13 +8,23 @@ on:
         required: false
         type: string
         default: "uat"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
   workflow_call:
     inputs:
       tag:
         description: "Image tag to deploy"
         required: false
         type: string
         default: "uat"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
 
 jobs:
   deploy-demo:

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -149,12 +149,12 @@ jobs:
           echo "No triggers have fired, deployment skipped"
 
       - uses: redhat-actions/openshift-tools-installer@v1
-        if: ${{ steps.triggers.outputs.triggered == 'true' }}
+        if: steps.triggers.outputs.triggered == 'true'
         with:
           oc: "4"
 
       - name: Deploy if Triggers Fired
-        if: ${{ steps.triggers.outputs.triggered == 'true' }}
+        if: steps.triggers.outputs.triggered == 'true'
         working-directory: ${{ inputs.directory }}
         shell: bash
         run: |

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -9,13 +9,23 @@ on:
         required: false
         type: string
         default: "latest"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
   workflow_call:
     inputs:
       tag:
         description: "Image tag to deploy"
         required: false
         type: string
         default: "latest"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
 jobs:
   deploy-dev:
     name: Deploys (DEV)
@@ -32,9 +42,9 @@ jobs:
         --set-string global.zone='dev' \
         --set-string global.vault.role='nonprod' \
         --set-string global.vault.zone='dev' \
-        --set-string global.pr_num='${{ inputs.tag }}' \
         --set-json dops.containers[0].resources='{"limits": {"cpu": "1000m", "memory": "2000Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json frontend.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
         --set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
+        ${{ inputs.params }} \
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
       # Get PR number for squash merges to main
       - name: Get PR Number From Event
-        if: ${{ github.event_name == 'push' }}
+        if: github.event_name == 'push'
         id: pr_no
         uses: bcgov/[email protected]
       - name: PR Number
@@ -42,6 +42,9 @@ jobs:
     secrets: inherit
     with:
       tag: ${{ needs.vars.outputs.pr }}
+      params: |
+        --set-string global.env.pr_num='${{ needs.vars.outputs.pr }}' \
+        --set-string global.env.release_num='${{ needs.vars.outputs.pr }}' \
 
   promote-images-test:
     name: Promote Images - Test

diff --git a/.github/workflows/notifications.yml b/.github/workflows/notifications.yml
@@ -6,7 +6,7 @@ on:
       - completed
 jobs:
   notify-teams-pr:
-    if: ${{github.event.workflow_run.event == 'pull_request'}}
+    if: github.event.workflow_run.event == 'pull_request'
     runs-on: ubuntu-22.04
     steps:
       - uses: simbo/msteams-message-card-action@latest
@@ -26,7 +26,7 @@ jobs:
                 image: ${{github.event.workflow_run.head_repository.owner.avatar_url}}
                 text: PR Opened
   notify-teams-merged:
-    if: ${{github.event.workflow_run.event == 'push'}}
+    if: github.event.workflow_run.event == 'push'
     runs-on: ubuntu-22.04
     steps:
       - name: PR Number

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -81,3 +81,6 @@ jobs:
     secrets: inherit
     with:
       tag: ${{ needs.vars.outputs.pr }}
+      params: |
+        --set-string global.env.pr_num='${{ needs.vars.outputs.pr }}' \
+        --set-string global.env.release_num='${{ needs.vars.outputs.pr }}' \
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
@@ -8,13 +8,23 @@ on:
         required: false
         type: string
         default: "prod"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
   workflow_call:
     inputs:
       tag:
         description: "Image tag to deploy"
         required: false
         type: string
         default: "prod"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
 
 jobs:
   deploys-prod:
@@ -31,4 +41,4 @@ jobs:
         --set-string global.zone='prod' \
         --set-string global.vault.role='prod' \
         --set-string global.vault.zone='prod' \
-        --set-string global.pr_num='${{ inputs.tag }}' \
+        ${{ inputs.params }} \
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,12 +16,13 @@ jobs:
     outputs:
       pr: ${{ steps.pr.outputs.pr }}
       release-name: ${{ steps.release-name.outputs.release-name }}
+      release-num: ${{ steps.release-name.outputs.release-num }}
     runs-on: ubuntu-22.04
     timeout-minutes: 1
     steps:
       # Get PR number for squash merges to main
       - name: Get PR Number From Event
-        if: ${{ github.event_name == 'release' }}
+        if: github.event_name == 'release'
         id: pr_no
         uses: bcgov/action-get-pr@main
       - name: PR Number
@@ -31,7 +32,7 @@ jobs:
         id: release-name
         run: |
           echo release-name=$(curl https://api.github.com/repos/bcgov/onroutebc/releases/latest | jq -r .tag_name) >> $GITHUB_OUTPUT
-  
+          echo release-num=V$(curl https://api.github.com/repos/bcgov/onroutebc/releases/latest | jq -r .tag_name | sed 's/[^0-9]//g')  >> $GITHUB_OUTPUT
   promote-images-release:
     name: Promote Images - Release
     needs: [vars]
@@ -56,7 +57,10 @@ jobs:
     uses: ./.github/workflows/uat.yml
     secrets: inherit
     with:
-      tag: ${{ needs.vars.outputs.release-name }}
+      tag: ${{ needs.vars.outputs.pr }}
+      params: |
+        --set-string global.env.pr_num='${{ needs.vars.outputs.pr }}' \
+        --set-string global.env.release_num='${{ needs.vars.outputs.release-num }}' \
         
   promote-images-uat:
     name: Promote Images - Uat
@@ -83,6 +87,9 @@ jobs:
     secrets: inherit
     with:
       tag: ${{ needs.vars.outputs.pr }}
+      params: |
+        --set-string global.env.pr_num='${{ needs.vars.outputs.pr }}' \
+        --set-string global.env.release_num='${{ needs.vars.outputs.release-num }}' \
   
   promote-images-prod:
     name: Promote Images - Prod

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,13 +9,23 @@ on:
         required: false
         type: string
         default: "test"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
   workflow_call:
     inputs:
       tag:
         description: "Image tag to deploy"
         required: false
         type: string
         default: "test"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
 
 jobs:
   deploy-test:
@@ -32,4 +42,4 @@ jobs:
         --set-string global.zone='test' \
         --set-string global.vault.role='nonprod' \
         --set-string global.vault.zone='test' \
-        --set-string global.pr_num='${{ inputs.tag }}' \
+        ${{ inputs.params }} \
diff --git a/.github/workflows/uat.yml b/.github/workflows/uat.yml
@@ -9,13 +9,23 @@ on:
         required: false
         type: string
         default: "test"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
   workflow_call:
     inputs:
       tag:
         description: "Image tag to deploy"
         required: false
         type: string
         default: "test"
+      params:
+        description: 'Extra parameters to pass to helm upgrade'
+        default: ''
+        required: false
+        type: string
 
 jobs:
   deploy-uat:
@@ -32,4 +42,4 @@ jobs:
         --set-string global.zone='test' \
         --set-string global.vault.role='nonprod' \
         --set-string global.vault.zone='uat' \
-        --set-string global.pr_num='${{ inputs.tag }}' \
+        ${{ inputs.params }} \
diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
@@ -1,5 +1,6 @@
 ---
 global:
+  env: {}
   autoscaling: true
   license: "c28f0c"
   podAnnotations: |
@@ -34,7 +35,8 @@ frontend:
       ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.apps.silver.devops.gov.bc.ca"
       POLICY_URL: "https://{{.Release.Name}}-policy.apps.silver.devops.gov.bc.ca"
       DEPLOY_ENVIRONMENT: "{{.Values.global.vault.zone}}"
-      FRONTEND_PR_NUM: "{{.Values.global.pr_num}}"
+      PR_NUM: "{{.Values.global.env.pr_num}}"
+      RELEASE_NUM: "{{.Values.global.env.release_num}}"
       config.js.template: |-
         const envConfig = (() => { return {
             "VITE_DEPLOY_ENVIRONMENT":"$DEPLOY_ENVIRONMENT",
@@ -43,7 +45,8 @@ frontend:
             "VITE_KEYCLOAK_ISSUER_URL":"$KEYCLOAK_ISSUER_URL",
             "VITE_KEYCLOAK_AUDIENCE":"$KEYCLOAK_AUDIENCE",
             "VITE_SITEMINDER_LOG_OFF_URL":"$SITEMINDER_LOG_OFF_URL",
-            "VITE_FRONTEND_PR_NUM":"$FRONTEND_PR_NUM",
+            "VITE_PR_NUM":"$PR_NUM",
+            "VITE_RELEASE_NUM":"$RELEASE_NUM",
           };
         })();
   containers:
@@ -64,11 +67,13 @@ frontend:
             key: POLICY_URL            
           - name: DEPLOY_ENVIRONMENT
             key: DEPLOY_ENVIRONMENT
-          - name: FRONTEND_PR_NUM
-            key: FRONTEND_PR_NUM
-        fromValues:
+        fromValues: 
           - name: TIMESTAMP
             value: "{{ now | toString }}"
+          - name: PR_NUM
+            value: "{{ .Values.global.env.pr_num | toString }}"
+          - name: RELEASE_NUM
+            value: "{{ .Values.global.env.release_num | toString }}"
       ports:
         - name: http
           containerPort: 3000
@@ -203,8 +208,10 @@ vehicles:
         fromValues:
           - name: TIMESTAMP
             value: "{{ now | toString }}"
-          - name: VEHICLES_PR_NUM
-            value: '{{.Values.global.pr_num}}'
+          - name: PR_NUM
+            value: "{{ .Values.global.env.pr_num | toString }}"
+          - name: RELEASE_NUM
+            value: "{{ .Values.global.env.release_num | toString }}"
       ports:
         - name: vehicles-api
           containerPort: 5000
@@ -340,10 +347,12 @@ dops:
           - name: ACCESS_API_URL
             key: ACCESS_API_URL
         fromValues:
-          - name: DOPS_PR_NUM
-            value: '{{.Values.global.pr_num}}'
           - name: TIMESTAMP
             value: "{{ now | toString }}"
+          - name: PR_NUM
+            value: "{{ .Values.global.env.pr_num | toString }}"
+          - name: RELEASE_NUM
+            value: "{{ .Values.global.env.release_num | toString }}"
       ports:
         - name: dops-api
           containerPort: 5001
@@ -474,10 +483,12 @@ scheduler:
           - name: ACCESS_API_URL
             key: ACCESS_API_URL
         fromValues:
-          - name: SCHEDULER_PR_NUM
-            value: '{{.Values.global.pr_num}}'
           - name: TIMESTAMP
             value: "{{ now | toString }}"
+          - name: PR_NUM
+            value: "{{ .Values.global.env.pr_num | toString }}"
+          - name: RELEASE_NUM
+            value: "{{ .Values.global.env.release_num | toString }}"
       ports:
         - name: scheduler
           containerPort: 5050
@@ -581,10 +592,12 @@ policy:
           - name: FRONTEND_URL
             key: FRONTEND_URL
         fromValues:
-          - name: POLICY_PR_NUM
-            value: '{{.Values.global.pr_num}}'
           - name: TIMESTAMP
             value: "{{ now | toString }}"
+          - name: PR_NUM
+            value: "{{ .Values.global.env.pr_num | toString }}"
+          - name: RELEASE_NUM
+            value: "{{ .Values.global.env.release_num | toString }}"
       ports:
         - name: policy-api
           containerPort: 5002