diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 29d5280..92e83c3 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -56,7 +56,7 @@ jobs: oc_token: ${{ secrets.OC_TOKEN }} overwrite: ${{ matrix.overwrite }} parameters: - -p ZONE=test + -p ZONE=test -p TAG=${{ needs.vars.outputs.pr }} -p S3_SECRETKEY=${{ secrets.S3_SECRETKEY }} ${{ matrix.parameters }} verification_path: ${{ matrix.verification_path }} @@ -86,7 +86,7 @@ jobs: oc_token: ${{ secrets.OC_TOKEN }} overwrite: ${{ matrix.overwrite }} parameters: - -p ZONE=prod + -p ZONE=prod -p TAG=${{ needs.vars.outputs.pr }} -p S3_SECRETKEY=${{ secrets.S3_SECRETKEY }} ${{ matrix.parameters }} verification_path: ${{ matrix.verification_path }} diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml index 093cd2e..4c32698 100644 --- a/backend/openshift.deploy.yml +++ b/backend/openshift.deploy.yml @@ -10,6 +10,9 @@ parameters: - name: ZONE description: Deployment zone, e.g. pr-### or prod required: true + - name: TAG + description: Image tag; e.g. PR number, latest or prod + required: true - name: DOMAIN value: apps.silver.devops.gov.bc.ca - name: CPU_REQUEST @@ -113,7 +116,7 @@ objects: deployment: "${NAME}-${ZONE}-${COMPONENT}" spec: containers: - - image: ${REGISTRY}/${ORG}/${NAME}/${COMPONENT}:${ZONE} + - image: ${REGISTRY}/${ORG}/${NAME}/${COMPONENT}:${TAG} imagePullPolicy: Always name: "${NAME}" env: diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml index 12d57c5..87d5f4d 100644 --- a/frontend/openshift.deploy.yml +++ b/frontend/openshift.deploy.yml @@ -10,6 +10,9 @@ parameters: - name: ZONE description: Deployment zone, e.g. pr-### or prod required: true + - name: TAG + description: Image tag; e.g. PR number, latest or prod + required: true - name: DOMAIN value: apps.silver.devops.gov.bc.ca - name: CPU_REQUEST @@ -66,7 +69,7 @@ objects: deployment: "${NAME}-${ZONE}-${COMPONENT}" spec: containers: - - image: ${REGISTRY}/${ORG}/${NAME}/${COMPONENT}:${ZONE} + - image: ${REGISTRY}/${ORG}/${NAME}/${COMPONENT}:${TAG} securityContext: capabilities: add: ["NET_BIND_SERVICE"]