Merge pull request #6691 from mikesplain/automated-cherry-pick-of-#66…

…89-origin-release-1.12 Automated cherry pick of #6689: Fix Key error change Overrides to Override
kubernetes · Mar 27, 2019 · edf1dc1 · edf1dc1
2 parents c3b99b8 + bc7f842
commit edf1dc1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go
@@ -579,7 +579,7 @@ type terraformAutoscalingLaunchTemplate struct {
 	// LaunchTemplateSpecification is the definition for a LT
 	LaunchTemplateSpecification []*terraformAutoscalingLaunchTemplateSpecification `json:"launch_template_specification,omitempty"`
 	// Override the is machine type override
-	Overrides []*terraformAutoscalingLaunchTemplateOverride `json:"overrides,omitempty"`
+	Override []*terraformAutoscalingLaunchTemplateOverride `json:"override,omitempty"`
 }
 
 type terraformAutoscalingInstanceDistribution struct {
@@ -665,7 +665,7 @@ func (_ *AutoscalingGroup) RenderTerraform(t *terraform.TerraformTarget, a, e, c
 		}
 
 		for _, x := range e.MixedInstanceOverrides {
-			tf.MixedInstancesPolicy[0].LaunchTemplate[0].Overrides = append(tf.MixedInstancesPolicy[0].LaunchTemplate[0].Overrides, &terraformAutoscalingLaunchTemplateOverride{InstanceType: fi.String(x)})
+			tf.MixedInstancesPolicy[0].LaunchTemplate[0].Override = append(tf.MixedInstancesPolicy[0].LaunchTemplate[0].Override, &terraformAutoscalingLaunchTemplateOverride{InstanceType: fi.String(x)})
 		}
 	}
 

diff --git a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup_test.go b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup_test.go
@@ -286,11 +286,11 @@ resource "aws_autoscaling_group" "test1" {
         launch_template_name = "${aws_launch_template.test_lt.id}"
       }
 
-      overrides = {
+      override = {
         instance_type = "t2.medium"
       }
 
-      overrides = {
+      override = {
         instance_type = "t2.large"
       }
     }