routedevops

.github/workflows/build-n-deploy-backend-to-ocp-dev.yml

@@ -40,7 +40,7 @@ env:
   MIN_MEM: "200Mi"
   MAX_MEM: "250Mi"
   # SITE_URL should have no scheme or port. It will be prepended with https://
-
+  HOST_ROUTE: ${{ secrets.SITE_URL }}
 on:
   workflow_dispatch:
 
@@ -50,8 +50,6 @@ jobs:
     # ubuntu-latest can also be used.
     runs-on: ubuntu-22.04
     environment: dev
-    env:
-      HOST_ROUTE: ${{ secrets.SITE_URL }}
     outputs:
       ROUTE: ${{ steps.deploy-and-expose.outputs.route }}
       SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}
@@ -193,7 +191,7 @@ jobs:
           oc process -f tools/openshift/frontend-static.dc.yaml -p APP_NAME=${{ env.APP_NAME }} -p REPO_NAME=${{ env.REPO_NAME }} -p BRANCH=${{ env.BRANCH }} -p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE }} -p TAG=${{ env.TAG }} -p MIN_REPLICAS=${{ env.MIN_REPLICAS }} -p MAX_REPLICAS=${{ env.MAX_REPLICAS }} -p MIN_CPU=${{ env.MIN_CPU }} -p MAX_CPU=${{ env.MAX_CPU }} -p MIN_MEM=${{ env.MIN_MEM }} -p MAX_MEM=${{ env.MAX_MEM }} -p HOST_ROUTE=${{ env.HOST_ROUTE }} -p CA_CERT="${{ env.CA_CERT }}" -p CERTIFICATE="${{ env.CERTIFICATE }}" -p PRIVATE_KEY="${{ env.PRIVATE_KEY }}"\
           | oc apply -f -
 
-          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/main/tools/config/update-configmap.sh | bash /dev/stdin dev ${{ env.APP_NAME }} ${{ env.NAMESPACE }} ${{env.COMMON_NAMESPACE}} ${{secrets.KC_CLIENT_ID}} ${{secrets.KC_CLIENT_SECRET}} ${{secrets.KC_TOKEN_URL}} ${{secrets.CLEAR_FILES_KEY}}
+          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/main/tools/config/update-configmap.sh | bash /dev/stdin dev ${{ env.APP_NAME }} ${{ env.NAMESPACE }} ${{env.COMMON_NAMESPACE}} ${{secrets.KC_CLIENT_ID}} ${{secrets.KC_CLIENT_SECRET}} ${{secrets.KC_TOKEN_URL}} ${{secrets.CLEAR_FILES_KEY}} ${{ env.HOST_ROUTE}}
 
           # Start rollout (if necessary) and follow it
           oc rollout latest dc/${{ env.IMAGE_NAME }} 2> /dev/null \

tools/config/update-configmap.sh

@@ -6,6 +6,7 @@ KC_CLIENT_SECRET=$5
 KC_CLIENT_ID=$6
 KC_TOKEN_URL=$7
 CLEAR_FILES_KEY=$8
+HOST_ROUTE=$9
 
 
 APP_NAME_UPPER=${APP_NAME^^}
@@ -14,8 +15,8 @@ TZVALUE="America/Vancouver"
 SOAM_KC_REALM_ID="master"
 SOAM_KC=soam-$envValue.apps.silver.devops.gov.bc.ca
 siteMinderLogoutUrl=""
-HOST_ROUTE="educ-sdci-${OPENSHIFT_NAMESPACE}-${envValue}.apps.silver.devops.gov.bc.ca"
-SERVER_FRONTEND="https://educ-sdci-${OPENSHIFT_NAMESPACE}-${envValue}.apps.silver.devops.gov.bc.ca"
+HOST_ROUTE="${HOST_ROUTE}"
+SERVER_FRONTEND="https://${HOST_ROUTE}"
 
 if [ "$envValue" = "dev" ]
 then

tools/openshift/frontend-static.dc.yaml

@@ -127,9 +127,9 @@ objects:
         openshift.io/host.generated: "true"
       labels:
         app: "${APP_NAME}-${BRANCH}"
-      name: "www.${APP_NAME}-frontend-${BRANCH}"
+      name: "dev.${APP_NAME}-frontend-${BRANCH}"
     spec:
-      host: "www.${HOST_ROUTE}"
+      host: "${HOST_ROUTE}"
       port:
         targetPort: 2015-tcp
       tls: