Merge pull request #755 from jsen-/master

k8s-ci-robot · web-flow · commit 437e82faec1f · 2021-02-24T22:59:24.000-08:00
🐛 use APIServerFloatingIP instead of ControlPlaneEndpoint.Host for LB
diff --git a/pkg/cloud/services/loadbalancer/loadbalancer.go b/pkg/cloud/services/loadbalancer/loadbalancer.go
@@ -71,7 +71,11 @@ func (s *Service) ReconcileLoadBalancer(clusterName string, openStackCluster *in
 		}
 	}
 
-	fp, err := s.networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster.Spec.ControlPlaneEndpoint.Host)
+	fip := openStackCluster.Spec.ControlPlaneEndpoint.Host
+	if openStackCluster.Spec.APIServerFloatingIP != "" {
+		fip = openStackCluster.Spec.APIServerFloatingIP
+	}
+	fp, err := s.networkingService.GetOrCreateFloatingIP(openStackCluster, fip)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,11 @@ func (s Service) ReconcileLoadBalancer(clusterName string, openStackCluster in`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- fp, err := s.networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster.Spec.ControlPlaneEndpoint.Host)`
	`74`	`+ fip := openStackCluster.Spec.ControlPlaneEndpoint.Host`
	`75`	`+ if openStackCluster.Spec.APIServerFloatingIP != "" {`
	`76`	`+ fip = openStackCluster.Spec.APIServerFloatingIP`
	`77`	`+ }`
	`78`	`+ fp, err := s.networkingService.GetOrCreateFloatingIP(openStackCluster, fip)`
`75`	`79`	`if err != nil {`
`76`	`80`	`return err`
`77`	`81`	`}`