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

fixed swallowed errors under pkg subdirectory.

This commit is contained in:
Lars Lehtonen 2017-07-15 13:49:17 -07:00
parent 3538fe1084
commit 1da7d66fd1
No known key found for this signature in database
GPG Key ID: 8137D474EBCB04F2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/instancegroups/instancegroups.go
View File

@ -103,6 +103,9 @@ type DeleteInstanceGroup struct {
func (c *DeleteInstanceGroup) DeleteInstanceGroup(group *api.InstanceGroup) error { func (c *DeleteInstanceGroup) DeleteInstanceGroup(group *api.InstanceGroup) error {
groups, err := FindCloudInstanceGroups(c.Cloud, c.Cluster, []*api.InstanceGroup{group}, false, nil) groups, err := FindCloudInstanceGroups(c.Cloud, c.Cluster, []*api.InstanceGroup{group}, false, nil)
if err != nil {
return fmt.Errorf("error finding CloudInstanceGroups: %v", err)
}
cig := groups[group.ObjectMeta.Name] cig := groups[group.ObjectMeta.Name]
if cig == nil { if cig == nil {
glog.Warningf("AutoScalingGroup %q not found in cloud - skipping delete", group.ObjectMeta.Name) glog.Warningf("AutoScalingGroup %q not found in cloud - skipping delete", group.ObjectMeta.Name)

4
pkg/resources/aws.go
View File

@ -891,7 +891,9 @@ func ListSubnets(cloud fi.Cloud, clusterName string) ([]*ResourceTracker, error)
rtRequest := &ec2.DescribeRouteTablesInput{} rtRequest := &ec2.DescribeRouteTablesInput{}
rtResponse, err := c.EC2().DescribeRouteTables(rtRequest) rtResponse, err := c.EC2().DescribeRouteTables(rtRequest)
if err != nil {
return nil, fmt.Errorf("error describing RouteTables: %v", err)
}
// sharedNgwIds is the set of IDs for shared NGWs, that we should not delete // sharedNgwIds is the set of IDs for shared NGWs, that we should not delete
sharedNgwIds := sets.NewString() sharedNgwIds := sets.NewString()
{ {