From 4070f09bef8fdc0aea773c2cbeb39e13a434a236 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sat, 7 Nov 2020 16:00:59 +0200 Subject: [PATCH] Fix auto scaling group changes when using spot instances --- upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go index e1575639d7..d2a95917c2 100644 --- a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go +++ b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go @@ -455,13 +455,14 @@ func (v *AutoscalingGroup) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *Autos } if changes.LaunchTemplate != nil { - // @note: at the moment we are only using launch templates when using mixed instance policies, - // but this might change - setup(request).LaunchTemplate = &autoscaling.LaunchTemplate{ - LaunchTemplateSpecification: &autoscaling.LaunchTemplateSpecification{ - LaunchTemplateName: changes.LaunchTemplate.ID, - Version: &launchTemplateVersion, - }, + spec := &autoscaling.LaunchTemplateSpecification{ + LaunchTemplateId: changes.LaunchTemplate.ID, + Version: &launchTemplateVersion, + } + if e.UseMixedInstancesPolicy() { + setup(request).LaunchTemplate = &autoscaling.LaunchTemplate{LaunchTemplateSpecification: spec} + } else { + request.LaunchTemplate = spec } changes.LaunchTemplate = nil }