From a0387ead298d65876fc368088639220cd5df99c1 Mon Sep 17 00:00:00 2001 From: Elder Silva Date: Fri, 29 Sep 2023 11:26:32 +1000 Subject: [PATCH 01/10] provider version >=3.31 --- main.tf | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/main.tf b/main.tf index 229483c..1d77650 100644 --- a/main.tf +++ b/main.tf @@ -53,7 +53,7 @@ resource "azurerm_kubernetes_cluster" "aks" { vm_size = local.node_pools[var.default_node_pool].vm_size os_disk_size_gb = local.node_pools[var.default_node_pool].os_disk_size_gb os_disk_type = local.node_pools[var.default_node_pool].os_disk_type - availability_zones = local.node_pools[var.default_node_pool].availability_zones + zones = local.node_pools[var.default_node_pool].availability_zones enable_auto_scaling = local.node_pools[var.default_node_pool].enable_auto_scaling node_count = (local.node_pools[var.default_node_pool].enable_auto_scaling ? null : local.node_pools[var.default_node_pool].node_count) min_count = (local.node_pools[var.default_node_pool].enable_auto_scaling ? local.node_pools[var.default_node_pool].min_count : null) @@ -76,14 +76,6 @@ resource "azurerm_kubernetes_cluster" "aks" { api_server_authorized_ip_ranges = local.api_server_authorized_ip_ranges - addon_profile { - dynamic "kube_dashboard" { - for_each = (var.enable_kube_dashboard ? [1] : []) - content { - enabled = true - } - } - azure_policy { enabled = var.enable_azure_policy } @@ -107,23 +99,19 @@ resource "azurerm_kubernetes_cluster" "aks" { identity { type = var.identity_type - user_assigned_identity_id = (var.identity_type == "SystemAssigned" ? null : + identity_ids = (var.identity_type == "SystemAssigned" ? null : (var.user_assigned_identity != null ? var.user_assigned_identity.id : azurerm_user_assigned_identity.aks.0.id)) } - role_based_access_control { - enabled = var.rbac.enabled - dynamic "azure_active_directory" { - for_each = (var.rbac.ad_integration ? [1] : []) - content { - managed = true - admin_group_object_ids = values(var.rbac_admin_object_ids) - } + dynamic "azure_active_directory_role_based_access_control" { + for_each = (var.rbac.ad_integration ? [1] : []) + content { + managed = true + tenant_id = values(var.rbac_admin_object_ids) } } -} resource "azurerm_role_assignment" "rbac_admin" { for_each = (var.rbac.ad_integration ? var.rbac_admin_object_ids : {}) From cb401b8e06fc8a453d930cc5b24c27d5bf05bab0 Mon Sep 17 00:00:00 2001 From: Elder Silva Date: Fri, 29 Sep 2023 11:26:51 +1000 Subject: [PATCH 02/10] provider version >=3.31 --- versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.tf b/versions.tf index 7d30c83..68629d0 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 2.57.0" + version = ">= 3.31.0" } http = { source = "hashicorp/http" From 62edabed05730638a3af235ec461361b23dfc61f Mon Sep 17 00:00:00 2001 From: Elder Silva Date: Fri, 29 Sep 2023 11:39:44 +1000 Subject: [PATCH 03/10] provider version >=3.31 --- main.tf | 8 -------- 1 file changed, 8 deletions(-) diff --git a/main.tf b/main.tf index 1d77650..8e5e8d8 100644 --- a/main.tf +++ b/main.tf @@ -89,14 +89,6 @@ resource "azurerm_kubernetes_cluster" "aks" { } } - dynamic "windows_profile" { - for_each = local.windows_nodes ? [1] : [] - content { - admin_username = var.windows_profile.admin_username - admin_password = var.windows_profile.admin_password - } - } - identity { type = var.identity_type identity_ids = (var.identity_type == "SystemAssigned" ? null : From 468f02ad9bb5399f74bb10c1c6e7bc6aa42a9728 Mon Sep 17 00:00:00 2001 From: Elder Silva Date: Fri, 29 Sep 2023 11:47:03 +1000 Subject: [PATCH 04/10] provider version >=3.31 --- main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tf b/main.tf index 8e5e8d8..5612bf9 100644 --- a/main.tf +++ b/main.tf @@ -104,6 +104,7 @@ resource "azurerm_kubernetes_cluster" "aks" { tenant_id = values(var.rbac_admin_object_ids) } } +} resource "azurerm_role_assignment" "rbac_admin" { for_each = (var.rbac.ad_integration ? var.rbac_admin_object_ids : {}) From afa0a65df9a0630a05c41129e03d7997f878fc61 Mon Sep 17 00:00:00 2001 From: Elder Silva Date: Fri, 29 Sep 2023 11:49:43 +1000 Subject: [PATCH 05/10] provider version >=3.31 --- main.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/main.tf b/main.tf index 5612bf9..3150905 100644 --- a/main.tf +++ b/main.tf @@ -87,7 +87,6 @@ resource "azurerm_kubernetes_cluster" "aks" { log_analytics_workspace_id = var.log_analytics_workspace_id } } - } identity { type = var.identity_type From c526f5faec285d618ca9b432a7562aaea05e1bde Mon Sep 17 00:00:00 2001 From: Elder Silva Date: Fri, 29 Sep 2023 11:52:54 +1000 Subject: [PATCH 06/10] provider version >=3.31 --- main.tf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main.tf b/main.tf index 3150905..9adf6a6 100644 --- a/main.tf +++ b/main.tf @@ -76,14 +76,11 @@ resource "azurerm_kubernetes_cluster" "aks" { api_server_authorized_ip_ranges = local.api_server_authorized_ip_ranges - azure_policy { - enabled = var.enable_azure_policy - } + azure_policy_enabled = var.enable_azure_policy dynamic "oms_agent" { for_each = (var.log_analytics_workspace_id != null ? [1] : []) content { - enabled = true log_analytics_workspace_id = var.log_analytics_workspace_id } } From c3f42340d8af4e92ee8a7da396a1070ec48e4df5 Mon Sep 17 00:00:00 2001 From: Elder Silva Date: Fri, 29 Sep 2023 11:54:44 +1000 Subject: [PATCH 07/10] provider version >=3.31 --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 9adf6a6..955d79f 100644 --- a/main.tf +++ b/main.tf @@ -118,7 +118,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "additional" { vm_size = each.value.vm_size os_disk_size_gb = each.value.os_disk_size_gb os_disk_type = each.value.os_disk_type - availability_zones = each.value.availability_zones + zones = each.value.availability_zones enable_auto_scaling = each.value.enable_auto_scaling node_count = (each.value.enable_auto_scaling ? null : each.value.node_count) min_count = (each.value.enable_auto_scaling ? each.value.min_count : null) From f7ea61a52e64bb90310f7419178bb5e43c4d615d Mon Sep 17 00:00:00 2001 From: Elder Silva Date: Fri, 29 Sep 2023 13:17:46 +1000 Subject: [PATCH 08/10] provider version >=3.31 --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 955d79f..5bcce93 100644 --- a/main.tf +++ b/main.tf @@ -90,7 +90,7 @@ resource "azurerm_kubernetes_cluster" "aks" { identity_ids = (var.identity_type == "SystemAssigned" ? null : (var.user_assigned_identity != null ? var.user_assigned_identity.id : - azurerm_user_assigned_identity.aks.0.id)) + azurerm_user_assigned_identity.aks.0.principal_id)) } dynamic "azure_active_directory_role_based_access_control" { From b8bfcf8d90161375ca63eb44d3cef1031492ab51 Mon Sep 17 00:00:00 2001 From: Elder Silva Date: Fri, 29 Sep 2023 13:23:24 +1000 Subject: [PATCH 09/10] provider version >=3.31 --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 5bcce93..00af06b 100644 --- a/main.tf +++ b/main.tf @@ -87,10 +87,10 @@ resource "azurerm_kubernetes_cluster" "aks" { identity { type = var.identity_type - identity_ids = (var.identity_type == "SystemAssigned" ? null : + identity_ids = [(var.identity_type == "SystemAssigned" ? null : (var.user_assigned_identity != null ? var.user_assigned_identity.id : - azurerm_user_assigned_identity.aks.0.principal_id)) + azurerm_user_assigned_identity.aks.0.principal_id))] } dynamic "azure_active_directory_role_based_access_control" { From 480a197fa66fce91de5a1e4e4dae91f020f4e3ad Mon Sep 17 00:00:00 2001 From: Elder Silva Date: Fri, 29 Sep 2023 13:38:23 +1000 Subject: [PATCH 10/10] provider version >=3.31 --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 00af06b..197e176 100644 --- a/main.tf +++ b/main.tf @@ -90,7 +90,7 @@ resource "azurerm_kubernetes_cluster" "aks" { identity_ids = [(var.identity_type == "SystemAssigned" ? null : (var.user_assigned_identity != null ? var.user_assigned_identity.id : - azurerm_user_assigned_identity.aks.0.principal_id))] + azurerm_user_assigned_identity.aks.0.id))] } dynamic "azure_active_directory_role_based_access_control" {