Check MIP instance req overrides before LT overrides

kubernetes · Feb 22, 2022 · 518dea9 · 518dea9
1 parent a76fb75
commit 518dea9
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/cluster-autoscaler/cloudprovider/aws/aws_manager.go b/cluster-autoscaler/cloudprovider/aws/aws_manager.go
@@ -451,7 +451,13 @@ func (m *AwsManager) buildNodeFromTemplate(asg *asg, template *asgTemplate) (*ap
 
 func (m *AwsManager) getInstanceRequirementsFromMixedInstancesPolicy(policy *mixedInstancesPolicy) (*ec2.InstanceRequirements, error) {
 	instanceRequirements := &ec2.InstanceRequirements{}
-	if policy.launchTemplate != nil {
+	if policy.instanceRequirementsOverrides != nil {
+		var err error
+		instanceRequirements, err = m.awsService.getRequirementsRequestFromAutoscalingToEC2(policy.instanceRequirementsOverrides)
+		if err != nil {
+			return nil, err
+		}
+	} else {
 		params := &ec2.DescribeLaunchTemplateVersionsInput{
 			LaunchTemplateName: aws.String(policy.launchTemplate.name),
 			Versions:           []*string{aws.String(policy.launchTemplate.version)},
@@ -468,12 +474,8 @@ func (m *AwsManager) getInstanceRequirementsFromMixedInstancesPolicy(policy *mix
 		}
 
 		lt := describeData.LaunchTemplateVersions[0]
-		instanceRequirements = lt.LaunchTemplateData.InstanceRequirements
-	} else if policy.instanceRequirementsOverrides != nil {
-		var err error
-		instanceRequirements, err = m.awsService.getRequirementsRequestFromAutoscalingToEC2(policy.instanceRequirementsOverrides)
-		if err != nil {
-			return nil, err
+		if lt.LaunchTemplateData.InstanceRequirements != nil {
+			instanceRequirements = lt.LaunchTemplateData.InstanceRequirements
 		}
 	}
 	return instanceRequirements, nil