Skip to content

Commit 08a9097

Browse files
authored
Merge pull request #3059 from sonasingh46/fix_outboundlb
use outboundlb name as the lb name in cloud config
2 parents 6830017 + 88a00d6 commit 08a9097

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

controllers/helpers.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ func newCloudProviderConfig(d azure.ClusterScoper) (controlPlaneConfig *CloudPro
272272
SubnetName: subnet.Name,
273273
RouteTableName: subnet.RouteTable.Name,
274274
LoadBalancerSku: "Standard",
275+
LoadBalancerName: d.OutboundLBName(infrav1.Node),
275276
MaximumLoadBalancerRuleCount: 250,
276277
UseManagedIdentityExtension: false,
277278
UseInstanceMetadata: true,
@@ -292,6 +293,7 @@ func newCloudProviderConfig(d azure.ClusterScoper) (controlPlaneConfig *CloudPro
292293
SubnetName: subnet.Name,
293294
RouteTableName: subnet.RouteTable.Name,
294295
LoadBalancerSku: "Standard",
296+
LoadBalancerName: d.OutboundLBName(infrav1.Node),
295297
MaximumLoadBalancerRuleCount: 250,
296298
UseManagedIdentityExtension: false,
297299
UseInstanceMetadata: true,
@@ -325,6 +327,7 @@ type CloudProviderConfig struct {
325327
SubnetName string `json:"subnetName"`
326328
RouteTableName string `json:"routeTableName"`
327329
LoadBalancerSku string `json:"loadBalancerSku"`
330+
LoadBalancerName string `json:"loadBalancerName"`
328331
MaximumLoadBalancerRuleCount int `json:"maximumLoadBalancerRuleCount"`
329332
UseManagedIdentityExtension bool `json:"useManagedIdentityExtension"`
330333
UseInstanceMetadata bool `json:"useInstanceMetadata"`

controllers/helpers_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,7 @@ const (
484484
"subnetName": "foo-node-subnet",
485485
"routeTableName": "foo-node-routetable",
486486
"loadBalancerSku": "Standard",
487+
"loadBalancerName": "foo",
487488
"maximumLoadBalancerRuleCount": 250,
488489
"useManagedIdentityExtension": false,
489490
"useInstanceMetadata": true
@@ -505,6 +506,7 @@ const (
505506
"subnetName": "foo-node-subnet",
506507
"routeTableName": "foo-node-routetable",
507508
"loadBalancerSku": "Standard",
509+
"loadBalancerName": "foo",
508510
"maximumLoadBalancerRuleCount": 250,
509511
"useManagedIdentityExtension": false,
510512
"useInstanceMetadata": true
@@ -524,6 +526,7 @@ const (
524526
"subnetName": "foo-node-subnet",
525527
"routeTableName": "foo-node-routetable",
526528
"loadBalancerSku": "Standard",
529+
"loadBalancerName": "foo",
527530
"maximumLoadBalancerRuleCount": 250,
528531
"useManagedIdentityExtension": true,
529532
"useInstanceMetadata": true
@@ -542,6 +545,7 @@ const (
542545
"subnetName": "foo-node-subnet",
543546
"routeTableName": "foo-node-routetable",
544547
"loadBalancerSku": "Standard",
548+
"loadBalancerName": "foo",
545549
"maximumLoadBalancerRuleCount": 250,
546550
"useManagedIdentityExtension": true,
547551
"useInstanceMetadata": true
@@ -561,6 +565,7 @@ const (
561565
"subnetName": "foo-node-subnet",
562566
"routeTableName": "foo-node-routetable",
563567
"loadBalancerSku": "Standard",
568+
"loadBalancerName": "foo",
564569
"maximumLoadBalancerRuleCount": 250,
565570
"useManagedIdentityExtension": true,
566571
"useInstanceMetadata": true,
@@ -580,6 +585,7 @@ const (
580585
"subnetName": "foo-node-subnet",
581586
"routeTableName": "foo-node-routetable",
582587
"loadBalancerSku": "Standard",
588+
"loadBalancerName": "foo",
583589
"maximumLoadBalancerRuleCount": 250,
584590
"useManagedIdentityExtension": true,
585591
"useInstanceMetadata": true,
@@ -601,6 +607,7 @@ const (
601607
"subnetName": "foo-node-subnet",
602608
"routeTableName": "foo-node-routetable",
603609
"loadBalancerSku": "Standard",
610+
"loadBalancerName": "foo",
604611
"maximumLoadBalancerRuleCount": 250,
605612
"useManagedIdentityExtension": false,
606613
"useInstanceMetadata": true
@@ -621,6 +628,7 @@ const (
621628
"subnetName": "foo-node-subnet",
622629
"routeTableName": "foo-node-routetable",
623630
"loadBalancerSku": "Standard",
631+
"loadBalancerName": "foo",
624632
"maximumLoadBalancerRuleCount": 250,
625633
"useManagedIdentityExtension": false,
626634
"useInstanceMetadata": true
@@ -641,6 +649,7 @@ const (
641649
"subnetName": "foo-node-subnet",
642650
"routeTableName": "foo-node-routetable",
643651
"loadBalancerSku": "Standard",
652+
"loadBalancerName": "foo",
644653
"maximumLoadBalancerRuleCount": 250,
645654
"useManagedIdentityExtension": false,
646655
"useInstanceMetadata": true,
@@ -666,6 +675,7 @@ const (
666675
"subnetName": "foo-node-subnet",
667676
"routeTableName": "foo-node-routetable",
668677
"loadBalancerSku": "Standard",
678+
"loadBalancerName": "foo",
669679
"maximumLoadBalancerRuleCount": 250,
670680
"useManagedIdentityExtension": false,
671681
"useInstanceMetadata": true,
@@ -691,6 +701,7 @@ const (
691701
"subnetName": "foo-node-subnet",
692702
"routeTableName": "foo-node-routetable",
693703
"loadBalancerSku": "Standard",
704+
"loadBalancerName": "foo",
694705
"maximumLoadBalancerRuleCount": 250,
695706
"useManagedIdentityExtension": false,
696707
"useInstanceMetadata": true,
@@ -716,6 +727,7 @@ const (
716727
"subnetName": "foo-node-subnet",
717728
"routeTableName": "foo-node-routetable",
718729
"loadBalancerSku": "Standard",
730+
"loadBalancerName": "foo",
719731
"maximumLoadBalancerRuleCount": 250,
720732
"useManagedIdentityExtension": false,
721733
"useInstanceMetadata": true,

0 commit comments

Comments
 (0)