Skip to content

Commit 20193a1

Browse files
committed
Azure Active Directory RBAC enable/disable with var rbac_aad_azure_rbac_enabled
1 parent 8b90d95 commit 20193a1

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

locals.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ locals {
1818
name = var.log_analytics_workspace.name
1919
}
2020
) : null # Finally, the Log Analytics Workspace should be disabled.
21-
}
21+
# If var.rbac_aad_azure_rbac_enabled is null set the local to false. Otherise set the local to the var true/false value
22+
rbac_aad_azure_rbac_enabled = var.rbac_aad_azure_rbac_enabled == null ? false : var.rbac_aad_azure_rbac_enabled
23+
}

main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,17 @@ resource "azurerm_kubernetes_cluster" "main" {
9595
}
9696
}
9797
dynamic "azure_active_directory_role_based_access_control" {
98-
for_each = var.role_based_access_control_enabled && var.rbac_aad_managed ? ["rbac"] : []
98+
for_each = var.role_based_access_control_enabled && local.rbac_aad_azure_rbac_enabled && var.rbac_aad_managed ? ["rbac"] : []
9999

100100
content {
101101
admin_group_object_ids = var.rbac_aad_admin_group_object_ids
102-
azure_rbac_enabled = var.rbac_aad_azure_rbac_enabled
102+
azure_rbac_enabled = local.rbac_aad_azure_rbac_enabled
103103
managed = true
104104
tenant_id = var.rbac_aad_tenant_id
105105
}
106106
}
107107
dynamic "azure_active_directory_role_based_access_control" {
108-
for_each = var.role_based_access_control_enabled && !var.rbac_aad_managed ? ["rbac"] : []
108+
for_each = var.role_based_access_control_enabled && local.rbac_aad_azure_rbac_enabled && !var.rbac_aad_managed ? ["rbac"] : []
109109

110110
content {
111111
client_app_id = var.rbac_aad_client_app_id
@@ -253,4 +253,4 @@ resource "azurerm_log_analytics_solution" "main" {
253253
product = "OMSGallery/ContainerInsights"
254254
publisher = "Microsoft"
255255
}
256-
}
256+
}

0 commit comments

Comments
 (0)