Merge pull request #32290 from zhouhaibing089/lbaasv1-fix

Automatic merge from submit-queue delete the member before delete the pool fixes https://github.com/kubernetes/kubernetes/issues/32285. it is necessary to delete members before delete the pool.

Merge pull request #32290 from zhouhaibing089/lbaasv1-fix
f7bea5d8 · Kubernetes Submit Queue · GitHub · 630c7532 · fa5551b8 · f7bea5d8
Commit f7bea5d8 authored Sep 13, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

openstack_loadbalancer.go ...oudprovider/providers/openstack/openstack_loadbalancer.go +6 -0

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
@@ -1054,6 +1054,12 @@ func (lb *LbaasV1) EnsureLoadBalancerDeleted(clusterName string, service *api.Se
 				return err
 			}
 		}
+		for _, memberId := range pool.MemberIDs {
+			err = members.Delete(lb.network, memberId).ExtractErr()
+			if err != nil && !isNotFound(err) {
+				return err
+			}
+		}
 		err = pools.Delete(lb.network, pool.ID).ExtractErr()
 		if err != nil && !isNotFound(err) {
 			return err