Set lifecycle on WarmPool task

kubernetes · May 29, 2021 · 024b365 · 024b365
1 parent 26309f0
commit 024b365
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/cloudmock/aws/mockautoscaling/warmpool.go b/cloudmock/aws/mockautoscaling/warmpool.go
@@ -28,3 +28,7 @@ func (m *MockAutoscaling) DescribeWarmPool(input *autoscaling.DescribeWarmPoolIn
 	}
 	return ret, nil
 }
+
+func (m *MockAutoscaling) DeleteWarmPool(*autoscaling.DeleteWarmPoolInput) (*autoscaling.DeleteWarmPoolOutput, error) {
+	return &autoscaling.DeleteWarmPoolOutput{}, nil
+}
diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go
@@ -90,8 +90,9 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 		{
 			enabled := fi.Bool(warmPool.IsEnabled())
 			warmPoolTask := &awstasks.WarmPool{
-				Name:    &name,
-				Enabled: enabled,
+				Name:      &name,
+				Lifecycle: b.Lifecycle,
+				Enabled:   enabled,
 			}
 			if warmPool.IsEnabled() {
 				warmPoolTask.MinSize = warmPool.MinSize

diff --git a/upup/pkg/fi/cloudup/awstasks/warmpool.go b/upup/pkg/fi/cloudup/awstasks/warmpool.go
@@ -59,16 +59,18 @@ func (e *WarmPool) Find(c *fi.Context) (*WarmPool, error) {
 	}
 	if warmPool.WarmPoolConfiguration == nil {
 		return &WarmPool{
-			Name:    e.Name,
-			Enabled: fi.Bool(false),
+			Name:      e.Name,
+			Lifecycle: e.Lifecycle,
+			Enabled:   fi.Bool(false),
 		}, nil
 	}
 
 	actual := &WarmPool{
-		Name:    e.Name,
-		Enabled: fi.Bool(true),
-		MaxSize: warmPool.WarmPoolConfiguration.MaxGroupPreparedCapacity,
-		MinSize: fi.Int64Value(warmPool.WarmPoolConfiguration.MinSize),
+		Name:      e.Name,
+		Lifecycle: e.Lifecycle,
+		Enabled:   fi.Bool(true),
+		MaxSize:   warmPool.WarmPoolConfiguration.MaxGroupPreparedCapacity,
+		MinSize:   fi.Int64Value(warmPool.WarmPoolConfiguration.MinSize),
 	}
 	return actual, nil
 }