Merge pull request #50973 from FengyunPan/fix-legacy-floatingip

Automatic merge from submit-queue (batch tested with PRs 50229, 50973, 50976, 51085, 51084) Fix legacy floatingip Fix #50974 If user specify floating-network-id by annotation rather than cloud provider file, openstack cloud provider don't delete floatingip when deleting LoadBalancer service. **Release note**: ```release-note NONE ```

Merge pull request #50973 from FengyunPan/fix-legacy-floatingip
33821862 · Kubernetes Submit Queue · GitHub · 9cecb3b3 · e5b7f0e7 · 33821862
Commit 33821862 authored Aug 23, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

openstack_loadbalancer.go ...oudprovider/providers/openstack/openstack_loadbalancer.go +1 -1

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
@@ -1116,7 +1116,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
 		return nil
 	}

-	if lbaas.opts.FloatingNetworkId != "" && loadbalancer != nil {
+	if loadbalancer != nil && loadbalancer.VipPortID != "" {
 		portID := loadbalancer.VipPortID
 		floatingIP, err := getFloatingIPByPortID(lbaas.network, portID)
 		if err != nil && err != ErrNotFound {