github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues 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
commit dbd3f5b7c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
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,17 +929,15 @@ 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() if err != nil && !isNotFound(err) {
if err != nil && !isNotFound(err) { return nil, fmt.Errorf("error deleting obsolete member %s for pool %s address %s: %v", member.ID, pool.ID, member.Address, err)
return nil, fmt.Errorf("error deleting obsolete member %s for pool %s address %s: %v", member.ID, pool.ID, member.Address, err) }
} provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID)
provisioningStatus, err := waitLoadbalancerActiveProvisioningStatus(lbaas.lb, loadbalancer.ID) if err != nil {
if err != nil { 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)