github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix legacy floatingip

Browse Source 
If user specify floating-network-id by annotation rather than cloud
provider file, openstack cloud provider don't delete floatingip when
deleting LoadBalancer service.
This commit is contained in:
FengyunPan
2017-08-21 07:45:52 +08:00
parent e633a1604f
commit e5b7f0e7ba
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1116,7 +1116,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
return nil return nil
} }
if lbaas.opts.FloatingNetworkId != "" && loadbalancer != nil { if loadbalancer != nil && loadbalancer.VipPortID != "" {
portID := loadbalancer.VipPortID portID := loadbalancer.VipPortID
floatingIP, err := getFloatingIPByPortID(lbaas.network, portID) floatingIP, err := getFloatingIPByPortID(lbaas.network, portID)
if err != nil && err != ErrNotFound { if err != nil && err != ErrNotFound {