fix: Set InstanceTypes before provisioned early exit (#312)

Signed-off-by: Jonah Back <[email protected]>
keikoproj · Jun 4, 2021 · 67a8a78 · 67a8a78
1 parent 63f73b4
commit 67a8a78
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/controllers/provisioners/eks/cloud.go b/controllers/provisioners/eks/cloud.go
@@ -171,6 +171,12 @@ func (ctx *EksInstanceGroupContext) CloudDiscovery() error {
 	vpcID := aws.StringValue(cluster.ResourcesVpcConfig.VpcId)
 	state.SetVPCId(vpcID)
 
+	instanceTypes, err := ctx.AwsWorker.DescribeInstanceTypes()
+	if err != nil {
+		return errors.Wrap(err, "failed to discover instance types")
+	}
+	state.SetInstanceTypeInfo(instanceTypes)
+
 	// find all owned scaling groups
 	ownedScalingGroups := ctx.findOwnedScalingGroups(scalingGroups)
 	state.SetOwnedScalingGroups(ownedScalingGroups)
@@ -206,12 +212,6 @@ func (ctx *EksInstanceGroupContext) CloudDiscovery() error {
 	status.SetCurrentMin(int(aws.Int64Value(targetScalingGroup.MinSize)))
 	status.SetCurrentMax(int(aws.Int64Value(targetScalingGroup.MaxSize)))
 
-	instanceTypes, err := ctx.AwsWorker.DescribeInstanceTypes()
-	if err != nil {
-		return errors.Wrap(err, "failed to discover instance types")
-	}
-	state.SetInstanceTypeInfo(instanceTypes)
-
 	if spec.IsLaunchConfiguration() {
 
 		state.ScalingConfiguration, err = scaling.NewLaunchConfiguration(instanceGroup.NamespacedName(), ctx.AwsWorker, &scaling.DiscoverConfigurationInput{