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

Merge pull request #682 from justinsb/issue_589 

Tolerate empty LaunchConfigurationName
This commit is contained in:
Chris Love 2016-10-18 08:32:23 -06:00 committed by GitHub
parent ed23e1a07b 3d6e2860fe
commit 8dc7d2ad91
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go
View File

@ -59,7 +59,7 @@ func findAutoscalingGroup(cloud awsup.AWSCloud, name string) (*autoscaling.Group
if aws.StringValue(g.AutoScalingGroupName) == name {
found = append(found, g)
} else {
glog.Warningf("Got ASG with unexpected name")
glog.Warningf("Got ASG with unexpected name %q", aws.StringValue(g.AutoScalingGroupName))
}
}
@ -111,10 +111,11 @@ func (e *AutoscalingGroup) Find(c *fi.Context) (*AutoscalingGroup, error) {
}
}
if g.LaunchConfigurationName == nil {
return nil, fmt.Errorf("autoscaling Group %q had no LaunchConfiguration", *actual.Name)
if fi.StringValue(g.LaunchConfigurationName) == "" {
glog.Warningf("autoscaling Group %q had no LaunchConfiguration", fi.StringValue(g.AutoScalingGroupName))
} else {
actual.LaunchConfiguration = &LaunchConfiguration{ID: g.LaunchConfigurationName}
}
actual.LaunchConfiguration = &LaunchConfiguration{ID: g.LaunchConfigurationName}
if subnetSlicesEqualIgnoreOrder(actual.Subnets, e.Subnets) {
actual.Subnets = e.Subnets