diff --git a/aks.tf b/aks.tf index f955667..9910080 100644 --- a/aks.tf +++ b/aks.tf @@ -6,15 +6,15 @@ module "aks" { source = "Azure/aks/azurerm" prefix = var.nuon_id - resource_group_name = azurerm_resource_group.rg.name + resource_group_name = data.azurerm_resource_group.rg.name kubernetes_version = var.cluster_version automatic_channel_upgrade = "patch" - agents_availability_zones = ["1", "2"] - agents_count = null - agents_max_count = 2 - agents_max_pods = 100 - agents_min_count = 1 - agents_pool_name = "agents" + # agents_availability_zones = ["1", "2"] + agents_count = null + agents_max_count = 2 + agents_max_pods = 100 + agents_min_count = 1 + agents_pool_name = "agents" agents_pool_linux_os_configs = [ { transparent_huge_page_enabled = "always" diff --git a/dns.tf b/dns.tf index 0677474..dee0fd9 100644 --- a/dns.tf +++ b/dns.tf @@ -1,9 +1,9 @@ resource "azurerm_dns_zone" "public" { name = var.public_root_domain - resource_group_name = azurerm_resource_group.rg.name + resource_group_name = data.azurerm_resource_group.rg.name } resource "azurerm_private_dns_zone" "internal" { name = var.internal_root_domain - resource_group_name = azurerm_resource_group.rg.name + resource_group_name = data.azurerm_resource_group.rg.name } diff --git a/outputs.tf b/outputs.tf index 4b5ab9b..09e518c 100644 --- a/outputs.tf +++ b/outputs.tf @@ -39,7 +39,7 @@ output "account" { "location" = var.location "subscription_id" = data.azurerm_client_config.current.subscription_id "client_id" = data.azurerm_client_config.current.client_id - "resource_group_name" = azurerm_resource_group.rg.name + "resource_group_name" = data.azurerm_resource_group.rg.name } description = "A map of Azure account attributes: location, subscription_id, client_id, resource_group_name." } diff --git a/registry.tf b/registry.tf index 7f0b812..d554eca 100644 --- a/registry.tf +++ b/registry.tf @@ -1,7 +1,7 @@ resource "azurerm_container_registry" "acr" { name = var.nuon_id - resource_group_name = azurerm_resource_group.rg.name - location = azurerm_resource_group.rg.location + resource_group_name = data.azurerm_resource_group.rg.name + location = data.azurerm_resource_group.rg.location sku = "Premium" admin_enabled = false } @@ -9,7 +9,7 @@ resource "azurerm_container_registry" "acr" { resource "azurerm_container_registry_scope_map" "acr" { name = var.nuon_id container_registry_name = azurerm_container_registry.acr.name - resource_group_name = azurerm_resource_group.rg.name + resource_group_name = data.azurerm_resource_group.rg.name actions = [ "repositories/${var.nuon_id}/content/read", "repositories/${var.nuon_id}/content/write" @@ -24,7 +24,7 @@ resource "random_pet" "token_name" { resource "azurerm_container_registry_token" "runner" { name = random_pet.token_name.id container_registry_name = azurerm_container_registry.acr.name - resource_group_name = azurerm_resource_group.rg.name + resource_group_name = data.azurerm_resource_group.rg.name scope_map_id = azurerm_container_registry_scope_map.acr.id } diff --git a/resource_group.tf b/resource_group.tf index 12cd31e..e7531e7 100644 --- a/resource_group.tf +++ b/resource_group.tf @@ -1,4 +1,3 @@ -resource "azurerm_resource_group" "rg" { - location = var.location - name = var.nuon_id +data "azurerm_resource_group" "rg" { + name = var.resource_group_name } diff --git a/runner.tf b/runner.tf index f866774..4cc6401 100644 --- a/runner.tf +++ b/runner.tf @@ -18,7 +18,7 @@ resource "azurerm_role_definition" "runner" { resource "azurerm_user_assigned_identity" "runner" { name = "${var.nuon_id}-runner" location = var.location - resource_group_name = azurerm_resource_group.rg.name + resource_group_name = data.azurerm_resource_group.rg.name } resource "azurerm_role_assignment" "role_assignment" { diff --git a/ssh.tf b/ssh.tf index 17d71a1..bd49a8c 100644 --- a/ssh.tf +++ b/ssh.tf @@ -15,6 +15,6 @@ resource "azapi_resource_action" "ssh_public_key_gen" { resource "azapi_resource" "ssh_public_key" { type = "Microsoft.Compute/sshPublicKeys@2022-11-01" name = random_pet.ssh_key_name.id - location = azurerm_resource_group.rg.location - parent_id = azurerm_resource_group.rg.id + location = data.azurerm_resource_group.rg.location + parent_id = data.azurerm_resource_group.rg.id }