Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Firewall Policy Rule Fix #3894

Merged
merged 7 commits into from
Apr 4, 2024
Merged

Firewall Policy Rule Fix #3894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26a878f
Update clean_validation_envs.yml
tim-allen-ck Apr 2, 2024
2a3a913
add in dependencies to all of the route table associations
tim-allen-ck Apr 3, 2024
1e17a28
update fw version
tim-allen-ck Apr 3, 2024
a1b2cd6
reset cron
tim-allen-ck Apr 3, 2024
ac3d17d
spelling fix
tim-allen-ck Apr 3, 2024
f03eea9
Merge branch 'main' into feature/fw-policy-fix
tim-allen-ck Apr 3, 2024
419ab4b
update CHANGELOG.md
tim-allen-ck Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ BUG FIXES:
* Fix registration of templates with no 'authorizedRoles' or 'required' defined ([#3849](https://github.com/microsoft/AzureTRE/pull/3849))
* Update terraform for services bus to move network rules into namespace resource to avoid depreciation warning, and update setup_local_debugging.sh to use network_rule_sets ([#3858](https://github.com/microsoft/AzureTRE/pull/3858))
* Update terraform MySQL resources to MySQL Flexible resources to fix depricating recources. ([#3892](https://github.com/microsoft/AzureTRE/pull/3892))
* Fix issue with firewall failing to deploy on a new TRE deploy ([#3775](https://github.com/microsoft/AzureTRE/issues/3775))

COMPONENTS:

Expand Down
2 changes: 1 addition & 1 deletion templates/shared_services/firewall/porter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
schemaVersion: 1.0.0
name: tre-shared-service-firewall
version: 1.1.6
version: 1.1.7
description: "An Azure TRE Firewall shared service"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand Down
37 changes: 37 additions & 0 deletions templates/shared_services/firewall/terraform/routetable.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ resource "azurerm_route_table" "rt" {
resource "azurerm_subnet_route_table_association" "rt_shared_subnet_association" {
subnet_id = data.azurerm_subnet.shared.id
route_table_id = azurerm_route_table.rt.id

depends_on = [
azurerm_firewall.fw,
azurerm_firewall_policy_rule_collection_group.core,
azurerm_firewall_policy_rule_collection_group.dynamic_network,
azurerm_firewall_policy_rule_collection_group.dynamic_application
]
}

resource "azurerm_subnet_route_table_association" "rt_resource_processor_subnet_association" {
Expand All @@ -28,25 +35,55 @@ resource "azurerm_subnet_route_table_association" "rt_resource_processor_subnet_
depends_on = [
azurerm_firewall.fw,
azurerm_firewall_policy_rule_collection_group.core,
azurerm_firewall_policy_rule_collection_group.dynamic_network,
azurerm_firewall_policy_rule_collection_group.dynamic_application
]
}

resource "azurerm_subnet_route_table_association" "rt_web_app_subnet_association" {
subnet_id = data.azurerm_subnet.web_app.id
route_table_id = azurerm_route_table.rt.id

depends_on = [
azurerm_firewall.fw,
azurerm_firewall_policy_rule_collection_group.core,
azurerm_firewall_policy_rule_collection_group.dynamic_network,
azurerm_firewall_policy_rule_collection_group.dynamic_application
]
}

resource "azurerm_subnet_route_table_association" "rt_airlock_processor_subnet_association" {
subnet_id = data.azurerm_subnet.airlock_processor.id
route_table_id = azurerm_route_table.rt.id

depends_on = [
azurerm_firewall.fw,
azurerm_firewall_policy_rule_collection_group.core,
azurerm_firewall_policy_rule_collection_group.dynamic_network,
azurerm_firewall_policy_rule_collection_group.dynamic_application
]
}

resource "azurerm_subnet_route_table_association" "rt_airlock_storage_subnet_association" {
subnet_id = data.azurerm_subnet.airlock_storage.id
route_table_id = azurerm_route_table.rt.id

depends_on = [
azurerm_firewall.fw,
azurerm_firewall_policy_rule_collection_group.core,
azurerm_firewall_policy_rule_collection_group.dynamic_network,
azurerm_firewall_policy_rule_collection_group.dynamic_application
]
}

resource "azurerm_subnet_route_table_association" "rt_airlock_events_subnet_association" {
subnet_id = data.azurerm_subnet.airlock_events.id
route_table_id = azurerm_route_table.rt.id

depends_on = [
azurerm_firewall.fw,
azurerm_firewall_policy_rule_collection_group.core,
azurerm_firewall_policy_rule_collection_group.dynamic_network,
azurerm_firewall_policy_rule_collection_group.dynamic_application
]
}
Loading