Merge pull request #127 from cwize1/user/chrisgun/RemoveLBWorkaround

cwize1 · web-flow · commit ad73f8eb1728 · 2021-05-18T13:16:07.000-07:00
Remove load balancer workaround for bare metal.
diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go
@@ -192,9 +192,7 @@ func (s *ClusterScope) APIServerPort() int32 {
 }
 
 func (s *ClusterScope) AzureStackHCILoadBalancer() *infrav1.AzureStackHCILoadBalancerSpec {
-	// Disable the load balancer for baremetal machine scenarios
-	// return s.AzureStackHCICluster.Spec.AzureStackHCILoadBalancer
-	return nil
+	return s.AzureStackHCICluster.Spec.AzureStackHCILoadBalancer
 }
 
 // GetNamespaceOrDefault returns the default namespace if given empty

Original file line number	Diff line number	Diff line change
`@@ -192,9 +192,7 @@ func (s *ClusterScope) APIServerPort() int32 {`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`func (s ClusterScope) AzureStackHCILoadBalancer() infrav1.AzureStackHCILoadBalancerSpec {`
`195`		`- // Disable the load balancer for baremetal machine scenarios`
`196`		`- // return s.AzureStackHCICluster.Spec.AzureStackHCILoadBalancer`
`197`		`- return nil`
	`195`	`+ return s.AzureStackHCICluster.Spec.AzureStackHCILoadBalancer`
`198`	`196`	`}`
`199`	`197`
`200`	`198`	`// GetNamespaceOrDefault returns the default namespace if given empty`