Merge pull request #6753 from granular-ryanbonham/fix_6751

Use version number as well as name when checking LaunchTemplates
kubernetes · Apr 8, 2019 · d1fc04d · d1fc04d
2 parents 3e81a3f + eca2b0a
commit d1fc04d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/upup/pkg/fi/cloudup/awsup/aws_cloud.go b/upup/pkg/fi/cloudup/awsup/aws_cloud.go
@@ -560,8 +560,10 @@ func findAutoscalingGroupLaunchConfiguration(g *autoscaling.Group) (string, erro
 	// @check the launch template then
 	if g.LaunchTemplate != nil {
 		name = aws.StringValue(g.LaunchTemplate.LaunchTemplateName)
+		version := aws.StringValue(g.LaunchTemplate.Version)
 		if name != "" {
-			return name, nil
+			launchTemplate := name + ":" + version
+			return launchTemplate, nil
 		}
 	}
 
@@ -571,8 +573,10 @@ func findAutoscalingGroupLaunchConfiguration(g *autoscaling.Group) (string, erro
 			if g.MixedInstancesPolicy.LaunchTemplate.LaunchTemplateSpecification != nil {
 				// honestly!!
 				name = aws.StringValue(g.MixedInstancesPolicy.LaunchTemplate.LaunchTemplateSpecification.LaunchTemplateName)
+				version := aws.StringValue(g.MixedInstancesPolicy.LaunchTemplate.LaunchTemplateSpecification.Version)
 				if name != "" {
-					return name, nil
+					launchTemplate := name + ":" + version
+					return launchTemplate, nil
 				}
 			}
 		}
@@ -591,8 +595,10 @@ func findInstanceLaunchConfiguration(i *autoscaling.Instance) string {
 	// else we need to check the launch template
 	if i.LaunchTemplate != nil {
 		name = aws.StringValue(i.LaunchTemplate.LaunchTemplateName)
+		version := aws.StringValue(i.LaunchTemplate.Version)
 		if name != "" {
-			return name
+			launchTemplate := name + ":" + version
+			return launchTemplate
 		}
 	}