Skip to content

Commit c009aa1

Browse files
authored
Merge pull request #3152 from k8s-infra-cherrypick-robot/cherry-pick-3059-to-release-1.7
[release-1.7] use outboundlb name as the lb name in cloud config
2 parents 741a29d + 5e4460d commit c009aa1

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
@@ -271,6 +271,7 @@ func newCloudProviderConfig(d azure.ClusterScoper) (controlPlaneConfig *CloudPro
271271
SubnetName: subnet.Name,
272272
RouteTableName: subnet.RouteTable.Name,
273273
LoadBalancerSku: "Standard",
274+
LoadBalancerName: d.OutboundLBName(infrav1.Node),
274275
MaximumLoadBalancerRuleCount: 250,
275276
UseManagedIdentityExtension: false,
276277
UseInstanceMetadata: true,
@@ -291,6 +292,7 @@ func newCloudProviderConfig(d azure.ClusterScoper) (controlPlaneConfig *CloudPro
291292
SubnetName: subnet.Name,
292293
RouteTableName: subnet.RouteTable.Name,
293294
LoadBalancerSku: "Standard",
295+
LoadBalancerName: d.OutboundLBName(infrav1.Node),
294296
MaximumLoadBalancerRuleCount: 250,
295297
UseManagedIdentityExtension: false,
296298
UseInstanceMetadata: true,
@@ -324,6 +326,7 @@ type CloudProviderConfig struct {
324326
SubnetName string `json:"subnetName"`
325327
RouteTableName string `json:"routeTableName"`
326328
LoadBalancerSku string `json:"loadBalancerSku"`
329+
LoadBalancerName string `json:"loadBalancerName"`
327330
MaximumLoadBalancerRuleCount int `json:"maximumLoadBalancerRuleCount"`
328331
UseManagedIdentityExtension bool `json:"useManagedIdentityExtension"`
329332
UseInstanceMetadata bool `json:"useInstanceMetadata"`

controllers/helpers_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ const (
475475
"subnetName": "foo-node-subnet",
476476
"routeTableName": "foo-node-routetable",
477477
"loadBalancerSku": "Standard",
478+
"loadBalancerName": "foo",
478479
"maximumLoadBalancerRuleCount": 250,
479480
"useManagedIdentityExtension": false,
480481
"useInstanceMetadata": true
@@ -496,6 +497,7 @@ const (
496497
"subnetName": "foo-node-subnet",
497498
"routeTableName": "foo-node-routetable",
498499
"loadBalancerSku": "Standard",
500+
"loadBalancerName": "foo",
499501
"maximumLoadBalancerRuleCount": 250,
500502
"useManagedIdentityExtension": false,
501503
"useInstanceMetadata": true
@@ -515,6 +517,7 @@ const (
515517
"subnetName": "foo-node-subnet",
516518
"routeTableName": "foo-node-routetable",
517519
"loadBalancerSku": "Standard",
520+
"loadBalancerName": "foo",
518521
"maximumLoadBalancerRuleCount": 250,
519522
"useManagedIdentityExtension": true,
520523
"useInstanceMetadata": true
@@ -533,6 +536,7 @@ const (
533536
"subnetName": "foo-node-subnet",
534537
"routeTableName": "foo-node-routetable",
535538
"loadBalancerSku": "Standard",
539+
"loadBalancerName": "foo",
536540
"maximumLoadBalancerRuleCount": 250,
537541
"useManagedIdentityExtension": true,
538542
"useInstanceMetadata": true
@@ -552,6 +556,7 @@ const (
552556
"subnetName": "foo-node-subnet",
553557
"routeTableName": "foo-node-routetable",
554558
"loadBalancerSku": "Standard",
559+
"loadBalancerName": "foo",
555560
"maximumLoadBalancerRuleCount": 250,
556561
"useManagedIdentityExtension": true,
557562
"useInstanceMetadata": true,
@@ -571,6 +576,7 @@ const (
571576
"subnetName": "foo-node-subnet",
572577
"routeTableName": "foo-node-routetable",
573578
"loadBalancerSku": "Standard",
579+
"loadBalancerName": "foo",
574580
"maximumLoadBalancerRuleCount": 250,
575581
"useManagedIdentityExtension": true,
576582
"useInstanceMetadata": true,
@@ -592,6 +598,7 @@ const (
592598
"subnetName": "foo-node-subnet",
593599
"routeTableName": "foo-node-routetable",
594600
"loadBalancerSku": "Standard",
601+
"loadBalancerName": "foo",
595602
"maximumLoadBalancerRuleCount": 250,
596603
"useManagedIdentityExtension": false,
597604
"useInstanceMetadata": true
@@ -612,6 +619,7 @@ const (
612619
"subnetName": "foo-node-subnet",
613620
"routeTableName": "foo-node-routetable",
614621
"loadBalancerSku": "Standard",
622+
"loadBalancerName": "foo",
615623
"maximumLoadBalancerRuleCount": 250,
616624
"useManagedIdentityExtension": false,
617625
"useInstanceMetadata": true
@@ -632,6 +640,7 @@ const (
632640
"subnetName": "foo-node-subnet",
633641
"routeTableName": "foo-node-routetable",
634642
"loadBalancerSku": "Standard",
643+
"loadBalancerName": "foo",
635644
"maximumLoadBalancerRuleCount": 250,
636645
"useManagedIdentityExtension": false,
637646
"useInstanceMetadata": true,
@@ -657,6 +666,7 @@ const (
657666
"subnetName": "foo-node-subnet",
658667
"routeTableName": "foo-node-routetable",
659668
"loadBalancerSku": "Standard",
669+
"loadBalancerName": "foo",
660670
"maximumLoadBalancerRuleCount": 250,
661671
"useManagedIdentityExtension": false,
662672
"useInstanceMetadata": true,
@@ -682,6 +692,7 @@ const (
682692
"subnetName": "foo-node-subnet",
683693
"routeTableName": "foo-node-routetable",
684694
"loadBalancerSku": "Standard",
695+
"loadBalancerName": "foo",
685696
"maximumLoadBalancerRuleCount": 250,
686697
"useManagedIdentityExtension": false,
687698
"useInstanceMetadata": true,
@@ -707,6 +718,7 @@ const (
707718
"subnetName": "foo-node-subnet",
708719
"routeTableName": "foo-node-routetable",
709720
"loadBalancerSku": "Standard",
721+
"loadBalancerName": "foo",
710722
"maximumLoadBalancerRuleCount": 250,
711723
"useManagedIdentityExtension": false,
712724
"useInstanceMetadata": true,

0 commit comments

Comments
 (0)