Merge pull request #52611 from FengyunPan/missing-floatingip

Automatic merge from submit-queue (batch tested with PRs 52751, 52898, 52633, 52611, 52609). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Fix missing floatingip when calling GetLoadBalancer() If user specify floating-network-id, a floatingip and a vip will be assigned to LoadBalancer service, So its status contains a floatingip and a vip, but GetLoadBalancer() only return vip. **Release note**: ```release-note GetLoadBalancer() only return floatingip when user specify floating-network-id, or return LB vip. ```

Merge pull request #52611 from FengyunPan/missing-floatingip
1e364804 · Kubernetes Submit Queue · GitHub · 19af5de8 · 72963432 · 1e364804
Commit 1e364804 authored Sep 24, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 2 deletions

openstack_loadbalancer.go ...oudprovider/providers/openstack/openstack_loadbalancer.go +21 -2

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
@@ -538,7 +538,17 @@ func (lbaas *LbaasV2) GetLoadBalancer(clusterName string, service *v1.Service) (
 	}
 	status := &v1.LoadBalancerStatus{}
-	status.Ingress = []v1.LoadBalancerIngress{{IP: loadbalancer.VipAddress}}
+	portID := loadbalancer.VipPortID
+	if portID != "" {
+		floatIP, err := getFloatingIPByPortID(lbaas.network, portID)
+		if err != nil {
+			return nil, false, fmt.Errorf("Error getting floating ip for port %s: %v", portID, err)
+		}
+		status.Ingress = []v1.LoadBalancerIngress{{IP: floatIP.FloatingIP}}
+	} else {
+		status.Ingress = []v1.LoadBalancerIngress{{IP: loadbalancer.VipAddress}}
+	}
 	return status, true, err
 }
@@ -1289,7 +1299,16 @@ func (lb *LbaasV1) GetLoadBalancer(clusterName string, service *v1.Service) (*v1
 	}
 	status := &v1.LoadBalancerStatus{}
-	status.Ingress = []v1.LoadBalancerIngress{{IP: vip.Address}}
+	if vip.PortID != "" {
+		floatingIP, err := getFloatingIPByPortID(lb.network, vip.PortID)
+		if err != nil {
+			return nil, false, fmt.Errorf("Error getting floating ip for port %s: %v", vip.PortID, err)
+		}
+		status.Ingress = []v1.LoadBalancerIngress{{IP: floatingIP.FloatingIP}}
+	} else {
+		status.Ingress = []v1.LoadBalancerIngress{{IP: vip.Address}}
+	}
 	return status, true, err
 }