Update Actions

Update Actions

.github/workflows/deploy_prod.yml

@@ -4,33 +4,33 @@ env:
   # 🖊️ EDIT your repository secrets to log into your OpenShift cluster and set up the context.
   # See https://github.com/redhat-actions/oc-login#readme for how to retrieve these values.
   # To get a permanent token, refer to https://github.com/redhat-actions/oc-login/wiki/Using-a-Service-Account-for-GitHub-Actions
-  OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }}
+  OPENSHIFT_SERVER: ${{ vars.OPENSHIFT_SERVER }}
   OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
-  OPENSHIFT_NAMESPACE: ${{ secrets.GRAD_NAMESPACE }}-prod
+  OPENSHIFT_NAMESPACE: ${{ vars.GRAD_NAMESPACE }}-test
+  COMMON_NAMESPACE: ${{ vars.COMMON_NAMESPACE }}
+  BUSINESS_NAMESPACE: ${{ vars.GRAD_BUSINESS_NAMESPACE }}
 
-  SPRING_BOOT_IMAGE_NAME: educ-grad-assessment-api-dc
+  SPRING_BOOT_IMAGE_NAME: educ-grad-student-api-dc
 
   REPO_NAME: "educ-grad-assessment-api"
-  APP_DOMAIN: ${{ secrets.APP_DOMAIN }}
-  NAMESPACE: ${{ secrets.GRAD_NAMESPACE }}
+  APP_DOMAIN: ${{ vars.APP_DOMAIN }}
+  GRAD_NAMESPACE: ${{ vars.GRAD_NAMESPACE }}
   TAG: "latest"
-
+  BRANCH: "main"
   MIN_CPU: "20m"
   MAX_CPU: "100m"
   MIN_MEM: "250Mi"
   MAX_MEM: "1024Mi"
   MIN_REPLICAS: "3"
   MAX_REPLICAS: "5"
 
-
 on:
   # https://docs.github.com/en/actions/reference/events-that-trigger-workflows
   workflow_dispatch:
 
 jobs:
   deploy-to-openshift-prod:
     name: Deploy to OpenShift PROD
-    # ubuntu-20.04 can also be used.
     runs-on: ubuntu-20.04
     environment: prod
 
@@ -73,11 +73,13 @@ jobs:
           -p MIN_MEM=${{ env.MIN_MEM }} -p MAX_MEM=${{ env.MAX_MEM }} | oc apply -f -
           
           # UPDATE Configmaps
-          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/main/tools/config/update-configmap.sh \
+          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/${{ env.BRANCH }}/tools/config/update-configmap.sh \
           | bash /dev/stdin \
           prod \
           ${{ env.REPO_NAME }} \
-          ${{ env.NAMESPACE }} \
+          ${{ env.GRAD_NAMESPACE }} \
+          ${{ env.COMMON_NAMESPACE }} \
+          ${{ env.BUSINESS_NAMESPACE }} \
           ${{ secrets.SPLUNK_TOKEN }} \
           ${{ vars.APP_LOG_LEVEL }}
           

.github/workflows/deploy_test.yml

@@ -4,33 +4,33 @@ env:
   # 🖊️ EDIT your repository secrets to log into your OpenShift cluster and set up the context.
   # See https://github.com/redhat-actions/oc-login#readme for how to retrieve these values.
   # To get a permanent token, refer to https://github.com/redhat-actions/oc-login/wiki/Using-a-Service-Account-for-GitHub-Actions
-  OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }}
+  OPENSHIFT_SERVER: ${{ vars.OPENSHIFT_SERVER }}
   OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
-  OPENSHIFT_NAMESPACE: ${{ secrets.GRAD_NAMESPACE }}-test
+  OPENSHIFT_NAMESPACE: ${{ vars.GRAD_NAMESPACE }}-test
+  COMMON_NAMESPACE: ${{ vars.COMMON_NAMESPACE }}
+  BUSINESS_NAMESPACE: ${{ vars.GRAD_BUSINESS_NAMESPACE }}
 
-  SPRING_BOOT_IMAGE_NAME: educ-grad-assessment-api-dc
+  SPRING_BOOT_IMAGE_NAME: educ-grad-student-api-dc
 
   REPO_NAME: "educ-grad-assessment-api"
-  APP_DOMAIN: ${{ secrets.APP_DOMAIN }}
-  NAMESPACE: ${{ secrets.GRAD_NAMESPACE }}
+  APP_DOMAIN: ${{ vars.APP_DOMAIN }}
+  GRAD_NAMESPACE: ${{ vars.GRAD_NAMESPACE }}
   TAG: "latest"
-
+  BRANCH: "main"
   MIN_CPU: "20m"
   MAX_CPU: "100m"
   MIN_MEM: "250Mi"
   MAX_MEM: "1024Mi"
   MIN_REPLICAS: "3"
   MAX_REPLICAS: "5"
 
-
 on:
   # https://docs.github.com/en/actions/reference/events-that-trigger-workflows
   workflow_dispatch:
 
 jobs:
   deploy-to-openshift-test:
     name: Deploy to OpenShift TEST
-    # ubuntu-20.04 can also be used.
     runs-on: ubuntu-20.04
     environment: test
 
@@ -63,8 +63,8 @@ jobs:
           oc rollout cancel dc/${{ env.SPRING_BOOT_IMAGE_NAME }} 2> /dev/null \
           || true && echo "No rollout in progress"
           
-          oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}:${{ steps.get-latest-tag.outputs.tag }} \
-          ${{ env.NAMESPACE }}-test/${{ env.REPO_NAME }}:${{ steps.get-latest-tag.outputs.tag }}
+          oc tag ${{ env.GRAD_NAMESPACE }}-dev/${{ env.REPO_NAME }}:${{ steps.get-latest-tag.outputs.tag }} \
+          ${{ env.GRAD_NAMESPACE }}-test/${{ env.REPO_NAME }}:${{ steps.get-latest-tag.outputs.tag }}
           
           # Process and apply deployment template
           oc process -f tools/openshift/api.dc.yaml -p IS_NAMESPACE=${{ env.OPENSHIFT_NAMESPACE }} -p REPO_NAME=${{ env.REPO_NAME }} \
@@ -73,11 +73,13 @@ jobs:
           -p MIN_MEM=${{ env.MIN_MEM }} -p MAX_MEM=${{ env.MAX_MEM }} | oc apply -f -
           
           # UPDATE Configmaps
-          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/main/tools/config/update-configmap.sh \
+          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/${{ env.BRANCH }}/tools/config/update-configmap.sh \
           | bash /dev/stdin \
           test \
           ${{ env.REPO_NAME }} \
-          ${{ env.NAMESPACE }} \
+          ${{ env.GRAD_NAMESPACE }} \
+          ${{ env.COMMON_NAMESPACE }} \
+          ${{ env.BUSINESS_NAMESPACE }} \
           ${{ secrets.SPLUNK_TOKEN }} \
           ${{ vars.APP_LOG_LEVEL }}
           

tools/config/update-configmap.sh

@@ -53,8 +53,8 @@ echo Creating config map "$APP_NAME"-config-map
 oc create -n "$GRAD_NAMESPACE"-"$envValue" configmap "$APP_NAME"-config-map \
   --from-literal=APP_LOG_LEVEL="$APP_LOG_LEVEL" \
   --from-literal=ENABLE_FLYWAY="true" \
- --from-literal=GRAD_PROGRAM_API="http://educ-grad-program-api.$OPENSHIFT_NAMESPACE-$envValue.svc.cluster.local:8080/" \
- --from-literal=GRAD_TRAX_API="http://educ-grad-trax-api.$OPENSHIFT_NAMESPACE-$envValue.svc.cluster.local:8080/" \
+ --from-literal=GRAD_PROGRAM_API="http://educ-grad-program-api.$GRAD_NAMESPACE.svc.cluster.local:8080/" \
+ --from-literal=GRAD_TRAX_API="http://educ-grad-trax-api.$GRAD_NAMESPACE.svc.cluster.local:8080/" \
   --dry-run=client -o yaml | oc apply -f -
 echo