Do not include WarmPool in json for AutoscalingGroup task

This avoids a circular dependency.

I previously considered making the field private,
but this is roughly equivalent and less disruptive.

Author: justinsb

Diff for: pkg/model/awsmodel/autoscalinggroup.go

@@ -82,12 +82,12 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.CloudupModelBuilderContext) e
 
 		// @step: now lets build the autoscaling group task
 		if ig.Spec.Manager != "Karpenter" {
-			tsk, err := b.buildAutoScalingGroupTask(c, name, ig)
+			asg, err := b.buildAutoScalingGroupTask(c, name, ig)
 			if err != nil {
 				return err
 			}
-			tsk.LaunchTemplate = task
-			c.AddTask(tsk)
+			asg.LaunchTemplate = task
+			c.AddTask(asg)
 
 			warmPool := b.Cluster.Spec.CloudProvider.AWS.WarmPool.ResolveDefaults(ig)
 
@@ -103,9 +103,9 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.CloudupModelBuilderContext) e
 				if warmPool.MaxSize != nil {
 					warmPoolTask.MaxSize = fi.PtrTo(int32(aws.ToInt64(warmPool.MaxSize)))
 				}
-				tsk.WarmPool = warmPoolTask
+				asg.WarmPool = warmPoolTask
 			} else {
-				tsk.WarmPool = nil
+				asg.WarmPool = nil
 			}
 			c.AddTask(warmPoolTask)
 

Diff for: upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go

@@ -100,8 +100,10 @@ type AutoscalingGroup struct {
 	TargetGroups []*TargetGroup
 	// CapacityRebalance makes ASG proactively replace spot instances when ASG receives a rebalance recommendation
 	CapacityRebalance *bool
-	// WarmPool is the WarmPool config for the ASG
-	WarmPool *WarmPool
+
+	// WarmPool is the WarmPool config for the ASG.
+	// It is marked to be ignored in JSON marshalling to avoid a circular dependency.
+	WarmPool *WarmPool `json:"-"`
 
 	deletions []fi.CloudupDeletion
 }
@@ -316,6 +318,16 @@ func (e *AutoscalingGroup) Find(c *fi.CloudupContext) (*AutoscalingGroup, error)
 		actual.InstanceProtection = g.NewInstancesProtectedFromScaleIn
 	}
 
+	// // Populate the warmPool, by looking at the tasks
+	// for _, task := range c.AllTasks() {
+	// 	switch task := task.(type) {
+	// 	case *WarmPool:
+	// 		if task.AutoscalingGroup != nil && fi.ValueOf(task.AutoscalingGroup.Name) == fi.ValueOf(e.Name) {
+	// 			e.warmPool = task
+	// 		}
+	// 	}
+	// }
+
 	return actual, nil
 }
 

Diff for: upup/pkg/fi/cloudup/awstasks/warmpool.go

@@ -41,6 +41,7 @@ type WarmPool struct {
 	// MinSize is the smallest number of nodes in the warm pool.
 	MinSize int32
 
+	// AutoscalingGroup is the AutoscalingGroup on which we configure this warmpool.
 	AutoscalingGroup *AutoscalingGroup
 }