Skip to content

Commit d469d77

Browse files
authored
Merge pull request #2677 from k8s-infra-cherrypick-robot/cherry-pick-2649-to-release-1.4
[release-1.4] Use webhook default name for node outbound lb
2 parents 52788de + 5c01016 commit d469d77

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

azure/scope/cluster.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ func (s *ClusterScope) LBSpecs() []azure.ResourceSpecGetter {
253253
// Node outbound LB
254254
if s.NodeOutboundLB() != nil {
255255
specs = append(specs, &loadbalancers.LBSpec{
256-
Name: s.NodeOutboundLBName(),
256+
Name: s.NodeOutboundLB().Name,
257257
ResourceGroup: s.ResourceGroup(),
258258
SubscriptionID: s.SubscriptionID(),
259259
ClusterName: s.ClusterName(),
@@ -263,7 +263,7 @@ func (s *ClusterScope) LBSpecs() []azure.ResourceSpecGetter {
263263
FrontendIPConfigs: s.NodeOutboundLB().FrontendIPs,
264264
Type: s.NodeOutboundLB().Type,
265265
SKU: s.NodeOutboundLB().SKU,
266-
BackendPoolName: s.OutboundPoolName(s.NodeOutboundLBName()),
266+
BackendPoolName: s.OutboundPoolName(s.NodeOutboundLB().Name),
267267
IdleTimeoutInMinutes: s.NodeOutboundLB().IdleTimeoutInMinutes,
268268
Role: infrav1.NodeOutboundRole,
269269
AdditionalTags: s.AdditionalTags(),
@@ -675,11 +675,6 @@ func (s *ClusterScope) APIServerLBPoolName(loadBalancerName string) string {
675675
return azure.GenerateBackendAddressPoolName(loadBalancerName)
676676
}
677677

678-
// NodeOutboundLBName returns the name of the node outbound LB.
679-
func (s *ClusterScope) NodeOutboundLBName() string {
680-
return s.ClusterName()
681-
}
682-
683678
// OutboundLBName returns the name of the outbound LB.
684679
func (s *ClusterScope) OutboundLBName(role string) string {
685680
if role == infrav1.Node {

0 commit comments

Comments
 (0)