diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 4f50802b3..f3ff2153b 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -9,6 +9,11 @@ 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: @@ -16,6 +21,11 @@ on: 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) @@ -38,3 +48,4 @@ jobs: --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 index 6cbc6d44f..01f8c0d09 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -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/pr-open.yml b/.github/workflows/pr-open.yml index 0823f5c9f..4fe5a6b84 100644 --- 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/release.yml b/.github/workflows/release.yml index 94005435b..34c5c6100 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,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-name }}' \ promote-images-uat: name: Promote Images - Uat @@ -83,6 +86,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-name }}' \ promote-images-prod: name: Promote Images - Prod diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml index 7b71f7d7f..41e87727c 100644 --- 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