Fix disabling spot instances when using launch templates

kubernetes · Nov 8, 2020 · 7b1592b · 7b1592b
1 parent 9e1e90d
commit 7b1592b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go
@@ -135,8 +135,10 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilde
 	// rather than the LaunchTemplate or else it returns this error:
 	//   You cannot use a launch template that is set to request Spot Instances (InstanceMarketOptions)
 	//   when you configure an Auto Scaling group with a mixed instances policy.
-	if ig.Spec.MixedInstancesPolicy == nil {
-		lt.SpotPrice = lc.SpotPrice
+	if ig.Spec.MixedInstancesPolicy == nil && lc.SpotPrice != "" {
+		lt.SpotPrice = fi.String(lc.SpotPrice)
+	} else {
+		lt.SpotPrice = fi.String("")
 	}
 	if ig.Spec.SpotDurationInMinutes != nil {
 		lt.SpotDurationInMinutes = ig.Spec.SpotDurationInMinutes

diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate.go
@@ -64,7 +64,7 @@ type LaunchTemplate struct {
 	// SecurityGroups is a list of security group associated
 	SecurityGroups []*SecurityGroup
 	// SpotPrice is set to the spot-price bid if this is a spot pricing request
-	SpotPrice string
+	SpotPrice *string
 	// SpotDurationInMinutes is set for requesting spot blocks
 	SpotDurationInMinutes *int64
 	// Tags are the keypairs to apply to the instance and volume on launch as well as the launch template itself.

diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_api.go
@@ -132,11 +132,11 @@ func (t *LaunchTemplate) RenderAWS(c *awsup.AWSAPITarget, a, ep, changes *Launch
 		lc.UserData = aws.String(base64.StdEncoding.EncodeToString(d))
 	}
 	// @step: add market options
-	if t.SpotPrice != "" {
+	if fi.StringValue(t.SpotPrice) != "" {
 		s := &ec2.LaunchTemplateSpotMarketOptionsRequest{
 			BlockDurationMinutes:         t.SpotDurationInMinutes,
 			InstanceInterruptionBehavior: t.InstanceInterruptionBehavior,
-			MaxPrice:                     fi.String(t.SpotPrice),
+			MaxPrice:                     t.SpotPrice,
 		}
 		lc.InstanceMarketOptions = &ec2.LaunchTemplateInstanceMarketOptionsRequest{
 			MarketType:  fi.String("spot"),
@@ -213,9 +213,14 @@ func (t *LaunchTemplate) Find(c *fi.Context) (*LaunchTemplate, error) {
 	if lt.LaunchTemplateData.IamInstanceProfile != nil {
 		actual.IAMInstanceProfile = &IAMInstanceProfile{Name: lt.LaunchTemplateData.IamInstanceProfile.Name}
 	}
-	// @step: add instanceInterruptionBehavior if there is one
-	if lt.LaunchTemplateData.InstanceMarketOptions != nil && lt.LaunchTemplateData.InstanceMarketOptions.SpotOptions != nil {
-		actual.InstanceInterruptionBehavior = lt.LaunchTemplateData.InstanceMarketOptions.SpotOptions.InstanceInterruptionBehavior
+	// @step: add InstanceMarketOptions if there are any
+	imo := lt.LaunchTemplateData.InstanceMarketOptions
+	if imo != nil && imo.SpotOptions != nil && aws.StringValue(imo.SpotOptions.MaxPrice) != "" {
+		actual.SpotPrice = imo.SpotOptions.MaxPrice
+		actual.SpotDurationInMinutes = imo.SpotOptions.BlockDurationMinutes
+		actual.InstanceInterruptionBehavior = imo.SpotOptions.InstanceInterruptionBehavior
+	} else {
+		actual.SpotPrice = aws.String("")
 	}
 
 	// @step: get the image is order to find out the root device name as using the index

diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_cloudformation.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_cloudformation.go
@@ -180,8 +180,8 @@ func (t *LaunchTemplate) RenderCloudformation(target *cloudformation.Cloudformat
 		},
 	}
 
-	if e.SpotPrice != "" {
-		marketSpotOptions := cloudformationLaunchTemplateMarketOptionsSpotOptions{MaxPrice: fi.String(e.SpotPrice)}
+	if fi.StringValue(e.SpotPrice) != "" {
+		marketSpotOptions := cloudformationLaunchTemplateMarketOptionsSpotOptions{MaxPrice: e.SpotPrice}
 		if e.SpotDurationInMinutes != nil {
 			marketSpotOptions.BlockDurationMinutes = e.SpotDurationInMinutes
 		}

diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_cloudformation_test.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_cloudformation_test.go
@@ -37,7 +37,7 @@ func TestLaunchTemplateCloudformationRender(t *testing.T) {
 				RootVolumeOptimization:       fi.Bool(true),
 				RootVolumeIops:               fi.Int64(100),
 				RootVolumeSize:               fi.Int64(64),
-				SpotPrice:                    "10",
+				SpotPrice:                    fi.String("10"),
 				SpotDurationInMinutes:        fi.Int64(120),
 				InstanceInterruptionBehavior: fi.String("hibernate"),
 				SSHKey: &SSHKey{

diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform.go
@@ -181,8 +181,8 @@ func (t *LaunchTemplate) RenderTerraform(target *terraform.TerraformTarget, a, e
 		},
 	}
 
-	if e.SpotPrice != "" {
-		marketSpotOptions := terraformLaunchTemplateMarketOptionsSpotOptions{MaxPrice: fi.String(e.SpotPrice)}
+	if fi.StringValue(e.SpotPrice) != "" {
+		marketSpotOptions := terraformLaunchTemplateMarketOptionsSpotOptions{MaxPrice: e.SpotPrice}
 		if e.SpotDurationInMinutes != nil {
 			marketSpotOptions.BlockDurationMinutes = e.SpotDurationInMinutes
 		}

diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform_test.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_terraform_test.go
@@ -34,7 +34,7 @@ func TestLaunchTemplateTerraformRender(t *testing.T) {
 				ID:                           fi.String("test-11"),
 				InstanceMonitoring:           fi.Bool(true),
 				InstanceType:                 fi.String("t2.medium"),
-				SpotPrice:                    "0.1",
+				SpotPrice:                    fi.String("0.1"),
 				SpotDurationInMinutes:        fi.Int64(60),
 				InstanceInterruptionBehavior: fi.String("hibernate"),
 				RootVolumeOptimization:       fi.Bool(true),