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

Merge pull request #10187 from hakman/fix-spot-instances 

Fix auto scaling group changes when using spot instances
This commit is contained in:
Kubernetes Prow Robot 2020-11-07 21:49:38 -08:00 committed by GitHub
parent 43995fa6dd 4070f09bef
commit af5cd1a5fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,13 +455,14 @@ func (v *AutoscalingGroup) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *Autos
} }
if changes.LaunchTemplate != nil { if changes.LaunchTemplate != nil {
// @note: at the moment we are only using launch templates when using mixed instance policies, spec := &autoscaling.LaunchTemplateSpecification{
// but this might change LaunchTemplateId: changes.LaunchTemplate.ID,
setup(request).LaunchTemplate = &autoscaling.LaunchTemplate{
LaunchTemplateSpecification: &autoscaling.LaunchTemplateSpecification{
LaunchTemplateName: changes.LaunchTemplate.ID,
Version: &launchTemplateVersion, Version: &launchTemplateVersion,
}, }
if e.UseMixedInstancesPolicy() {
setup(request).LaunchTemplate = &autoscaling.LaunchTemplate{LaunchTemplateSpecification: spec}
} else {
request.LaunchTemplate = spec
} }
changes.LaunchTemplate = nil changes.LaunchTemplate = nil
} }