kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow kops delete instancegroup, even if ASG does not exist 

We probably shouldn't, but we delete the ASG when you `kops delete ig`.

If the ASG doesn't exist though, we can still delete the IG.
This commit is contained in:
Justin Santa Barbara 2016-12-18 17:31:32 -05:00
parent ef6d1fddf5
commit 0ef9d51586
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
upup/pkg/kutil/delete_instancegroup.go
View File

@ -18,6 +18,7 @@ package kutil
import (
"fmt"
"github.com/golang/glog"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/client/simple"
"k8s.io/kops/upup/pkg/fi"
@ -34,15 +35,18 @@ func (c *DeleteInstanceGroup) DeleteInstanceGroup(group *api.InstanceGroup) erro
groups, err := FindCloudInstanceGroups(c.Cloud, c.Cluster, []*api.InstanceGroup{group}, false, nil)
cig := groups[group.ObjectMeta.Name]
if cig == nil {
return fmt.Errorf("InstanceGroup not found in cloud")
}
if len(groups) != 1 {
return fmt.Errorf("Multiple InstanceGroup resources found in cloud")
}
glog.Warningf("AutoScalingGroup %q not found in cloud - skipping delete", group.ObjectMeta.Name)
} else {
if len(groups) != 1 {
return fmt.Errorf("Multiple InstanceGroup resources found in cloud")
}
err = cig.Delete(c.Cloud)
if err != nil {
return fmt.Errorf("error deleting cloud resources for InstanceGroup: %v", err)
glog.Infof("Deleting AutoScalingGroup %q", group.ObjectMeta.Name)
err = cig.Delete(c.Cloud)
if err != nil {
return fmt.Errorf("error deleting cloud resources for InstanceGroup: %v", err)
}
}
err = c.Clientset.InstanceGroups(c.Cluster.ObjectMeta.Name).Delete(group.ObjectMeta.Name, nil)