diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index 60278a1e6..8a28487da 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -31,4 +31,4 @@ jobs: --set-string global.zone='test' \ --set-string global.vault.role='nonprod' \ --set-string global.vault.zone='demo' \ - --set-string global.pr_num='${{ inputs.tag }}' \ + --set-string global.release_num='${{ inputs.tag }}' \ diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 4f50802b3..d7c372e2a 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -32,7 +32,7 @@ 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-string global.release_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"}}' \ diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index f9da84bf7..c6e6934cc 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -31,4 +31,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 }}' \ + --set-string global.release_num='${{ inputs.tag }}' \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 18b602f05..930cded79 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,7 +82,7 @@ jobs: uses: ./.github/workflows/prod.yml secrets: inherit with: - tag: ${{ needs.vars.outputs.pr }} + tag: ${{ needs.vars.outputs.release-name }} promote-images-prod: name: Promote Images - Prod diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 918bb9975..a03ca8c7b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,4 +32,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 }}' \ + --set-string global.release_num='${{ inputs.tag }}' \ diff --git a/.github/workflows/uat.yml b/.github/workflows/uat.yml index 84c7e8973..b9d8057d7 100644 --- a/.github/workflows/uat.yml +++ b/.github/workflows/uat.yml @@ -32,4 +32,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 }}' \ + --set-string global.release_num='${{ inputs.tag }}' \ diff --git a/charts/onroutebc/values.yaml b/charts/onroutebc/values.yaml index 7b71f7d7f..d8e58c7ea 100644 --- a/charts/onroutebc/values.yaml +++ b/charts/onroutebc/values.yaml @@ -34,7 +34,6 @@ 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}}" config.js.template: |- const envConfig = (() => { return { "VITE_DEPLOY_ENVIRONMENT":"$DEPLOY_ENVIRONMENT", @@ -43,7 +42,6 @@ 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", }; })(); containers: @@ -64,9 +62,9 @@ frontend: key: POLICY_URL - name: DEPLOY_ENVIRONMENT key: DEPLOY_ENVIRONMENT - - name: FRONTEND_PR_NUM - key: FRONTEND_PR_NUM fromValues: + - name: RELEASE_NUM + value: "{{.Values.global.release_num}}" - name: TIMESTAMP value: "{{ now | toString }}" ports: @@ -203,8 +201,8 @@ vehicles: fromValues: - name: TIMESTAMP value: "{{ now | toString }}" - - name: VEHICLES_PR_NUM - value: '{{.Values.global.pr_num}}' + - name: RELEASE_NUM + value: '{{.Values.global.release_num}}' ports: - name: vehicles-api containerPort: 5000 @@ -340,8 +338,8 @@ dops: - name: ACCESS_API_URL key: ACCESS_API_URL fromValues: - - name: DOPS_PR_NUM - value: '{{.Values.global.pr_num}}' + - name: RELEASE_NUM + value: '{{.Values.global.release_num}}' - name: TIMESTAMP value: "{{ now | toString }}" ports: @@ -474,8 +472,8 @@ scheduler: - name: ACCESS_API_URL key: ACCESS_API_URL fromValues: - - name: SCHEDULER_PR_NUM - value: '{{.Values.global.pr_num}}' + - name: RELEASE_NUM + value: '{{.Values.global.release_num}}' - name: TIMESTAMP value: "{{ now | toString }}" ports: @@ -581,8 +579,8 @@ policy: - name: FRONTEND_URL key: FRONTEND_URL fromValues: - - name: POLICY_PR_NUM - value: '{{.Values.global.pr_num}}' + - name: RELEASE_NUM + value: '{{.Values.global.release_num}}' - name: TIMESTAMP value: "{{ now | toString }}" ports: