Skip to content

Commit 8f8dd20

Browse files
ragaskarCI Bot
authored andcommitted
Update allowed ips to reflect additional Concourse worker range.
- We have a new set of concourse workers we need to allow traffic from in order to build stemcells correctly. - Previously the set of egress IPs was quite small and it made sense to pass them as IPs. The new workers have a much larger range of IPs that they may send traffic from, so the task interface has been changed to consume CIDRs instead of individual IPs (happily, the necessary firewall configuration is already consuming CIDRs, so we just needed to convert each "legacy" IP to a /32 CIDR.)
1 parent 2de3687 commit 8f8dd20

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

ci/pipelines/stemcells-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ jobs:
703703
GOVCLOUD_AWS_DEFAULT_REGION: ((AWS_GOVCLOUD_PACKER_REGION))
704704
GOVCLOUD_AWS_SECRET_ACCESS_KEY: ((packer_user_gov_aws_access_key.password))
705705
WINDOWS_STEMCELLS_GCP_CREDENTIALS_JSON: *gcp_account_json
706-
ALLOWED_IP_ADDRESSES: 35.197.92.68 34.169.1.255 34.82.52.87 34.168.69.249 34.82.182.73
706+
ALLOWED_CIDRS: 35.197.92.68/32 34.169.1.255/32 34.82.52.87/32 34.168.69.249/32 34.82.182.73/32 34.145.18.128/26
707707
- put: main-version
708708
inputs: detect
709709
params:

ci/tasks/firewall-rules/configure-windows-firewall-rules.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ set -x
88
# Set firewall rules in the GCP project if needed
99
if [ "${CONFIGURE_GCP:-}" == "true" ]; then
1010
comma_separated_external_ips=""
11-
for external_ip in ${ALLOWED_IP_ADDRESSES}; do
12-
comma_separated_external_ips="${external_ip}/32,${comma_separated_external_ips}"
11+
for allowed_cidr in ${ALLOWED_CIDRS}; do
12+
comma_separated_external_ips="${allowed_cidr},${comma_separated_external_ips}"
1313
done
1414
comma_separated_external_ips="${comma_separated_external_ips%,}"
1515

@@ -22,8 +22,8 @@ fi
2222

2323
# Set firewall rules in the AWS project
2424
aws_ip_ranges=""
25-
for external_ip in ${ALLOWED_IP_ADDRESSES}; do
26-
aws_ip_ranges="{CidrIp=${external_ip}/32},${aws_ip_ranges}"
25+
for allowed_cidr in ${ALLOWED_CIDRS}; do
26+
aws_ip_ranges="{CidrIp=${allowed_cidr}},${aws_ip_ranges}"
2727
done
2828
aws_ip_ranges="${aws_ip_ranges%,}"
2929

ci/tasks/firewall-rules/configure-windows-firewall-rules.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ params:
1414
GOVCLOUD_AWS_DEFAULT_REGION:
1515
GOVCLOUD_AWS_SECRET_ACCESS_KEY:
1616
WINDOWS_STEMCELLS_GCP_CREDENTIALS_JSON:
17-
ALLOWED_IP_ADDRESSES:
17+
ALLOWED_CIDRS:
1818

1919
run:
2020
path: bosh-windows-stemcell-builder-ci/ci/tasks/firewall-rules/configure-windows-firewall-rules.sh

0 commit comments

Comments
 (0)