Fix: prod parameters deployment and promote (#133)

* fix: prod deployment * fix: promote variable and environments
bcgov · Nov 7, 2023 · 0fef5bc · 0fef5bc
1 parent 02f8224
commit 0fef5bc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -63,14 +63,11 @@ jobs:
         include:
           - name: database
           - name: backend
-            parameters:
-              -p PROMOTE=${{ github.repository }}/backend:test
             verification_path: "actuator/health"
           - name: frontend
             parameters:
               -p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
               -p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
-              -p PROMOTE=${{ github.repository }}/frontend:test
     steps:
       - uses: bcgov-nr/[email protected]
         with:
@@ -116,8 +113,6 @@ jobs:
         include:
           - name: database
           - name: backend
-            parameters:
-              -p PROMOTE=${{ github.repository }}/backend:test
             verification_path: "actuator/health"
           - name: frontend
             parameters:

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -97,7 +97,6 @@ jobs:
             triggers: ('common/' 'database/' 'backend/' 'frontend/')
             verification_path: /actuator/health
             parameters:
-              -p PROMOTE=${{ github.repository }}/backend:${{ github.event.number }}
               -p MIN_REPLICAS=1
               -p MAX_REPLICAS=2
           - name: frontend
@@ -106,7 +105,6 @@ jobs:
             parameters:
               -p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
               -p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
-              -p PROMOTE=${{ github.repository }}/frontend:${{ github.event.number }}
               -p MIN_REPLICAS=1
               -p MAX_REPLICAS=2
     steps:

diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
@@ -35,9 +35,6 @@ parameters:
   - name: ORG_NAME
     description: Organization name, e.g. bcgov
     value: bcgov
-  - name: PROMOTE
-    description: Image (namespace/name:tag) to promote/import
-    value: bcgov/quickstart-openshift-backends/backend:test
   - name: DB_POOL_CONN_TIMEOUT
     description: Maximum number of milliseconds that a client will wait for a connection from the pool.
     value: "90000"
@@ -61,7 +58,7 @@ objects:
         - name: "${IMAGE_TAG}"
           from:
             kind: DockerImage
-            name: "${REGISTRY}/${PROMOTE}"
+            name: ${REGISTRY}/${ORG_NAME}/${NAME}/${COMPONENT}:${ZONE}
           referencePolicy:
             type: Local
   - apiVersion: v1

diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
@@ -10,6 +10,9 @@ parameters:
   - name: COMPONENT
     description: Component name
     value: frontend
+  - name: ORG_NAME
+    description: Organization name
+    value: bcgov
   - name: ZONE
     description: Deployment zone, e.g. pr-### or prod
     required: true
@@ -35,9 +38,6 @@ parameters:
   - name: REGISTRY
     description: Container registry to import from (internal is image-registry.openshift-image-registry.svc:5000)
     value: ghcr.io
-  - name: PROMOTE
-    description: Image (namespace/name:tag) to promote/import
-    value: bcgov/nr-silva/frontend:prod
   - name: LOG_LEVEL
     description: Caddy logging level DEBUG, INFO, WARN, ERROR, PANIC, and FATAL (https://github.com/caddyserver/caddy/blob/master/logging.go)
     value: "info"
@@ -63,7 +63,7 @@ objects:
         - name: ${IMAGE_TAG}
           from:
             kind: DockerImage
-            name: ${REGISTRY}/${PROMOTE}
+            name: ${REGISTRY}/${ORG_NAME}/${NAME}/${COMPONENT}:${ZONE}
           referencePolicy:
             type: Local
   - apiVersion: v1