github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22784 from justinsb/fix_17626

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-11 20:04:13 -08:00
commit 26e309c753
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/cloudprovider/providers/aws/aws.go
View File

@ -2496,7 +2496,7 @@ func (s *AWSCloud) EnsureLoadBalancerDeleted(name, region string) error {
} }
// Loop through and try to delete them // Loop through and try to delete them
timeoutAt := time.Now().Add(time.Second * 300) timeoutAt := time.Now().Add(time.Second * 600)
for { for {
for securityGroupID := range securityGroupIDs { for securityGroupID := range securityGroupIDs {
request := &ec2.DeleteSecurityGroupInput{} request := &ec2.DeleteSecurityGroupInput{}
@ -2524,12 +2524,17 @@ func (s *AWSCloud) EnsureLoadBalancerDeleted(name, region string) error {
} }
if time.Now().After(timeoutAt) { if time.Now().After(timeoutAt) {
return fmt.Errorf("timed out waiting for load-balancer deletion: %s", name) ids := []string{}
for id := range securityGroupIDs {
ids = append(ids, id)
}
return fmt.Errorf("timed out deleting ELB: %s. Could not delete security groups %v", name, strings.Join(ids, ","))
} }
glog.V(2).Info("Waiting for load-balancer to delete so we can delete security groups: ", name) glog.V(2).Info("Waiting for load-balancer to delete so we can delete security groups: ", name)
time.Sleep(5 * time.Second) time.Sleep(10 * time.Second)
} }
} }