address comments

api/v1alpha3/azurecluster_default.go

@@ -31,17 +31,6 @@ const (
 	DefaultInternalLBIPAddress = "10.0.0.100"
 )
 
-const (
-	// DefaultVnetIPv6CIDR is the ipv6 Vnet CIDR
-	DefaultVnetIPv6CIDR = "2001:1234:5678:9a00::/56"
-	// DefaultControlPlaneSubnetIPv6CIDR is the default Control Plane Subnet CIDR
-	DefaultControlPlaneSubnetIPv6CIDR = "2001:1234:5678:9abc::/64"
-	// DefaultNodeSubnetIPv6CIDR is the default Node Subnet CIDR
-	DefaultNodeSubnetIPv6CIDR = "2001:1234:5678:9abd::/64"
-	// DefaultInternalLBIPv6Address is the default internal load balancer ip address
-	DefaultInternalLBIPv6Address = "2001:1234:5678:9abc::100"
-)
-
 func (c *AzureCluster) setDefaults() {
 	c.setResourceGroupDefault()
 	c.setNetworkSpecDefaults()
@@ -137,15 +126,10 @@ func (c *AzureCluster) setAPIServerLBDefaults() {
 			lb.Name = generateInternalLBName(c.ObjectMeta.Name)
 		}
 		if len(lb.FrontendIPs) == 0 {
-			// for back compat, set the private IP to the subnet InternalLBIPAddress value.
-			privateIP := c.Spec.NetworkSpec.GetControlPlaneSubnet().InternalLBIPAddress
-			if privateIP == "" {
-				privateIP = DefaultInternalLBIPAddress
-			}
 			lb.FrontendIPs = []FrontendIP{
 				{
 					Name:             generateFrontendIPConfigName(lb.Name),
-					PrivateIPAddress: privateIP,
+					PrivateIPAddress: DefaultInternalLBIPAddress,
 				},
 			}
 		}

api/v1alpha3/azurecluster_default_test.go

@@ -199,7 +199,7 @@ func TestVnetDefaults(t *testing.T) {
 					ResourceGroup: "cluster-test",
 					NetworkSpec: NetworkSpec{
 						Vnet: VnetSpec{
-							CIDRBlocks: []string{DefaultVnetCIDR, DefaultVnetIPv6CIDR},
+							CIDRBlocks: []string{DefaultVnetCIDR, "2001:1234:5678:9a00::/56"},
 						},
 					},
 				},
@@ -214,7 +214,7 @@ func TestVnetDefaults(t *testing.T) {
 						Vnet: VnetSpec{
 							ResourceGroup: "cluster-test",
 							Name:          "cluster-test-vnet",
-							CIDRBlocks:    []string{DefaultVnetCIDR, DefaultVnetIPv6CIDR},
+							CIDRBlocks:    []string{DefaultVnetCIDR, "2001:1234:5678:9a00::/56"},
 						},
 					},
 				},
@@ -578,6 +578,41 @@ func TestAPIServerLBDefaults(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "internal lb",
+			cluster: &AzureCluster{
+				ObjectMeta: v1.ObjectMeta{
+					Name: "cluster-test",
+				},
+				Spec: AzureClusterSpec{
+					NetworkSpec: NetworkSpec{
+						APIServerLB: LoadBalancerSpec{
+							Type: Internal,
+						},
+					},
+				},
+			},
+			output: &AzureCluster{
+				ObjectMeta: v1.ObjectMeta{
+					Name: "cluster-test",
+				},
+				Spec: AzureClusterSpec{
+					NetworkSpec: NetworkSpec{
+						APIServerLB: LoadBalancerSpec{
+							Name: "cluster-test-internal-lb",
+							SKU:  SKUStandard,
+							FrontendIPs: []FrontendIP{
+								{
+									Name: "cluster-test-internal-lb-frontEnd",
+									PrivateIPAddress: DefaultInternalLBIPAddress,
+								},
+							},
+							Type: Internal,
+						},
+					},
+				},
+			},
+		},
 	}
 
 	for _, c := range cases {

api/v1alpha3/types.go

@@ -161,7 +161,7 @@ const (
 type LBType string
 
 const (
-	// Internal is the value for the Azure load b alancer internal type.
+	// Internal is the value for the Azure load balancer internal type.
 	Internal = LBType("Internal")
 	// Public is the value for the Azure load balancer public type.
 	Public = LBType("Public")

cloud/converters/loadbalancers.go

@@ -0,0 +1,31 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package converters
+
+import (
+	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network"
+	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
+)
+
+// SKUtoSDK converts infrav1.SKU into a network.LoadBalancerSkuName.
+func SKUtoSDK(src infrav1.SKU) network.LoadBalancerSkuName {
+	switch src {
+	case infrav1.SKUStandard:
+		return network.LoadBalancerSkuNameStandard
+	}
+	return ""
+}

cloud/scope/cluster.go

@@ -135,6 +135,7 @@ func (s *ClusterScope) LBSpecs() []azure.LBSpec {
 			FrontendIPConfigs: s.APIServerLB().FrontendIPs,
 			APIServerPort:     s.APIServerPort(),
 			Type:              s.APIServerLB().Type,
+			SKU:               infrav1.SKUStandard,
 			Role:              infrav1.APIServerRole,
 			BackendPoolName:   azure.GenerateBackendAddressPoolName(s.APIServerLB().Name),
 		},
@@ -150,6 +151,7 @@ func (s *ClusterScope) LBSpecs() []azure.LBSpec {
 				},
 			},
 			Type:            infrav1.Public,
+			SKU:             infrav1.SKUStandard,
 			BackendPoolName: azure.GenerateOutboundBackendAddressPoolName(s.NodeOutboundLBName()),
 			Role:            infrav1.NodeOutboundRole,
 		},
@@ -170,7 +172,8 @@ func (s *ClusterScope) LBSpecs() []azure.LBSpec {
 				},
 			},
 		},
-		Type:            infrav1.Public,
+		Type: infrav1.Public,
+		SKU:  infrav1.SKUStandard,
 		BackendPoolName: azure.GenerateOutboundBackendAddressPoolName(azure.GenerateControlPlaneOutboundLBName(s.ClusterName())),
 		Role:            infrav1.ControlPlaneOutboundRole,
 	})

cloud/services/loadbalancers/loadbalancers.go

@@ -37,7 +37,7 @@ func (s *Service) Reconcile(ctx context.Context) error {
 		}
 
 		lb := network.LoadBalancer{
-			Sku:      &network.LoadBalancerSku{Name: network.LoadBalancerSkuNameStandard},
+			Sku:      &network.LoadBalancerSku{Name: converters.SKUtoSDK(lbSpec.SKU)},
 			Location: to.StringPtr(s.Scope.Location()),
 			Tags: converters.TagsToMap(infrav1.Build(infrav1.BuildParams{
 				ClusterName: s.Scope.ClusterName(),

cloud/types.go

@@ -57,6 +57,7 @@ type LBSpec struct {
 	Name              string
 	Role              string
 	Type              infrav1.LBType
+	SKU               infrav1.SKU
 	SubnetName        string
 	BackendPoolName   string
 	FrontendIPConfigs []infrav1.FrontendIP