Skip to content

Commit 78298ed

Browse files
authored
azurerm_kubernetes_cluster: Support update of azure_rbac_enabled (#12029)
1 parent 60452f6 commit 78298ed

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

azurerm/internal/services/containers/kubernetes_cluster_auth_resource_test.go

+22-2
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ func testAccKubernetesCluster_roleBasedAccessControlAADManagedChange(t *testing.
305305
check.That(data.ResourceName).Key("role_based_access_control.0.azure_active_directory.#").HasValue("1"),
306306
check.That(data.ResourceName).Key("role_based_access_control.0.azure_active_directory.0.tenant_id").Exists(),
307307
check.That(data.ResourceName).Key("role_based_access_control.0.azure_active_directory.0.managed").Exists(),
308+
check.That(data.ResourceName).Key("role_based_access_control.0.azure_active_directory.0.azure_rbac_enabled").HasValue("false"),
308309
check.That(data.ResourceName).Key("kube_admin_config.#").HasValue("1"),
309310
check.That(data.ResourceName).Key("kube_admin_config_raw").Exists(),
310311
check.That(data.ResourceName).Key("default_node_pool.0.node_count").HasValue("1"),
@@ -337,6 +338,24 @@ func testAccKubernetesCluster_roleBasedAccessControlAzure(t *testing.T) {
337338
clientData := data.Client()
338339

339340
data.ResourceTest(t, r, []acceptance.TestStep{
341+
{
342+
Config: r.roleBasedAccessControlAADManagedConfig(data, ""),
343+
Check: acceptance.ComposeTestCheckFunc(
344+
check.That(data.ResourceName).ExistsInAzure(r),
345+
check.That(data.ResourceName).Key("role_based_access_control.#").HasValue("1"),
346+
check.That(data.ResourceName).Key("role_based_access_control.0.enabled").HasValue("true"),
347+
check.That(data.ResourceName).Key("role_based_access_control.0.azure_active_directory.#").HasValue("1"),
348+
check.That(data.ResourceName).Key("role_based_access_control.0.azure_active_directory.0.tenant_id").Exists(),
349+
check.That(data.ResourceName).Key("role_based_access_control.0.azure_active_directory.0.managed").Exists(),
350+
check.That(data.ResourceName).Key("role_based_access_control.0.azure_active_directory.0.azure_rbac_enabled").HasValue("false"),
351+
check.That(data.ResourceName).Key("kube_admin_config.#").HasValue("1"),
352+
check.That(data.ResourceName).Key("kube_admin_config_raw").Exists(),
353+
check.That(data.ResourceName).Key("default_node_pool.0.node_count").HasValue("1"),
354+
),
355+
},
356+
data.ImportStep(
357+
"role_based_access_control.0.azure_active_directory.0.server_app_secret",
358+
),
340359
{
341360
Config: r.roleBasedAccessControlAzureConfig(data, ""),
342361
Check: acceptance.ComposeTestCheckFunc(
@@ -746,8 +765,9 @@ resource "azurerm_kubernetes_cluster" "test" {
746765
enabled = true
747766
748767
azure_active_directory {
749-
tenant_id = var.tenant_id
750-
managed = true
768+
tenant_id = var.tenant_id
769+
managed = true
770+
azure_rbac_enabled = false
751771
}
752772
}
753773
}

azurerm/internal/services/containers/kubernetes_cluster_resource.go

-3
Original file line numberDiff line numberDiff line change
@@ -592,9 +592,6 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
592592
"azure_rbac_enabled": {
593593
Type: pluginsdk.TypeBool,
594594
Optional: true,
595-
// ForceNew can be removed after GA:
596-
// https://docs.microsoft.com/en-us/azure/aks/manage-azure-rbac#limitations
597-
ForceNew: true,
598595
},
599596

600597
"admin_group_object_ids": {

website/docs/r/kubernetes_cluster.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ When `managed` is set to `true` the following properties can be specified:
269269

270270
* `admin_group_object_ids` - (Optional) A list of Object IDs of Azure Active Directory Groups which should have Admin Role on the Cluster.
271271

272-
* `azure_rbac_enabled` - (Optional) Is Role Based Access Control based on Azure AD enabled? Changing this forces a new resource to be created.
272+
* `azure_rbac_enabled` - (Optional) Is Role Based Access Control based on Azure AD enabled?
273273

274274
~> **Note:** Azure AD based RBAC is in Public Preview - more information and details on how to opt into the Preview [can be found in this article](https://docs.microsoft.com/en-us/azure/aks/manage-azure-rbac).
275275

0 commit comments

Comments
 (0)