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

Kubernetes Submit Queue · web-flow · commit c6c81bf5b4d1 · 2017-08-23T03:36:05.000-07:00
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
```
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -1116,7 +1116,7 @@ func (lbaas LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service v1.`
`1116`	`1116`	`return nil`
`1117`	`1117`	`}`
`1118`	`1118`
`1119`		`- if lbaas.opts.FloatingNetworkId != "" && loadbalancer != nil {`
	`1119`	`+ if loadbalancer != nil && loadbalancer.VipPortID != "" {`
`1120`	`1120`	`portID := loadbalancer.VipPortID`
`1121`	`1121`	`floatingIP, err := getFloatingIPByPortID(lbaas.network, portID)`
`1122`	`1122`	`if err != nil && err != ErrNotFound {`