Skip to content

Commit

Permalink
PI-2302 Fix deployment following change to IP allow lists variable (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
marcus-bcl authored Aug 9, 2024
1 parent 611a113 commit 566373f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
7 changes: 5 additions & 2 deletions .github/actions/cloud-platform-deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ inputs:
token:
description: The KUBE_TOKEN
required: true
ip-allowlists:
description: The HMPPS IP allow list groups to apply, in base64-encoded YAML format
required: true

runs:
using: composite
Expand Down Expand Up @@ -79,7 +82,7 @@ runs:
--set "generic-service.env.BUILD_INFO=$([ -r "$BUILD_INFO" ] && cat "$BUILD_INFO" | base64 -w0 || echo)" \
--set "generic-service.env.GIT_INFO=$([ -r "$GIT_INFO" ] && cat "$GIT_INFO" | base64 -w0 || echo)" \
--timeout 10m \
--values <(echo "$HMPPS_IP_ALLOWLIST_GROUPS_YAML" | base64 -d) \
--values <(echo "$IP_ALLOWLISTS" | base64 -d) \
--values templates/helm-defaults.yml \
--values 'projects/${{ inputs.project }}/deploy/values.yaml' \
--values 'projects/${{ inputs.project }}/deploy/${{ steps.env.outputs.values-file }}' \
Expand All @@ -95,5 +98,5 @@ runs:
env:
BUILD_INFO: projects/${{ inputs.project }}/build-info.properties
GIT_INFO: projects/${{ inputs.project }}/git.properties
HMPPS_IP_ALLOWLIST_GROUPS_YAML: ${{ vars.HMPPS_IP_ALLOWLIST_GROUPS_YAML }}
IP_ALLOWLISTS: ${{ inputs.ip-allowlists }}
MAX_ATTEMPTS: '3'
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ jobs:
cluster: ${{ secrets.KUBE_CLUSTER }}
namespace: ${{ secrets.KUBE_NAMESPACE }}
token: ${{ secrets.KUBE_TOKEN }}
ip-allowlists: ${{ vars.HMPPS_IP_ALLOWLIST_GROUPS_YAML }}

- uses: docker/login-action@v3
if: ${{ steps.check_files.outputs.files_exists == 'true' && steps.enabled.outputs.enabled == 'true' }}
Expand Down

0 comments on commit 566373f

Please sign in to comment.