Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable RBAC without AAD #2347

Closed
wants to merge 2 commits into from
Closed

Enable RBAC without AAD #2347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
654afe1
Enable RBAC without AAD
raphaelquati Nov 17, 2018
34a8fc7
Fix typo
raphaelquati Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions azurerm/resource_arm_kubernetes_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,12 +315,17 @@ func resourceArmKubernetesCluster() *schema.Resource {
Type: schema.TypeList,
Optional: true,
ForceNew: true,
MaxItems: 1,
MaxItems: 2,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there can only be a single block - so this can be flipped back to 1

Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"enabled": {
Type: schema.TypeBool,
Required: true,
ForceNew: true,
},
"azure_active_directory": {
Type: schema.TypeList,
Required: true,
Optional: true,
ForceNew: true,
MaxItems: 1,
Elem: &schema.Resource{
Expand Down Expand Up @@ -450,8 +455,8 @@ func resourceArmKubernetesClusterCreateUpdate(d *schema.ResourceData, meta inter
}

rbacRaw := d.Get("role_based_access_control").([]interface{})
azureADProfile := expandKubernetesClusterRoleBasedAccessControl(rbacRaw, tenantId)
roleBasedAccessControlEnabled := azureADProfile != nil
roleBasedAccessControlEnabled, azureADProfile := expandKubernetesClusterRoleBasedAccessControl(rbacRaw, tenantId)
//roleBasedAccessControlEnabled := azureADProfile != nil
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can remove this line, since it's not being used


parameters := containerservice.ManagedCluster{
Name: &name,
Expand Down Expand Up @@ -552,7 +557,7 @@ func resourceArmKubernetesClusterRead(d *schema.ResourceData, meta interface{})
return fmt.Errorf("Error setting `network_profile`: %+v", err)
}

roleBasedAccessControl := flattenKubernetesClusterRoleBasedAccessControl(props.AadProfile, d)
roleBasedAccessControl := flattenKubernetesClusterRoleBasedAccessControl(props.EnableRBAC, props.AadProfile, d)
if err := d.Set("role_based_access_control", roleBasedAccessControl); err != nil {
return fmt.Errorf("Error setting `role_based_access_control`: %+v", err)
}
Expand Down Expand Up @@ -914,14 +919,18 @@ func flattenKubernetesClusterNetworkProfile(profile *containerservice.NetworkPro
return []interface{}{values}
}

func expandKubernetesClusterRoleBasedAccessControl(input []interface{}, providerTenantId string) *containerservice.ManagedClusterAADProfile {
func expandKubernetesClusterRoleBasedAccessControl(input []interface{}, providerTenantId string) (bool, *containerservice.ManagedClusterAADProfile) {
if len(input) == 0 {
return nil
return false, nil
}

val := input[0].(map[string]interface{})

enabled := val["enabled"].(bool)
azureADsRaw := val["azure_active_directory"].([]interface{})
if len(azureADsRaw) == 0 {
return enabled, nil
}

azureAdRaw := azureADsRaw[0].(map[string]interface{})

clientAppId := azureAdRaw["client_app_id"].(string)
Expand All @@ -933,17 +942,21 @@ func expandKubernetesClusterRoleBasedAccessControl(input []interface{}, provider
tenantId = providerTenantId
}

return &containerservice.ManagedClusterAADProfile{
return enabled, &containerservice.ManagedClusterAADProfile{
ClientAppID: utils.String(clientAppId),
ServerAppID: utils.String(serverAppId),
ServerAppSecret: utils.String(serverAppSecret),
TenantID: utils.String(tenantId),
}
}

func flattenKubernetesClusterRoleBasedAccessControl(input *containerservice.ManagedClusterAADProfile, d *schema.ResourceData) []interface{} {
func flattenKubernetesClusterRoleBasedAccessControl(enabledRBAC *bool, input *containerservice.ManagedClusterAADProfile, d *schema.ResourceData) []interface{} {
if input == nil {
return []interface{}{}
return []interface{}{
map[string]interface{}{
"enabled": *enabledRBAC,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's a crash we should check here

},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we still need to set the azure_active_directory block to an empty list, if it's not enabled (since then it'll show as a diff if necessary)

}
}

profile := make(map[string]interface{})
Expand Down Expand Up @@ -978,6 +991,7 @@ func flattenKubernetesClusterRoleBasedAccessControl(input *containerservice.Mana

return []interface{}{
map[string]interface{}{
"enabled": *enabledRBAC,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's a potential crash here which we can nil-check around

"azure_active_directory": []interface{}{
profile,
},
Expand Down
2 changes: 2 additions & 0 deletions azurerm/resource_arm_kubernetes_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ func TestAccAzureRMKubernetesCluster_roleBasedAccessControl(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMKubernetesClusterExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "role_based_access_control.#", "1"),
resource.TestCheckResourceAttr(resourceName, "role_based_access_control.0.enabled", "true"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it'd be good to ensure this is set to false for the basic configuration

resource.TestCheckResourceAttr(resourceName, "role_based_access_control.0.azure_active_directory.#", "1"),
resource.TestCheckResourceAttrSet(resourceName, "role_based_access_control.0.azure_active_directory.0.client_app_id"),
resource.TestCheckResourceAttrSet(resourceName, "role_based_access_control.0.azure_active_directory.0.server_app_id"),
Expand Down Expand Up @@ -596,6 +597,7 @@ resource "azurerm_kubernetes_cluster" "test" {
}

role_based_access_control {
enabled=true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor can we fix the formatting here?

azure_active_directory {
server_app_id = "%s"
server_app_secret = "%s"
Expand Down
1 change: 1 addition & 0 deletions examples/kubernetes/role-based-access-control/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ resource "azurerm_kubernetes_cluster" "test" {
}

role_based_access_control {
enabled = true
azure_active_directory {
# NOTE: in a Production environment these should be different values
# but for the purposes of this example, this should be sufficient
Expand Down
4 changes: 3 additions & 1 deletion website/docs/r/kubernetes_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@ A `oms_agent` block supports the following:

A `role_based_access_control` block supports the following:

* `azure_active_directory` - (Required) An `azure_active_directory` block. Changing this forces a new resource to be created.
* `enabled` - (Required) Is RBAC enabled?. Changing this forces a new resource to be created.

* `azure_active_directory` - (Optional) An `azure_active_directory` block. Changing this forces a new resource to be created.

---

Expand Down