From 11d137c3fb80e9d267afedfc7b3f7ac4b123b78d Mon Sep 17 00:00:00 2001 From: Romiko Date: Wed, 27 Mar 2024 15:06:44 +1100 Subject: [PATCH] network_profile_id is deprecated by AzureRM after v3.16.0. Added support for ManagedIdentity in ACR --- compute_container_groups.tf | 1 + modules/compute/container_group/container_group.tf | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/compute_container_groups.tf b/compute_container_groups.tf index e2581d0c7d..ff5bc2842b 100644 --- a/compute_container_groups.tf +++ b/compute_container_groups.tf @@ -18,6 +18,7 @@ module "container_groups" { keyvaults = local.combined_objects_keyvaults managed_identities = local.combined_objects_managed_identities network_profiles = local.combined_objects_network_profiles + networking = local.combined_objects_networking } } diff --git a/modules/compute/container_group/container_group.tf b/modules/compute/container_group/container_group.tf index 4253f8e2da..dca3b9a70d 100644 --- a/modules/compute/container_group/container_group.tf +++ b/modules/compute/container_group/container_group.tf @@ -33,7 +33,8 @@ resource "azurerm_container_group" "acg" { tags = merge(local.tags, try(var.settings.tags, null)) ip_address_type = try(var.settings.ip_address_type, "Public") restart_policy = try(var.settings.restart_policy, "Always") - network_profile_id = try(var.combined_resources.network_profiles[try(var.settings.network_profile.lz_key, var.client_config.landingzone_key)][var.settings.network_profile.key].id, null) + subnet_ids = try(var.settings.network.subnets, null) == null ? null : [for key, value in var.settings.network.subnets : can(value.subnet_id) ? value.subnet_id : var.combined_resources.networking[try(value.lz_key, var.client_config.landingzone_key)][value.vnet_key].subnets[value.subnet_key].id] + dynamic "exposed_port" { for_each = try(var.settings.exposed_port, []) @@ -178,9 +179,10 @@ resource "azurerm_container_group" "acg" { dynamic "image_registry_credential" { for_each = try(var.settings.image_registry_credentials, {}) content { - server = image_registry_credential.value.server - username = try(data.azurerm_key_vault_secret.image_registry_credential_username[image_registry_credential.key].value, image_registry_credential.value.username) - password = try(data.azurerm_key_vault_secret.image_registry_credential_password[image_registry_credential.key].value, image_registry_credential.value.password) + server = image_registry_credential.value.server + username = try(data.azurerm_key_vault_secret.image_registry_credential_username[image_registry_credential.key].value, image_registry_credential.value.username, null) + password = try(data.azurerm_key_vault_secret.image_registry_credential_password[image_registry_credential.key].value, image_registry_credential.value.password, null) + user_assigned_identity_id = try(var.settings.identity, false) == false ? null : try(local.managed_identities[0], null) } }