Merge pull request #914 from Evalle/ISSUE-908

Change AzureManagedCluster LoadBalancerSKU values to Uppercase

Author: k8s-ci-robot

cloud/services/managedclusters/managedclusters.go

@@ -49,7 +49,7 @@ type Spec struct {
 	// Version defines the desired Kubernetes version.
 	Version string
 
-	// LoadBalancerSKU for the managed cluster. Possible values include: 'standard', 'basic'. Defaults to standard.
+	// LoadBalancerSKU for the managed cluster. Possible values include: 'Standard', 'Basic'. Defaults to Standard.
 	LoadBalancerSKU string
 
 	// NetworkPlugin used for building Kubernetes network. Possible values include: 'azure', 'kubenet'. Defaults to azure.

config/crd/bases/exp.infrastructure.cluster.x-k8s.io_azuremanagedcontrolplanes.yaml

@@ -82,8 +82,8 @@ spec:
                 description: LoadBalancerSKU is the SKU of the loadBalancer to be
                   provisioned.
                 enum:
-                - basic
-                - standard
+                - Basic
+                - Standard
                 type: string
               location:
                 description: 'Location is a string matching one of the canonical Azure

controllers/helpers.go

@@ -226,7 +226,7 @@ func newCloudProviderConfig(d azure.ClusterDescriber) *CloudProviderConfig {
 		VnetResourceGroup:            d.Vnet().ResourceGroup,
 		SubnetName:                   d.NodeSubnet().Name,
 		RouteTableName:               fmt.Sprintf("%s-node-routetable", d.ClusterName()),
-		LoadBalancerSku:              "standard",
+		LoadBalancerSku:              "Standard",
 		MaximumLoadBalancerRuleCount: 250,
 		UseManagedIdentityExtension:  false,
 		UseInstanceMetadata:          true,

controllers/helpers_test.go

@@ -290,7 +290,7 @@ const (
     "vnetResourceGroup": "bar",
     "subnetName": "foo-node-subnet",
     "routeTableName": "foo-node-routetable",
-    "loadBalancerSku": "standard",
+    "loadBalancerSku": "Standard",
     "maximumLoadBalancerRuleCount": 250,
     "useManagedIdentityExtension": false,
     "useInstanceMetadata": true,
@@ -312,7 +312,7 @@ const (
     "vnetResourceGroup": "bar",
     "subnetName": "foo-node-subnet",
     "routeTableName": "foo-node-routetable",
-    "loadBalancerSku": "standard",
+    "loadBalancerSku": "Standard",
     "maximumLoadBalancerRuleCount": 250,
     "useManagedIdentityExtension": true,
     "useInstanceMetadata": true,
@@ -334,7 +334,7 @@ const (
     "vnetResourceGroup": "bar",
     "subnetName": "foo-node-subnet",
     "routeTableName": "foo-node-routetable",
-    "loadBalancerSku": "standard",
+    "loadBalancerSku": "Standard",
     "maximumLoadBalancerRuleCount": 250,
     "useManagedIdentityExtension": true,
     "useInstanceMetadata": true,

docs/book/src/topics/machinepools.md

@@ -113,7 +113,7 @@ spec:
         "vnetResourceGroup": "capz",
         "subnetName": "capz-node-subnet",
         "routeTableName": "capz-node-routetable",
-        "loadBalancerSku": "standard",
+        "loadBalancerSku": "Standard",
         "maximumLoadBalancerRuleCount": 250,
         "useManagedIdentityExtension": false,
         "useInstanceMetadata": true

docs/book/src/topics/managedcluster.md

@@ -157,6 +157,6 @@ Current limitations
     https://github.com/kubernetes-sigs/cluster-api-provider-azure/issues/612
 - Only supports system managed identities.
   - We would like to support user managed identities where appropriate.
-- Only supports standard load balancer (SLB).
-  - We will not support basic load balancer in CAPZ. SLB is generally
+- Only supports Standard load balancer (SLB).
+  - We will not support Basic load balancer in CAPZ. SLB is generally
     the path forward in Azure.

exp/api/v1alpha3/azuremanagedcontrolplane_types.go

@@ -70,7 +70,7 @@ type AzureManagedControlPlaneSpec struct {
 	DNSServiceIP *string `json:"dnsServiceIP,omitempty"`
 
 	// LoadBalancerSKU is the SKU of the loadBalancer to be provisioned.
-	// +kubebuilder:validation:Enum=basic;standard
+	// +kubebuilder:validation:Enum=Basic;Standard
 	// +optional
 	LoadBalancerSKU *string `json:"loadBalancerSKU,omitempty"`
 }

exp/api/v1alpha3/azuremanagedcontrolplane_webhook.go

@@ -48,7 +48,7 @@ func (r *AzureManagedControlPlane) Default() {
 		r.Spec.NetworkPlugin = &networkPlugin
 	}
 	if r.Spec.LoadBalancerSKU == nil {
-		loadBalancerSKU := "standard"
+		loadBalancerSKU := "Standard"
 		r.Spec.LoadBalancerSKU = &loadBalancerSKU
 	}
 	if r.Spec.NetworkPolicy == nil {

exp/api/v1alpha3/azuremanagedcontrolplane_webhook_test.go

@@ -30,12 +30,12 @@ func TestDefaultingWebhook(t *testing.T) {
 	amcp := &AzureManagedControlPlane{}
 	amcp.Default()
 	g.Expect(*amcp.Spec.NetworkPlugin).To(Equal("azure"))
-	g.Expect(*amcp.Spec.LoadBalancerSKU).To(Equal("standard"))
+	g.Expect(*amcp.Spec.LoadBalancerSKU).To(Equal("Standard"))
 	g.Expect(*amcp.Spec.NetworkPolicy).To(Equal("calico"))
 
 	t.Logf("Testing amcp defaulting webhook with baseline")
 	netPlug := "kubenet"
-	lbSKU := "basic"
+	lbSKU := "Basic"
 	netPol := "azure"
 	amcp.Spec.NetworkPlugin = &netPlug
 	amcp.Spec.LoadBalancerSKU = &lbSKU