From dd9f3dea2b4e6a5fdd696e05993f9a0689273f04 Mon Sep 17 00:00:00 2001 From: Trev Date: Fri, 14 Jun 2024 08:44:08 -0700 Subject: [PATCH] feat: remove need for quotes around whitelist secret (#129) * feat: remove need for quotes around whitelist secret * feat: deal with unexpected whitespace in template --- .github/workflows/deploy-to-openshift-dev.yml | 2 +- .github/workflows/deploy-to-openshift-test.yml | 2 +- .github/workflows/deploy-to-openshift-uat.yml | 2 +- tools/openshift/d365api.dc.yaml | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-to-openshift-dev.yml b/.github/workflows/deploy-to-openshift-dev.yml index 5305a8c6..d21deb08 100644 --- 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 index 55ba3c66..5cabb146 100644 --- 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 index 4bade8b0..530a52e5 100644 --- 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 index 908bfb13..e1671b32 100644 --- 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