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.

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

Add extra dns zones and links #2828

Merged
merged 7 commits into from
Nov 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ ENHANCEMENTS:
* Added optional parameter to allow a client to retrieve a template by name and version ([#2802](https://github.com/microsoft/AzureTRE/pull/2802))
* Added support for `allOf` usage in Resource Templates - both across the API and the UI. This allows a template author to specify certain fields as being conditionally present / conditionally required, and means we can tidy up some of the resource creation forms substantially. ([#2795](https://github.com/microsoft/AzureTRE/pull/2795)).
* As part of the above change, the `auto_create` string passed to the `client_id` field in each Workspace template has now moved to an `auth_type` enum field, where the user can select the authentication type from a dropdown.
* Adds extra dns zones and links into core network

BUG FIXES:
* Show the correct createdBy value for airlock requests in UI and in API queries ([#2779](https://github.com/microsoft/AzureTRE/pull/2779))
Expand Down
10 changes: 0 additions & 10 deletions templates/core/terraform/network/dns_zones.tf
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ resource "azurerm_private_dns_zone_virtual_network_link" "blobcore" {
lifecycle { ignore_changes = [tags] }
}


resource "azurerm_private_dns_zone" "azurewebsites" {
name = "privatelink.azurewebsites.net"
resource_group_name = var.resource_group_name
Expand All @@ -113,7 +112,6 @@ resource "azurerm_private_dns_zone_virtual_network_link" "azurewebsites" {
lifecycle { ignore_changes = [tags] }
}


resource "azurerm_private_dns_zone" "mysql" {
name = "privatelink.mysql.database.azure.com"
resource_group_name = var.resource_group_name
Expand All @@ -131,7 +129,6 @@ resource "azurerm_private_dns_zone_virtual_network_link" "mysql" {
lifecycle { ignore_changes = [tags] }
}


resource "azurerm_private_dns_zone" "static_web" {
name = "privatelink.web.core.windows.net"
resource_group_name = var.resource_group_name
Expand All @@ -148,7 +145,6 @@ resource "azurerm_private_dns_zone_virtual_network_link" "webcorelink" {
lifecycle { ignore_changes = [tags] }
}


resource "azurerm_private_dns_zone" "filecore" {
name = "privatelink.file.core.windows.net"
resource_group_name = var.resource_group_name
Expand All @@ -165,7 +161,6 @@ resource "azurerm_private_dns_zone_virtual_network_link" "filecorelink" {
lifecycle { ignore_changes = [tags] }
}


resource "azurerm_private_dns_zone" "vaultcore" {
name = "privatelink.vaultcore.azure.net"
resource_group_name = var.resource_group_name
Expand All @@ -182,7 +177,6 @@ resource "azurerm_private_dns_zone_virtual_network_link" "vaultcore" {
lifecycle { ignore_changes = [tags] }
}


resource "azurerm_private_dns_zone" "azurecr" {
name = "privatelink.azurecr.io"
resource_group_name = var.resource_group_name
Expand All @@ -199,23 +193,20 @@ resource "azurerm_private_dns_zone_virtual_network_link" "acrlink" {
lifecycle { ignore_changes = [tags] }
}


resource "azurerm_private_dns_zone" "azureml" {
name = "privatelink.api.azureml.ms"
resource_group_name = var.resource_group_name
tags = local.tre_core_tags
lifecycle { ignore_changes = [tags] }
}


resource "azurerm_private_dns_zone" "azuremlcert" {
name = "privatelink.cert.api.azureml.ms"
resource_group_name = var.resource_group_name
tags = local.tre_core_tags
lifecycle { ignore_changes = [tags] }
}


resource "azurerm_private_dns_zone" "notebooks" {
name = "privatelink.notebooks.azure.net"
resource_group_name = var.resource_group_name
Expand Down Expand Up @@ -246,7 +237,6 @@ resource "azurerm_private_dns_zone" "eventgrid" {
lifecycle { ignore_changes = [tags] }
}


resource "azurerm_private_dns_zone_virtual_network_link" "eventgridlink" {
name = "eventgrid-link"
resource_group_name = var.resource_group_name
Expand Down
8 changes: 8 additions & 0 deletions templates/core/terraform/network/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,13 @@ locals {
private_dns_zone_names = toset([
"privatelink.queue.core.windows.net",
"privatelink.table.core.windows.net",
"privatelink.purview.azure.com",
"privatelink.purviewstudio.azure.com",
"privatelink.sql.azuresynapse.net",
"privatelink.dev.azuresynapse.net",
"privatelink.azuresynapse.net",
"privatelink.dfs.core.windows.net",
"privatelink.azurehealthcareapis.com",
"privatelink.dicom.azurehealthcareapis.com"
])
}
2 changes: 1 addition & 1 deletion templates/core/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.4.39"
__version__ = "0.4.40"