Fixed naming issues.

Removed IP whitelist for now.
bcgov · Oct 17, 2023 · ea6087e · ea6087e
1 parent 8704815
commit ea6087e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/deploy-to-openshift-dev.yml b/.github/workflows/deploy-to-openshift-dev.yml
@@ -144,13 +144,13 @@ jobs:
           oc login --token=${{ env.OPENSHIFT_TOKEN }} --server=${{ env.OPENSHIFT_SERVER }}
           oc project ${{ env.OPENSHIFT_NAMESPACE }}
           # Cancel any rollouts in progress
-          oc rollout cancel dc/${{ env.APP_NAME }}-${{ env.APP_NAME_BACKEND }}-${{ env.BRANCH }} 2> /dev/null \
+          oc rollout cancel dc/${{ env.APP_NAME }}-${{ env.APP_NAME_BACKEND }} 2> /dev/null \
           || true && echo "No rollout in progress"
 
           # Create the image stream if it doesn't exist
-          oc create imagestream ${{ env.REPO_NAME }}-${{ env.APP_NAME_BACKEND }}-${{ env.BRANCH }} 2> /dev/null || true && echo "Backend image stream in place"
+          oc create imagestream ${{ env.IMAGE_NAME }}  2> /dev/null || true && echo "D365 API image stream in place"
 
-          oc tag ${{ steps.push-image-backend.outputs.registry-path }} ${{ env.REPO_NAME }}-${{ env.APP_NAME_BACKEND }}-${{ env.BRANCH }}:${{ env.TAG }}
+          oc tag ${{ steps.push-image-backend.outputs.registry-path }} ${{ env.IMAGE_NAME }}:${{ env.TAG }}
 
           # Process and apply deployment template
           oc process -f tools/openshift/d365api.dc.yaml -p APP_NAME=${{ env.APP_NAME }} -p REPO_NAME=${{ env.REPO_NAME }} -p BRANCH=${{ env.BRANCH }} \

diff --git a/tools/openshift/d365api.dc.yaml b/tools/openshift/d365api.dc.yaml
@@ -121,10 +121,10 @@ objects:
         app: '${APP_NAME}-${BRANCH}'
       annotations:
         openshift.io/host.generated: 'true'
-        haproxy.router.openshift.io/ip_whitelist: >-
-          204.107.153.66 52.242.36.40 40.85.206.95 52.237.24.126 
-          52.242.35.152 40.82.184.43 40.82.184.6 40.69.106.240/28 40.69.111.0/27 13.71.170.208/28
-          13.71.175.160/27 20.48.200.192/27 20.48.200.224/28 52.139.111.0/27 52.139.111.32/28
+        # haproxy.router.openshift.io/ip_whitelist: >-
+        #   204.107.153.66 52.242.36.40 40.85.206.95 52.237.24.126
+        #   52.242.35.152 40.82.184.43 40.82.184.6 40.69.106.240/28 40.69.111.0/27 13.71.170.208/28
+        #   13.71.175.160/27 20.48.200.192/27 20.48.200.224/28 52.139.111.0/27 52.139.111.32/28
     spec:
       to:
         kind: Service