feat: Adding pr to env vars (#1382)

Co-authored-by: Krishnan Subramanian <[email protected]> Co-authored-by: Krishnan Subramanian <[email protected]>
bcgov · May 22, 2024 · 03676a8 · 03676a8
1 parent 343974c
commit 03676a8
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 47 deletions.
diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
@@ -36,5 +36,9 @@ jobs:
       environment: ${{inputs.environment}}
       tag: "test"
       release: "demo"
-      vault_role: "nonprod"
-      vault_zone: "staging"
+      params: |
+        --set-string global.license='c28f0c' \
+        --set-string global.zone='test' \
+        --set-string global.vault.role='nonprod' \
+        --set-string global.vault.zone='staging' \
+        --set-string global.pr_num='${{ needs.vars.outputs.pr }}' \
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -14,7 +14,6 @@ on:
         required: false
         type: string
         default: "onroutebc"
-
       ### Typical / recommended
       autoscaling:
         description: 'Autoscaling enabled or not for the deployments'
@@ -31,21 +30,6 @@ on:
         required: false
         type: string
         default: ${{ github.event.number }}
-      license:
-        description: 'BC Gov LICENSE_PLATE of deployment env'
-        required: false
-        type: string
-        default: "c28f0c"
-      vault_role:
-        description: "nonprod/prod"
-        required: true
-        type: string
-        default: "nonprod"
-      vault_zone:
-        description: "secret zone"
-        required: true
-        type: string
-        default: "dev"
       triggers:
         description: Paths to trigger a deploy; omit=always; e.g. ('backend/' 'frontend/')
         required: false
@@ -89,6 +73,11 @@ on:
         default: "onroutebc"
 
       ### Typical / recommended
+      autoscaling:
+        description: 'Autoscaling enabled or not for the deployments'
+        required: false
+        type: boolean
+        default: true
       environment:
         description: "Deployment environment - dev/test/prod"
         required: true
@@ -100,22 +89,6 @@ on:
         required: false
         type: string
         default: "latest"
-      license:
-        description: 'BC Gov LICENSE_PLATE of deployment env'
-        required: false
-        type: string
-        default: "c28f0c"
-      vault_role:
-        description: "nonprod/prod"
-        required: true
-        type: choice
-        options: ["nonprod","prod"]
-      vault_zone:
-        description: "secret zone"
-        required: true
-        type: string
-        default: "dev"
-
       ### Usually a bad idea / not recommended
       directory:
         description: 'Chart directory.'
@@ -202,10 +175,6 @@ jobs:
             --set global.autoscaling=${{ inputs.autoscaling }} \
             --set-string global.repository=${{ github.repository }} \
             --set-string global.tag=${{ inputs.tag }} \
-            --set-string global.license=${{ inputs.license }} \
-            --set-string global.zone=${{ inputs.environment }} \
-            --set-string global.vault.role=${{ inputs.vault_role }} \
-            --set-string global.vault.zone=${{ inputs.vault_zone }} \
             --install --wait --atomic ${{ env.repo_release }} \
             --timeout 10m --force \
             --values ${{ inputs.values }} \

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -43,8 +43,12 @@ jobs:
       environment: test
       release: test
       tag: ${{ needs.vars.outputs.pr }}
-      vault_role: nonprod
-      vault_zone: test
+      params: |
+        --set-string global.license='c28f0c' \
+        --set-string global.zone='test' \
+        --set-string global.vault.role='nonprod' \
+        --set-string global.vault.zone='test' \
+        --set-string global.pr_num='${{ needs.vars.outputs.pr }}' \
 
 
   promote-images-test:
@@ -75,8 +79,11 @@ jobs:
       environment: prod
       tag: ${{ needs.vars.outputs.pr }}
       release: prod
-      vault_role: prod
-      vault_zone: prod
+        --set-string global.license='c28f0c' \
+        --set-string global.zone='prod' \
+        --set-string global.vault.role='prod' \
+        --set-string global.vault.zone='prod' \
+        --set-string global.pr_num='${{ needs.vars.outputs.pr }}' \
 
   promote-images-prod:
     name: Promote Images - Prod

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -85,9 +85,12 @@ jobs:
       release: ${{ needs.vars.outputs.pr }}
       tag: ${{ needs.vars.outputs.pr }}
       triggers: '' #omit=always;
-      vault_role: nonprod
-      vault_zone: dev
       params: |
+        --set-string global.license='c28f0c' \
+        --set-string global.zone='dev' \
+        --set-string global.vault.role='nonprod' \
+        --set-string global.vault.zone='dev' \
+        --set-string global.pr_num='${{ needs.vars.outputs.pr }}' \
         --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"}}' \

diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml
@@ -32,13 +32,13 @@ frontend:
     enabled: true
     data:
       config.js: |-
-        const envConfig = (() => {
-          return {
+        const envConfig = (() => { return {
             "VITE_DEPLOY_ENVIRONMENT":"{{.Values.global.zone}}",
             "VITE_API_VEHICLE_URL":"https://{{.Release.Name}}-vehicles.{{.Values.global.domain}}",
             "VITE_KEYCLOAK_ISSUER_URL":"https://{{ternary ("") (printf "%s." .Values.global.zone) (contains "prod" .Values.global.zone)}}loginproxy.gov.bc.ca/auth/realms/standard",
             "VITE_KEYCLOAK_AUDIENCE":"on-route-bc-direct-4598",
             "VITE_SITEMINDER_LOG_OFF_URL": "https://logon{{ternary ("") ("test") (contains "prod" .Values.global.zone)}}7.gov.bc.ca/clp-cgi/logoff.cgi",
+            "VITE_FRONTEND_PR_NUM":"{{.Values.global.pr_num}}",
           };
         })();
   containers:
@@ -47,6 +47,10 @@ frontend:
       repository: '{{ .Values.global.repository }}' # example, it includes registry and repository
       image: frontend
       tag: "{{tpl .Values.global.tag .}}"
+      env: 
+        fromValues:
+          - name: VITE_FRONTEND_PR_NUM
+            value: '{{.Values.global.pr_num}}'
       ports:
         - name: http
           containerPort: 3000
@@ -156,6 +160,9 @@ vehicles:
             key: ACCESS_API_URL
           - name: PAYBC_REDIRECT
             key: PAYBC_REDIRECT
+        fromValues:
+          - name: VEHICLES_PR_NUM
+            value: '{{.Values.global.pr_num}}'
       ports:
         - name: vehicles-api
           containerPort: 5000
@@ -288,6 +295,9 @@ dops:
             key: FRONTEND_URL
           - name: ACCESS_API_URL
             key: ACCESS_API_URL
+        fromValues:
+          - name: DOPS_PR_NUM
+            value: '{{.Values.global.pr_num}}'
       ports:
         - name: dops-api
           containerPort: 5001
@@ -410,6 +420,10 @@ scheduler:
       repository: '{{ .Values.global.repository }}' # example, it includes registry and repository
       image: scheduler
       tag: "{{tpl .Values.global.tag .}}"
+      env: 
+        fromValues:
+          - name: SCHEDULER_PR_NUM
+            value: '{{.Values.global.pr_num}}'
       ports:
         - name: scheduler
           containerPort: 5050

diff --git a/frontend/public/config.js b/frontend/public/config.js
@@ -20,6 +20,7 @@ const envConfig = (() => {
     VITE_API_VEHICLE_URL: "http://localhost:5000",
     VITE_KEYCLOAK_ISSUER_URL: "",
     VITE_KEYCLOAK_AUDIENCE: "",
-    VITE_SITEMINDER_LOG_OFF_URL: ""
+    VITE_SITEMINDER_LOG_OFF_URL: "",
+    VITE_FRONTEND_PR_NUM: ""
   };
 })();