Skip to content

Commit 995da71

Browse files
committed
Change AzureManagedCluster LoadBalancerSKU values to Uppercase
1 parent a86fec3 commit 995da71

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

cloud/services/managedclusters/managedclusters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type Spec struct {
4949
// Version defines the desired Kubernetes version.
5050
Version string
5151

52-
// LoadBalancerSKU for the managed cluster. Possible values include: 'standard', 'basic'. Defaults to standard.
52+
// LoadBalancerSKU for the managed cluster. Possible values include: 'Standard', 'Basic'. Defaults to Standard.
5353
LoadBalancerSKU string
5454

5555
// 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ spec:
8282
description: LoadBalancerSKU is the SKU of the loadBalancer to be
8383
provisioned.
8484
enum:
85-
- basic
86-
- standard
85+
- Basic
86+
- Standard
8787
type: string
8888
location:
8989
description: 'Location is a string matching one of the canonical Azure

controllers/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func newCloudProviderConfig(d azure.ClusterDescriber) *CloudProviderConfig {
226226
VnetResourceGroup: d.Vnet().ResourceGroup,
227227
SubnetName: d.NodeSubnet().Name,
228228
RouteTableName: fmt.Sprintf("%s-node-routetable", d.ClusterName()),
229-
LoadBalancerSku: "standard",
229+
LoadBalancerSku: "Standard",
230230
MaximumLoadBalancerRuleCount: 250,
231231
UseManagedIdentityExtension: false,
232232
UseInstanceMetadata: true,

controllers/helpers_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ const (
290290
"vnetResourceGroup": "bar",
291291
"subnetName": "foo-node-subnet",
292292
"routeTableName": "foo-node-routetable",
293-
"loadBalancerSku": "standard",
293+
"loadBalancerSku": "Standard",
294294
"maximumLoadBalancerRuleCount": 250,
295295
"useManagedIdentityExtension": false,
296296
"useInstanceMetadata": true,
@@ -312,7 +312,7 @@ const (
312312
"vnetResourceGroup": "bar",
313313
"subnetName": "foo-node-subnet",
314314
"routeTableName": "foo-node-routetable",
315-
"loadBalancerSku": "standard",
315+
"loadBalancerSku": "Standard",
316316
"maximumLoadBalancerRuleCount": 250,
317317
"useManagedIdentityExtension": true,
318318
"useInstanceMetadata": true,
@@ -334,7 +334,7 @@ const (
334334
"vnetResourceGroup": "bar",
335335
"subnetName": "foo-node-subnet",
336336
"routeTableName": "foo-node-routetable",
337-
"loadBalancerSku": "standard",
337+
"loadBalancerSku": "Standard",
338338
"maximumLoadBalancerRuleCount": 250,
339339
"useManagedIdentityExtension": true,
340340
"useInstanceMetadata": true,

docs/book/src/topics/machinepools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ spec:
113113
"vnetResourceGroup": "capz",
114114
"subnetName": "capz-node-subnet",
115115
"routeTableName": "capz-node-routetable",
116-
"loadBalancerSku": "standard",
116+
"loadBalancerSku": "Standard",
117117
"maximumLoadBalancerRuleCount": 250,
118118
"useManagedIdentityExtension": false,
119119
"useInstanceMetadata": true

docs/book/src/topics/managedcluster.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,6 @@ Current limitations
157157
https://github.com/kubernetes-sigs/cluster-api-provider-azure/issues/612
158158
- Only supports system managed identities.
159159
- We would like to support user managed identities where appropriate.
160-
- Only supports standard load balancer (SLB).
161-
- We will not support basic load balancer in CAPZ. SLB is generally
160+
- Only supports Standard load balancer (SLB).
161+
- We will not support Basic load balancer in CAPZ. SLB is generally
162162
the path forward in Azure.

exp/api/v1alpha3/azuremanagedcontrolplane_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ type AzureManagedControlPlaneSpec struct {
7070
DNSServiceIP *string `json:"dnsServiceIP,omitempty"`
7171

7272
// LoadBalancerSKU is the SKU of the loadBalancer to be provisioned.
73-
// +kubebuilder:validation:Enum=basic;standard
73+
// +kubebuilder:validation:Enum=Basic;Standard
7474
// +optional
7575
LoadBalancerSKU *string `json:"loadBalancerSKU,omitempty"`
7676
}

exp/api/v1alpha3/azuremanagedcontrolplane_webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (r *AzureManagedControlPlane) Default() {
4848
r.Spec.NetworkPlugin = &networkPlugin
4949
}
5050
if r.Spec.LoadBalancerSKU == nil {
51-
loadBalancerSKU := "standard"
51+
loadBalancerSKU := "Standard"
5252
r.Spec.LoadBalancerSKU = &loadBalancerSKU
5353
}
5454
if r.Spec.NetworkPolicy == nil {

exp/api/v1alpha3/azuremanagedcontrolplane_webhook_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ func TestDefaultingWebhook(t *testing.T) {
3030
amcp := &AzureManagedControlPlane{}
3131
amcp.Default()
3232
g.Expect(*amcp.Spec.NetworkPlugin).To(Equal("azure"))
33-
g.Expect(*amcp.Spec.LoadBalancerSKU).To(Equal("standard"))
33+
g.Expect(*amcp.Spec.LoadBalancerSKU).To(Equal("Standard"))
3434
g.Expect(*amcp.Spec.NetworkPolicy).To(Equal("calico"))
3535

3636
t.Logf("Testing amcp defaulting webhook with baseline")
3737
netPlug := "kubenet"
38-
lbSKU := "basic"
38+
lbSKU := "Basic"
3939
netPol := "azure"
4040
amcp.Spec.NetworkPlugin = &netPlug
4141
amcp.Spec.LoadBalancerSKU = &lbSKU

0 commit comments

Comments
 (0)