github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix missing floatingip when calling GetLoadBalancer()

Browse Source 
If user specify floating-network-id, a floatingip be assigned to
LoadBalancer service, So its status contains a floatingip, but
GetLoadBalancer() only return vip.
This commit is contained in:
FengyunPan 2017-09-19 11:09:13 +08:00
parent 1a44e26670
commit 729634323d
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View File

@ -536,7 +536,17 @@ func (lbaas *LbaasV2) GetLoadBalancer(clusterName string, service *v1.Service) (
} }
status := &v1.LoadBalancerStatus{} 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 return status, true, err
} }
@ -1287,7 +1297,16 @@ func (lb *LbaasV1) GetLoadBalancer(clusterName string, service *v1.Service) (*v1
} }
status := &v1.LoadBalancerStatus{} 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 return status, true, err
} }