Skip to content

Commit

Permalink
Improvement: azurerm_kubernetes_cluster - Add support for `load_bal…
Browse files Browse the repository at this point in the history 
…ancer_profile` (#5394)
  • Loading branch information
@evenh @mbfrahry
evenh authored and mbfrahry committed Jan 24, 2020
1 parent 92ef7a3 commit 8038e49
Show file tree
Hide file tree
Showing 4 changed files with 670 additions and 15 deletions.
194 changes: 179 additions & 15 deletions azurerm/internal/services/containers/resource_arm_kubernetes_cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,54 @@ func resourceArmKubernetesCluster() *schema.Resource {
}, true),
DiffSuppressFunc: suppress.CaseDifference,
},
"load_balancer_profile": {
Type: schema.TypeList,
MaxItems: 1,
ForceNew: true,
Optional: true,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"managed_outbound_ip_count": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
ValidateFunc: validation.IntBetween(1, 100),
ConflictsWith: []string{"network_profile.0.load_balancer_profile.0.outbound_ip_prefix_ids", "network_profile.0.load_balancer_profile.0.outbound_ip_address_ids"},
},
"outbound_ip_prefix_ids": {
Type: schema.TypeSet,
Optional: true,
Computed: true,
ConfigMode: schema.SchemaConfigModeAttr,
ConflictsWith: []string{"network_profile.0.load_balancer_profile.0.managed_outbound_ip_count", "network_profile.0.load_balancer_profile.0.outbound_ip_address_ids"},
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: azure.ValidateResourceID,
},
},
"outbound_ip_address_ids": {
Type: schema.TypeSet,
Optional: true,
Computed: true,
ConfigMode: schema.SchemaConfigModeAttr,
ConflictsWith: []string{"network_profile.0.load_balancer_profile.0.managed_outbound_ip_count", "network_profile.0.load_balancer_profile.0.outbound_ip_prefix_ids"},
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: azure.ValidateResourceID,
},
},
"effective_outbound_ips": {
Type: schema.TypeSet,
Computed: true,
ConfigMode: schema.SchemaConfigModeAttr,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
},
},
},
},
},
},
Expand Down Expand Up @@ -650,7 +698,10 @@ func resourceArmKubernetesClusterCreate(d *schema.ResourceData, meta interface{}
addonProfiles := ExpandKubernetesAddOnProfiles(addOnProfilesRaw)

networkProfileRaw := d.Get("network_profile").([]interface{})
networkProfile := expandKubernetesClusterNetworkProfile(networkProfileRaw)
networkProfile, err := expandKubernetesClusterNetworkProfile(networkProfileRaw)
if err != nil {
return err
}

rbacRaw := d.Get("role_based_access_control").([]interface{})
rbacEnabled, azureADProfile := expandKubernetesClusterRoleBasedAccessControl(rbacRaw, tenantId)
Expand Down Expand Up @@ -844,7 +895,11 @@ func resourceArmKubernetesClusterUpdate(d *schema.ResourceData, meta interface{}
if d.HasChange("network_profile") {
updateCluster = true
networkProfileRaw := d.Get("network_profile").([]interface{})
networkProfile := expandKubernetesClusterNetworkProfile(networkProfileRaw)
networkProfile, err := expandKubernetesClusterNetworkProfile(networkProfileRaw)
if err != nil {
return err
}

existing.ManagedClusterProperties.NetworkProfile = networkProfile
}

Expand Down Expand Up @@ -1376,9 +1431,9 @@ func flattenKubernetesClusterWindowsProfile(profile *containerservice.ManagedClu
}
}

func expandKubernetesClusterNetworkProfile(input []interface{}) *containerservice.NetworkProfileType {
func expandKubernetesClusterNetworkProfile(input []interface{}) (*containerservice.NetworkProfileType, error) {
if len(input) == 0 {
return nil
return nil, nil
}

config := input[0].(map[string]interface{})
Expand All @@ -1387,10 +1442,16 @@ func expandKubernetesClusterNetworkProfile(input []interface{}) *containerservic
networkPolicy := config["network_policy"].(string)
loadBalancerSku := config["load_balancer_sku"].(string)

loadBalancerProfile, err := expandLoadBalancerProfile(config["load_balancer_profile"].([]interface{}), loadBalancerSku)
if err != nil {
return nil, err
}

networkProfile := containerservice.NetworkProfileType{
NetworkPlugin: containerservice.NetworkPlugin(networkPlugin),
NetworkPolicy: containerservice.NetworkPolicy(networkPolicy),
LoadBalancerSku: containerservice.LoadBalancerSku(loadBalancerSku),
NetworkPlugin: containerservice.NetworkPlugin(networkPlugin),
NetworkPolicy: containerservice.NetworkPolicy(networkPolicy),
LoadBalancerSku: containerservice.LoadBalancerSku(loadBalancerSku),
LoadBalancerProfile: loadBalancerProfile,
}

if v, ok := config["dns_service_ip"]; ok && v.(string) != "" {
Expand All @@ -1413,7 +1474,83 @@ func expandKubernetesClusterNetworkProfile(input []interface{}) *containerservic
networkProfile.ServiceCidr = utils.String(serviceCidr)
}

return &networkProfile
return &networkProfile, nil
}

func expandLoadBalancerProfile(d []interface{}, loadBalancerType string) (*containerservice.ManagedClusterLoadBalancerProfile, error) {
if len(d) == 0 || d[0] == nil {
return nil, nil
}

if strings.ToLower(loadBalancerType) != "standard" {
return nil, fmt.Errorf("Only load balancer SKU 'Standard' supports load balancer profiles. Provided load balancer type: %s", loadBalancerType)
}

config := d[0].(map[string]interface{})

var managedOutboundIps *containerservice.ManagedClusterLoadBalancerProfileManagedOutboundIPs
var outboundIpPrefixes *containerservice.ManagedClusterLoadBalancerProfileOutboundIPPrefixes
var outboundIps *containerservice.ManagedClusterLoadBalancerProfileOutboundIPs

if ipCount := config["managed_outbound_ip_count"]; ipCount != nil {
if c := int32(ipCount.(int)); c > 0 {
managedOutboundIps = &containerservice.ManagedClusterLoadBalancerProfileManagedOutboundIPs{Count: &c}
}
}

if ipPrefixes := idsToResourceReferences(config["outbound_ip_prefix_ids"]); ipPrefixes != nil {
outboundIpPrefixes = &containerservice.ManagedClusterLoadBalancerProfileOutboundIPPrefixes{PublicIPPrefixes: ipPrefixes}
}

if outIps := idsToResourceReferences(config["outbound_ip_address_ids"]); outIps != nil {
outboundIps = &containerservice.ManagedClusterLoadBalancerProfileOutboundIPs{PublicIPs: outIps}
}

return &containerservice.ManagedClusterLoadBalancerProfile{
ManagedOutboundIPs: managedOutboundIps,
OutboundIPPrefixes: outboundIpPrefixes,
OutboundIPs: outboundIps,
}, nil
}

func idsToResourceReferences(set interface{}) *[]containerservice.ResourceReference {
if set == nil {
return nil
}

s := set.(*schema.Set)
results := make([]containerservice.ResourceReference, 0)

for _, element := range s.List() {
id := element.(string)
results = append(results, containerservice.ResourceReference{ID: &id})
}

if len(results) > 0 {
return &results
}

return nil
}

func resourceReferencesToIds(refs *[]containerservice.ResourceReference) []string {
if refs == nil {
return nil
}

ids := make([]string, 0)

for _, ref := range *refs {
if ref.ID != nil {
ids = append(ids, *ref.ID)
}
}

if len(ids) > 0 {
return ids
}

return nil
}

func flattenKubernetesClusterNetworkProfile(profile *containerservice.NetworkProfileType) []interface{} {
Expand Down Expand Up @@ -1441,15 +1578,42 @@ func flattenKubernetesClusterNetworkProfile(profile *containerservice.NetworkPro
podCidr = *profile.PodCidr
}

lbProfiles := make([]interface{}, 0)
if lbp := profile.LoadBalancerProfile; lbp != nil {
lb := make(map[string]interface{})

if ips := lbp.ManagedOutboundIPs; ips != nil {
if count := ips.Count; count != nil {
lb["managed_outbound_ip_count"] = count
}
}

if oip := lbp.OutboundIPs; oip != nil {
if poip := oip.PublicIPs; poip != nil {
lb["outbound_ip_address_ids"] = resourceReferencesToIds(poip)
}
}

if oip := lbp.OutboundIPPrefixes; oip != nil {
if pip := oip.PublicIPPrefixes; pip != nil {
lb["outbound_ip_prefix_ids"] = resourceReferencesToIds(pip)
}
}

lb["effective_outbound_ips"] = resourceReferencesToIds(profile.LoadBalancerProfile.EffectiveOutboundIPs)
lbProfiles = append(lbProfiles, lb)
}

return []interface{}{
map[string]interface{}{
"dns_service_ip": dnsServiceIP,
"docker_bridge_cidr": dockerBridgeCidr,
"load_balancer_sku": string(profile.LoadBalancerSku),
"network_plugin": string(profile.NetworkPlugin),
"network_policy": string(profile.NetworkPolicy),
"pod_cidr": podCidr,
"service_cidr": serviceCidr,
"dns_service_ip": dnsServiceIP,
"docker_bridge_cidr": dockerBridgeCidr,
"load_balancer_sku": string(profile.LoadBalancerSku),
"load_balancer_profile": lbProfiles,
"network_plugin": string(profile.NetworkPlugin),
"network_policy": string(profile.NetworkPolicy),
"pod_cidr": podCidr,
"service_cidr": serviceCidr,
},
}
}
Expand Down
Loading

0 comments on commit 8038e49

Please sign in to comment.