Clean up pkg/cloudprovider/providers/openstack.

These are based on recommendation from
[staticcheck](http://staticcheck.io/).
This commit is contained in:
Àbéjídé Àyodélé 2019-05-09 15:44:25 +00:00
parent 524169fe1c
commit 98db217737

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()