From da5618e66bb57994804ed171ecf235b041b955ba Mon Sep 17 00:00:00 2001 From: Eunsoo Park Date: Mon, 3 Sep 2018 16:25:11 +0900 Subject: [PATCH] Fixup openstack cloud provider loadbalancer deletion error This change enables ```getLoadBalancer``` to return the loadbalancer even if no floating ip is associated to the VIP port of the loadbalancer. Signed-off-by: Eunsoo Park --- .../providers/openstack/openstack_loadbalancer.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go index d958948458a..b4f3dee5438 100644 --- a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go +++ b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go @@ -474,10 +474,13 @@ func (lbaas *LbaasV2) GetLoadBalancer(ctx context.Context, clusterName string, s portID := loadbalancer.VipPortID if portID != "" { floatIP, err := getFloatingIPByPortID(lbaas.network, portID) - if err != nil { + if err != nil && err != ErrNotFound { return nil, false, fmt.Errorf("error getting floating ip for port %s: %v", portID, err) } - status.Ingress = []v1.LoadBalancerIngress{{IP: floatIP.FloatingIP}} + + if floatIP != nil { + status.Ingress = []v1.LoadBalancerIngress{{IP: floatIP.FloatingIP}} + } } else { status.Ingress = []v1.LoadBalancerIngress{{IP: loadbalancer.VipAddress}} }