diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b9e4d2c95..edee978ddb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ ENHANCEMENTS: BUG FIXES: * Fix circular dependancy in base workspace. ([#4756](https://github.com/microsoft/AzureTRE/pull/4756)) * Replaced deprecated `datetime.utcnow()` with `datetime.now(datetime.UTC)` in the API and airlock processor. ([#4743](https://github.com/microsoft/AzureTRE/issues/4743)) +* Fix workspace deletion failures due to AnotherOperationInProgress errors on AMPLS private endpoint ([#3194](https://github.com/microsoft/AzureTRE/issues/3194)) * Updated error messages when publishing a template version that is lower than the existing version. ([#4685](https://github.com/microsoft/AzureTRE/issues/4685)) * Disable public access on stweb storage account ([#4766](https://github.com/microsoft/AzureTRE/issues/4766)) * Mark `auth_client_secret` variable as sensitive in terraform templates ([#4736](https://github.com/microsoft/AzureTRE/pull/4736)) @@ -23,6 +24,7 @@ BUG FIXES: * Fix missing metastoreDomains for Databricks, which caused metastore outages for some domains ([#4779](https://github.com/microsoft/AzureTRE/issues/4779)) COMPONENTS: +* Bump workspace base template version to 2.7.2 ([#3194](https://github.com/microsoft/AzureTRE/issues/3194)) ## 0.26.0 (October 12, 2025) **BREAKING CHANGES** diff --git a/templates/workspaces/base/terraform/azure-monitor/azure-monitor.tf b/templates/workspaces/base/terraform/azure-monitor/azure-monitor.tf index 08822baa80..a9b1580245 100644 --- a/templates/workspaces/base/terraform/azure-monitor/azure-monitor.tf +++ b/templates/workspaces/base/terraform/azure-monitor/azure-monitor.tf @@ -194,6 +194,7 @@ resource "azurerm_private_endpoint" "azure_monitor_private_endpoint" { depends_on = [ azurerm_monitor_private_link_scoped_service.ampls_app_insights, + azurerm_monitor_private_link_scoped_service.ampls_log_anaytics, ] } diff --git a/templates/workspaces/base/terraform/network/dns_zones.tf b/templates/workspaces/base/terraform/network/dns_zones.tf index cdb6e8bbfe..dff235f80a 100644 --- a/templates/workspaces/base/terraform/network/dns_zones.tf +++ b/templates/workspaces/base/terraform/network/dns_zones.tf @@ -53,6 +53,7 @@ resource "azurerm_private_dns_zone" "azure_monitor_ods_opinsights" { name = module.terraform_azurerm_environment_configuration.private_links["privatelink.ods.opinsights.azure.com"] resource_group_name = var.ws_resource_group_name tags = var.tre_workspace_tags + lifecycle { ignore_changes = [tags] } } @@ -63,6 +64,7 @@ resource "azurerm_private_dns_zone_virtual_network_link" "azure_monitor_ods_opin private_dns_zone_name = azurerm_private_dns_zone.azure_monitor_ods_opinsights.name registration_enabled = false tags = var.tre_workspace_tags + lifecycle { ignore_changes = [tags] } } @@ -70,6 +72,7 @@ resource "azurerm_private_dns_zone" "azure_monitor_agentsvc" { name = module.terraform_azurerm_environment_configuration.private_links["privatelink.agentsvc.azure-automation.net"] resource_group_name = var.ws_resource_group_name tags = var.tre_workspace_tags + lifecycle { ignore_changes = [tags] } } @@ -80,5 +83,6 @@ resource "azurerm_private_dns_zone_virtual_network_link" "azure_monitor_agentsvc private_dns_zone_name = azurerm_private_dns_zone.azure_monitor_agentsvc.name registration_enabled = false tags = var.tre_workspace_tags + lifecycle { ignore_changes = [tags] } }