Pass pr number as TAG

bcgov · Oct 8, 2024 · 44fa4f7 · 44fa4f7
1 parent e2ef5b0
commit 44fa4f7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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"]