From b977009116bcb687f41c068265e73e09a6039238 Mon Sep 17 00:00:00 2001 From: Marcus Aspin Date: Thu, 2 Nov 2023 15:03:15 +0000 Subject: [PATCH] PI-1613 Switch to IP allowlist groups --- .../actions/cloud-platform-deploy/action.yml | 8 ++++++- .github/workflows/deploy.yml | 1 + .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- projects/arns-and-delius/deploy/Chart.yaml | 4 ++-- projects/cas3-and-delius/deploy/Chart.yaml | 4 ++-- .../court-case-and-delius/deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- projects/dps-and-delius/deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/values.yaml | 22 +++---------------- .../external-api-and-delius/deploy/Chart.yaml | 4 ++-- .../hmpps-auth-and-delius/deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- projects/opd-and-delius/deploy/Chart.yaml | 4 ++-- .../pathfinder-and-delius/deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../sentence-plan-and-oasys/deploy/Chart.yaml | 4 ++-- projects/soc-and-delius/deploy/Chart.yaml | 4 ++-- projects/tier-to-delius/deploy/Chart.yaml | 4 ++-- .../unpaid-work-and-delius/deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- templates/helm-defaults.yml | 22 +++---------------- .../api-client-and-server/deploy/Chart.yaml | 4 ++-- .../projects/api-server/deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../deploy/Chart.yaml | 4 ++-- .../message-listener/deploy/Chart.yaml | 4 ++-- tools/feature-flags/deploy/Chart.yaml | 4 ++-- tools/feature-flags/deploy/values.yaml | 22 +++---------------- 43 files changed, 93 insertions(+), 134 deletions(-) diff --git a/.github/actions/cloud-platform-deploy/action.yml b/.github/actions/cloud-platform-deploy/action.yml index a5ba6083a3..2331c071fd 100644 --- a/.github/actions/cloud-platform-deploy/action.yml +++ b/.github/actions/cloud-platform-deploy/action.yml @@ -26,6 +26,9 @@ inputs: token: description: The KUBE_TOKEN required: true + github_token: + description: A GitHub token, to pull the IP allow list groups + required: true runs: using: composite @@ -64,7 +67,10 @@ runs: --set 'generic-service.image.tag=${{ inputs.version }}' \ --set 'version=${{ inputs.version }}' \ --timeout 10m \ + --values <(curl "$(gh api '/repos/ministryofjustice/hmpps-ip-allowlists/contents/ip-allowlist-groups.yaml' | jq -r '.download_url')") \ --values templates/helm-defaults.yml \ --values 'projects/${{ inputs.project }}/deploy/values.yaml' \ --values 'projects/${{ inputs.project }}/deploy/${{ steps.env.outputs.values-file }}' \ - --wait \ No newline at end of file + --wait + env: + GITHUB_TOKEN: ${{ inputs.github_token }} \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 07ba6469e1..37c1f137d1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -114,6 +114,7 @@ jobs: cluster: ${{ secrets.KUBE_CLUSTER }} namespace: ${{ secrets.KUBE_NAMESPACE }} token: ${{ secrets.KUBE_TOKEN }} + github_token: ${{ secrets.BOT_GITHUB_EXTERNAL_REPOS_TOKEN }} - uses: docker/login-action@v3 if: ${{ steps.check_files.outputs.files_exists == 'true' && steps.enabled.outputs.enabled == 'true' }} diff --git a/projects/approved-premises-and-delius/deploy/Chart.yaml b/projects/approved-premises-and-delius/deploy/Chart.yaml index a479a6ba4f..3683ec4c07 100644 --- a/projects/approved-premises-and-delius/deploy/Chart.yaml +++ b/projects/approved-premises-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/approved-premises-and-oasys/deploy/Chart.yaml b/projects/approved-premises-and-oasys/deploy/Chart.yaml index e89d15ca20..ad07eabcd7 100644 --- a/projects/approved-premises-and-oasys/deploy/Chart.yaml +++ b/projects/approved-premises-and-oasys/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/arns-and-delius/deploy/Chart.yaml b/projects/arns-and-delius/deploy/Chart.yaml index bc63626308..54a98d6f37 100644 --- a/projects/arns-and-delius/deploy/Chart.yaml +++ b/projects/arns-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/cas3-and-delius/deploy/Chart.yaml b/projects/cas3-and-delius/deploy/Chart.yaml index c3805bdccc..3a13a44b7b 100644 --- a/projects/cas3-and-delius/deploy/Chart.yaml +++ b/projects/cas3-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/court-case-and-delius/deploy/Chart.yaml b/projects/court-case-and-delius/deploy/Chart.yaml index 748c518f77..6178774379 100644 --- a/projects/court-case-and-delius/deploy/Chart.yaml +++ b/projects/court-case-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/create-and-vary-a-licence-and-delius/deploy/Chart.yaml b/projects/create-and-vary-a-licence-and-delius/deploy/Chart.yaml index e0c55671fb..fff79fbc95 100644 --- a/projects/create-and-vary-a-licence-and-delius/deploy/Chart.yaml +++ b/projects/create-and-vary-a-licence-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/custody-key-dates-and-delius/deploy/Chart.yaml b/projects/custody-key-dates-and-delius/deploy/Chart.yaml index 21b81e292a..a65840d7bf 100644 --- a/projects/custody-key-dates-and-delius/deploy/Chart.yaml +++ b/projects/custody-key-dates-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/domain-events-and-delius/deploy/Chart.yaml b/projects/domain-events-and-delius/deploy/Chart.yaml index a9ce44fde8..3fd228bde9 100644 --- a/projects/domain-events-and-delius/deploy/Chart.yaml +++ b/projects/domain-events-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/dps-and-delius/deploy/Chart.yaml b/projects/dps-and-delius/deploy/Chart.yaml index 262d73cda8..b753913c13 100644 --- a/projects/dps-and-delius/deploy/Chart.yaml +++ b/projects/dps-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/effective-proposal-framework-and-delius/deploy/Chart.yaml b/projects/effective-proposal-framework-and-delius/deploy/Chart.yaml index f928004a22..a2ee4ae740 100644 --- a/projects/effective-proposal-framework-and-delius/deploy/Chart.yaml +++ b/projects/effective-proposal-framework-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/effective-proposal-framework-and-delius/deploy/values.yaml b/projects/effective-proposal-framework-and-delius/deploy/values.yaml index f8bf9733a5..1c8c9c2a3d 100644 --- a/projects/effective-proposal-framework-and-delius/deploy/values.yaml +++ b/projects/effective-proposal-framework-and-delius/deploy/values.yaml @@ -18,25 +18,9 @@ generic-service: SENTRY_DSN: SENTRY_DSN allowlist: - office: "217.33.148.210/32" - health-kick: "35.177.252.195/32" - mojvpn: "81.134.202.29/32" - global-protect: "35.176.93.186/32" - cloudplatform-live1-1: "35.178.209.113/32" - cloudplatform-live1-2: "3.8.51.207/32" - cloudplatform-live1-3: "35.177.252.54/32" - unilink-aovpn1: "194.75.210.216/29" - unilink-aovpn2: "83.98.63.176/29" - unilink-aovpn3: "78.33.10.50/31" - unilink-aovpn4: "78.33.10.52/30" - unilink-aovpn5: "78.33.10.56/30" - unilink-aovpn6: "78.33.10.60/32" - unilink-aovpn7: "78.33.32.99/32" - unilink-aovpn8: "78.33.32.100/30" - unilink-aovpn9: "78.33.32.104/30" - unilink-aovpn10: "78.33.32.108/32" - unilink-aovpn11: "217.138.45.109/32" - unilink-aovpn12: "217.138.45.110/32" + groups: + - internal + - unilink_staff ctrl-o: "5.2.17.96/27" ctrl-o-dev: "81.187.7.168/32" diff --git a/projects/external-api-and-delius/deploy/Chart.yaml b/projects/external-api-and-delius/deploy/Chart.yaml index 6b9e40f547..bdaa52f5a5 100644 --- a/projects/external-api-and-delius/deploy/Chart.yaml +++ b/projects/external-api-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/hmpps-auth-and-delius/deploy/Chart.yaml b/projects/hmpps-auth-and-delius/deploy/Chart.yaml index a5e5be6efe..bc563a715a 100644 --- a/projects/hmpps-auth-and-delius/deploy/Chart.yaml +++ b/projects/hmpps-auth-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/make-recall-decisions-and-delius/deploy/Chart.yaml b/projects/make-recall-decisions-and-delius/deploy/Chart.yaml index 727c404487..1d8f0fb3d4 100644 --- a/projects/make-recall-decisions-and-delius/deploy/Chart.yaml +++ b/projects/make-recall-decisions-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/manage-offences-and-delius/deploy/Chart.yaml b/projects/manage-offences-and-delius/deploy/Chart.yaml index 5bb77c2ca3..2f50202651 100644 --- a/projects/manage-offences-and-delius/deploy/Chart.yaml +++ b/projects/manage-offences-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/manage-pom-cases-and-delius/deploy/Chart.yaml b/projects/manage-pom-cases-and-delius/deploy/Chart.yaml index 98bf253d3b..4b5dfaabde 100644 --- a/projects/manage-pom-cases-and-delius/deploy/Chart.yaml +++ b/projects/manage-pom-cases-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/offender-events-and-delius/deploy/Chart.yaml b/projects/offender-events-and-delius/deploy/Chart.yaml index 977c2c5289..854c991a66 100644 --- a/projects/offender-events-and-delius/deploy/Chart.yaml +++ b/projects/offender-events-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/opd-and-delius/deploy/Chart.yaml b/projects/opd-and-delius/deploy/Chart.yaml index 7dfef2ee33..3340159b19 100644 --- a/projects/opd-and-delius/deploy/Chart.yaml +++ b/projects/opd-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/pathfinder-and-delius/deploy/Chart.yaml b/projects/pathfinder-and-delius/deploy/Chart.yaml index 627b5a13af..ddbf30d300 100644 --- a/projects/pathfinder-and-delius/deploy/Chart.yaml +++ b/projects/pathfinder-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/person-search-index-from-delius/deploy/Chart.yaml b/projects/person-search-index-from-delius/deploy/Chart.yaml index 1d8c35932a..bfb14d2583 100644 --- a/projects/person-search-index-from-delius/deploy/Chart.yaml +++ b/projects/person-search-index-from-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/pre-sentence-reports-to-delius/deploy/Chart.yaml b/projects/pre-sentence-reports-to-delius/deploy/Chart.yaml index 957c074f4b..b787ef60df 100644 --- a/projects/pre-sentence-reports-to-delius/deploy/Chart.yaml +++ b/projects/pre-sentence-reports-to-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/prison-case-notes-to-probation/deploy/Chart.yaml b/projects/prison-case-notes-to-probation/deploy/Chart.yaml index 95a61253a0..322a25c28b 100644 --- a/projects/prison-case-notes-to-probation/deploy/Chart.yaml +++ b/projects/prison-case-notes-to-probation/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/prison-custody-status-to-delius/deploy/Chart.yaml b/projects/prison-custody-status-to-delius/deploy/Chart.yaml index 62bd4a9ce5..11d61dce7c 100644 --- a/projects/prison-custody-status-to-delius/deploy/Chart.yaml +++ b/projects/prison-custody-status-to-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/prison-education-and-delius/deploy/Chart.yaml b/projects/prison-education-and-delius/deploy/Chart.yaml index f791b4f60f..b371c7f577 100644 --- a/projects/prison-education-and-delius/deploy/Chart.yaml +++ b/projects/prison-education-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/refer-and-monitor-and-delius/deploy/Chart.yaml b/projects/refer-and-monitor-and-delius/deploy/Chart.yaml index 72f1e8b6ed..6de62d9dc7 100644 --- a/projects/refer-and-monitor-and-delius/deploy/Chart.yaml +++ b/projects/refer-and-monitor-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/resettlement-passport-and-delius/deploy/Chart.yaml b/projects/resettlement-passport-and-delius/deploy/Chart.yaml index c6a6d5f29c..5b026a1e25 100644 --- a/projects/resettlement-passport-and-delius/deploy/Chart.yaml +++ b/projects/resettlement-passport-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/risk-assessment-scores-to-delius/deploy/Chart.yaml b/projects/risk-assessment-scores-to-delius/deploy/Chart.yaml index 15816350f0..470a80825c 100644 --- a/projects/risk-assessment-scores-to-delius/deploy/Chart.yaml +++ b/projects/risk-assessment-scores-to-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/sentence-plan-and-delius/deploy/Chart.yaml b/projects/sentence-plan-and-delius/deploy/Chart.yaml index 32a1965be6..c0725317c9 100644 --- a/projects/sentence-plan-and-delius/deploy/Chart.yaml +++ b/projects/sentence-plan-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/sentence-plan-and-oasys/deploy/Chart.yaml b/projects/sentence-plan-and-oasys/deploy/Chart.yaml index 7ea7c62837..d2c967666c 100644 --- a/projects/sentence-plan-and-oasys/deploy/Chart.yaml +++ b/projects/sentence-plan-and-oasys/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/soc-and-delius/deploy/Chart.yaml b/projects/soc-and-delius/deploy/Chart.yaml index 22910e7a66..5d9caad1b0 100644 --- a/projects/soc-and-delius/deploy/Chart.yaml +++ b/projects/soc-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/tier-to-delius/deploy/Chart.yaml b/projects/tier-to-delius/deploy/Chart.yaml index 7c77aac050..b3328d72ec 100644 --- a/projects/tier-to-delius/deploy/Chart.yaml +++ b/projects/tier-to-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/unpaid-work-and-delius/deploy/Chart.yaml b/projects/unpaid-work-and-delius/deploy/Chart.yaml index 0f39890458..0f3ede2124 100644 --- a/projects/unpaid-work-and-delius/deploy/Chart.yaml +++ b/projects/unpaid-work-and-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/projects/workforce-allocations-to-delius/deploy/Chart.yaml b/projects/workforce-allocations-to-delius/deploy/Chart.yaml index b3f6d3a5e2..ff7eb9fd96 100644 --- a/projects/workforce-allocations-to-delius/deploy/Chart.yaml +++ b/projects/workforce-allocations-to-delius/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/templates/helm-defaults.yml b/templates/helm-defaults.yml index 495749f0e2..12718b19aa 100644 --- a/templates/helm-defaults.yml +++ b/templates/helm-defaults.yml @@ -34,25 +34,9 @@ generic-service: APPLICATIONINSIGHTS_CONNECTION_STRING: APPLICATIONINSIGHTS_CONNECTION_STRING allowlist: - office: "217.33.148.210/32" - health-kick: "35.177.252.195/32" - mojvpn: "81.134.202.29/32" - global-protect: "35.176.93.186/32" - cloudplatform-live1-1: "35.178.209.113/32" - cloudplatform-live1-2: "3.8.51.207/32" - cloudplatform-live1-3: "35.177.252.54/32" - unilink-aovpn1: "194.75.210.216/29" - unilink-aovpn2: "83.98.63.176/29" - unilink-aovpn3: "78.33.10.50/31" - unilink-aovpn4: "78.33.10.52/30" - unilink-aovpn5: "78.33.10.56/30" - unilink-aovpn6: "78.33.10.60/32" - unilink-aovpn7: "78.33.32.99/32" - unilink-aovpn8: "78.33.32.100/30" - unilink-aovpn9: "78.33.32.104/30" - unilink-aovpn10: "78.33.32.108/32" - unilink-aovpn11: "217.138.45.109/32" - unilink-aovpn12: "217.138.45.110/32" + groups: + - internal + - unilink_staff generic-prometheus-alerts: alertSeverity: probation-integration-notifications diff --git a/templates/projects/api-client-and-server/deploy/Chart.yaml b/templates/projects/api-client-and-server/deploy/Chart.yaml index dd4d8c3747..e34f82ef4b 100644 --- a/templates/projects/api-client-and-server/deploy/Chart.yaml +++ b/templates/projects/api-client-and-server/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/templates/projects/api-server/deploy/Chart.yaml b/templates/projects/api-server/deploy/Chart.yaml index dd4d8c3747..e34f82ef4b 100644 --- a/templates/projects/api-server/deploy/Chart.yaml +++ b/templates/projects/api-server/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/templates/projects/message-listener-with-api-client-and-server/deploy/Chart.yaml b/templates/projects/message-listener-with-api-client-and-server/deploy/Chart.yaml index dd4d8c3747..e34f82ef4b 100644 --- a/templates/projects/message-listener-with-api-client-and-server/deploy/Chart.yaml +++ b/templates/projects/message-listener-with-api-client-and-server/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/templates/projects/message-listener-with-api-client/deploy/Chart.yaml b/templates/projects/message-listener-with-api-client/deploy/Chart.yaml index dd4d8c3747..e34f82ef4b 100644 --- a/templates/projects/message-listener-with-api-client/deploy/Chart.yaml +++ b/templates/projects/message-listener-with-api-client/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/templates/projects/message-listener/deploy/Chart.yaml b/templates/projects/message-listener/deploy/Chart.yaml index dd4d8c3747..e34f82ef4b 100644 --- a/templates/projects/message-listener/deploy/Chart.yaml +++ b/templates/projects/message-listener/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/tools/feature-flags/deploy/Chart.yaml b/tools/feature-flags/deploy/Chart.yaml index 3ae041b3f8..994be8ca73 100644 --- a/tools/feature-flags/deploy/Chart.yaml +++ b/tools/feature-flags/deploy/Chart.yaml @@ -6,8 +6,8 @@ version: 1.0.0 dependencies: - name: generic-service - version: 2.6.0 + version: "2.8" repository: https://ministryofjustice.github.io/hmpps-helm-charts - name: generic-prometheus-alerts - version: 1.3.2 + version: "1.3" repository: https://ministryofjustice.github.io/hmpps-helm-charts \ No newline at end of file diff --git a/tools/feature-flags/deploy/values.yaml b/tools/feature-flags/deploy/values.yaml index d857d1f071..16bfc9de90 100644 --- a/tools/feature-flags/deploy/values.yaml +++ b/tools/feature-flags/deploy/values.yaml @@ -46,25 +46,9 @@ generic-service: tlsSecretName: feature-flags-cert allowlist: - office: "217.33.148.210/32" - health-kick: "35.177.252.195/32" - mojvpn: "81.134.202.29/32" - global-protect: "35.176.93.186/32" - cloudplatform-live1-1: "35.178.209.113/32" - cloudplatform-live1-2: "3.8.51.207/32" - cloudplatform-live1-3: "35.177.252.54/32" - unilink-aovpn1: "194.75.210.216/29" - unilink-aovpn2: "83.98.63.176/29" - unilink-aovpn3: "78.33.10.50/31" - unilink-aovpn4: "78.33.10.52/30" - unilink-aovpn5: "78.33.10.56/30" - unilink-aovpn6: "78.33.10.60/32" - unilink-aovpn7: "78.33.32.99/32" - unilink-aovpn8: "78.33.32.100/30" - unilink-aovpn9: "78.33.32.104/30" - unilink-aovpn10: "78.33.32.108/32" - unilink-aovpn11: "217.138.45.109/32" - unilink-aovpn12: "217.138.45.110/32" + groups: + - internal + - unilink_staff generic-prometheus-alerts: targetApplication: feature-flags