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

Merge pull request #10560 from spotinst/fix-launchspec-strategy 

Spotinst: Iterate over metadata labels only once
This commit is contained in:
Kubernetes Prow Robot 2021-01-12 01:14:25 -08:00 committed by GitHub
parent 695be2666c eee856392b
commit 06a533ed04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,7 +511,7 @@ func (b *InstanceGroupModelBuilder) buildLaunchSpec(c *fi.ModelBuilderContext,
Ocean: ocean, // link to Ocean
}
// Instance types.
// Instance types and strategy.
for k, v := range ig.ObjectMeta.Labels {
switch k {
case InstanceGroupLabelOceanInstanceTypesWhitelist, InstanceGroupLabelOceanInstanceTypes:
@ -519,6 +519,12 @@ func (b *InstanceGroupModelBuilder) buildLaunchSpec(c *fi.ModelBuilderContext,
if err != nil {
return err
}
case InstanceGroupLabelSpotPercentage:
launchSpec.SpotPercentage, err = parseInt(v)
if err != nil {
return err
}
}
}
@ -587,17 +593,6 @@ func (b *InstanceGroupModelBuilder) buildLaunchSpec(c *fi.ModelBuilderContext,
}
}
// Strategy.
for k, v := range ig.ObjectMeta.Labels {
switch k {
case InstanceGroupLabelSpotPercentage:
launchSpec.SpotPercentage, err = parseInt(v)
if err != nil {
return err
}
}
}
klog.V(4).Infof("Adding task: LaunchSpec/%s", fi.StringValue(launchSpec.Name))
c.AddTask(launchSpec)