feat: remove need for quotes around whitelist secret (#129)

* feat: remove need for quotes around whitelist secret * feat: deal with unexpected whitespace in template
bcgov · Jun 14, 2024 · dd9f3de · dd9f3de
1 parent 71a9f72
commit dd9f3de
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/deploy-to-openshift-dev.yml b/.github/workflows/deploy-to-openshift-dev.yml
@@ -170,7 +170,7 @@ jobs:
             -p MIN_MEM=${{ env.MIN_MEM }} \
             -p MAX_MEM=${{ env.MAX_MEM }} \
             -p ENVIRONMENT=${{ env.APP_ENVIRONMENT }} \
-            -p HAPROXY_IP_WHITELIST=${{ env.HAPROXY_IP_WHITELIST }} \
+            -p HAPROXY_IP_WHITELIST='${{ env.HAPROXY_IP_WHITELIST }}' \
             | oc apply -f -
 
           # Process update-configmap

diff --git a/.github/workflows/deploy-to-openshift-test.yml b/.github/workflows/deploy-to-openshift-test.yml
@@ -132,7 +132,7 @@ jobs:
             -p MIN_MEM=${{ env.MIN_MEM }} \
             -p MAX_MEM=${{ env.MAX_MEM }} \
             -p ENVIRONMENT=${{ env.APP_ENVIRONMENT }} \
-            -p HAPROXY_IP_WHITELIST=${{ env.HAPROXY_IP_WHITELIST }} \
+            -p HAPROXY_IP_WHITELIST='${{ env.HAPROXY_IP_WHITELIST }}' \
             | oc apply -f -
 
           # Process update-configmap

diff --git a/.github/workflows/deploy-to-openshift-uat.yml b/.github/workflows/deploy-to-openshift-uat.yml
@@ -136,7 +136,7 @@ jobs:
             -p MIN_MEM=${{ env.MIN_MEM }} \
             -p MAX_MEM=${{ env.MAX_MEM }} \
             -p ENVIRONMENT=${{ env.APP_ENVIRONMENT }} \
-            -p HAPROXY_IP_WHITELIST=${{ env.HAPROXY_IP_WHITELIST }} \
+            -p HAPROXY_IP_WHITELIST='${{ env.HAPROXY_IP_WHITELIST }}' \
             | oc apply -f -
 
           # Process update-configmap

diff --git a/tools/openshift/d365api.dc.yaml b/tools/openshift/d365api.dc.yaml
@@ -121,7 +121,8 @@ objects:
         app: '${APP_NAME}-${BRANCH}'
       annotations:
         openshift.io/host.generated: 'true'
-        haproxy.router.openshift.io/ip_whitelist: '${HAPROXY_IP_WHITELIST}'
+        haproxy.router.openshift.io/ip_whitelist: >-
+          '${HAPROXY_IP_WHITELIST}'
     spec:
       to:
         kind: Service