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

fix(spot/ocean): default instance group should be optional

This commit is contained in:
liranp 2020-08-06 19:22:00 +03:00
parent da710a0c3c
commit 0cfa2bb6a7
No known key found for this signature in database
GPG Key ID: D5F03857002C1A93
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/model/spotinstmodel/instance_group.go
View File

@ -323,7 +323,7 @@ func (b *InstanceGroupModelBuilder) buildOcean(c *fi.ModelBuilderContext, igs ..
{ {
// Single instance group. // Single instance group.
if len(igs) == 1 { if len(igs) == 1 {
ig = igs[0] ig = igs[0].DeepCopy()
} }
// Multiple instance groups. // Multiple instance groups.
@ -343,22 +343,25 @@ func (b *InstanceGroupModelBuilder) buildOcean(c *fi.ModelBuilderContext, igs ..
InstanceGroupLabelOceanDefaultLaunchSpec) InstanceGroupLabelOceanDefaultLaunchSpec)
} }
ig = g ig = g.DeepCopy()
break break
} }
} }
} }
} }
// No default instance group. Use the first one.
if ig == nil { if ig == nil {
return fmt.Errorf("unable to detect default launch spec: "+ ig = igs[0].DeepCopy()
"please label the desired default instance group with `%s: \"true\"`",
InstanceGroupLabelOceanDefaultLaunchSpec)
} }
} }
klog.V(4).Infof("Detected default launch spec: %q", b.AutoscalingGroupName(ig)) klog.V(4).Infof("Detected default launch spec: %q", b.AutoscalingGroupName(ig))
} }
// Rename the instance group to avoid duplicate tasks with same name.
ig.Name = fi.StringValue(ocean.Name)
// Image. // Image.
ocean.ImageID = fi.String(ig.Spec.Image) ocean.ImageID = fi.String(ig.Spec.Image)