scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77673 from bjhaid/cleanup_pkg_cloudprovider_providers_openstack

Browse Source 
Clean up pkg/cloudprovider/providers/openstack.
This commit is contained in:
Kubernetes Prow Robot
2019-06-14 00:28:34 -07:00
committed by GitHub
parent 042b0d7e60 98db217737
commit dbd3f5b7c5
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -893,7 +893,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err) return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
} }
monitorID = monitor.ID monitorID = monitor.ID
} else if lbaas.opts.CreateMonitor == false { } else if !lbaas.opts.CreateMonitor {
klog.V(4).Infof("Do not create monitor for pool %s when create-monitor is false", pool.ID) klog.V(4).Infof("Do not create monitor for pool %s when create-monitor is false", pool.ID)
} }
@@ -929,7 +929,6 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string
if err != nil && !isNotFound(err) { if err != nil && !isNotFound(err) {
return nil, fmt.Errorf("error getting members for pool %s: %v", pool.ID, err) return nil, fmt.Errorf("error getting members for pool %s: %v", pool.ID, err)
} }
if members != nil {
for _, member := range members { for _, member := range members {
klog.V(4).Infof("Deleting obsolete member %s for pool %s address %s", member.ID, pool.ID, member.Address) klog.V(4).Infof("Deleting obsolete member %s for pool %s address %s", member.ID, pool.ID, member.Address)
err := v2pools.DeleteMember(lbaas.lb, pool.ID, member.ID).ExtractErr() err := v2pools.DeleteMember(lbaas.lb, pool.ID, member.ID).ExtractErr()
@@ -941,7 +940,6 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string
return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err) return nil, fmt.Errorf("failed to loadbalance ACTIVE provisioning status %v: %v", provisioningStatus, err)
} }
} }
}
klog.V(4).Infof("Deleting obsolete pool %s for listener %s", pool.ID, listener.ID) klog.V(4).Infof("Deleting obsolete pool %s for listener %s", pool.ID, listener.ID)
// delete pool // delete pool
err = v2pools.Delete(lbaas.lb, pool.ID).ExtractErr() err = v2pools.Delete(lbaas.lb, pool.ID).ExtractErr()