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

Merge pull request #8567 from qqshfox/fix-lt 

Treat nil of LaunchTemplateSpecification.Version as $Default [0]
This commit is contained in:
Kubernetes Prow Robot 2020-02-28 18:40:40 -08:00 committed by GitHub
parent 3b54cfc0bc 5ff9b2b91e
commit 22cd49b6f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upup/pkg/fi/cloudup/awsup/aws_cloud.go
View File

@ -598,7 +598,7 @@ func findAutoscalingGroupLaunchConfiguration(c AWSCloud, g *autoscaling.Group) (
//See what version the ASG is set to use //See what version the ASG is set to use
mixedVersion := aws.StringValue(g.MixedInstancesPolicy.LaunchTemplate.LaunchTemplateSpecification.Version) mixedVersion := aws.StringValue(g.MixedInstancesPolicy.LaunchTemplate.LaunchTemplateSpecification.Version)
//Correctly Handle Default and Latest Versions //Correctly Handle Default and Latest Versions
if mixedVersion == "$Default" || mixedVersion == "$Latest" { if mixedVersion == "" || mixedVersion == "$Default" || mixedVersion == "$Latest" {
request := &ec2.DescribeLaunchTemplatesInput{ request := &ec2.DescribeLaunchTemplatesInput{
LaunchTemplateNames: []*string{&name}, LaunchTemplateNames: []*string{&name},
} }
@ -607,7 +607,7 @@ func findAutoscalingGroupLaunchConfiguration(c AWSCloud, g *autoscaling.Group) (
return "", fmt.Errorf("error describing launch templates: %v", err) return "", fmt.Errorf("error describing launch templates: %v", err)
} }
launchTemplate := dltResponse.LaunchTemplates[0] launchTemplate := dltResponse.LaunchTemplates[0]
if mixedVersion == "$Default" { if mixedVersion == "" || mixedVersion == "$Default" {
version = strconv.FormatInt(*launchTemplate.DefaultVersionNumber, 10) version = strconv.FormatInt(*launchTemplate.DefaultVersionNumber, 10)
} else { } else {
version = strconv.FormatInt(*launchTemplate.LatestVersionNumber, 10) version = strconv.FormatInt(*launchTemplate.LatestVersionNumber, 10)