Merge pull request #11285 from olemarkus/warm-fix-errors

Make warm pool no ASG found error retryable
kubernetes · Apr 23, 2021 · c3727bf · c3727bf
2 parents cc16b52 + b3f52ee
commit c3727bf
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/upup/pkg/fi/cloudup/awstasks/warmpool.go b/upup/pkg/fi/cloudup/awstasks/warmpool.go
@@ -52,6 +52,9 @@ func (e *WarmPool) Find(c *fi.Context) (*WarmPool, error) {
 		AutoScalingGroupName: e.Name,
 	})
 	if err != nil {
+		if awsup.AWSErrorCode(err) == "ValidationError" {
+			return nil, nil
+		}
 		return nil, err
 	}
 	if warmPool.WarmPoolConfiguration == nil {
@@ -96,6 +99,9 @@ func (*WarmPool) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *WarmPool) error
 
 			_, err := svc.PutWarmPool(request)
 			if err != nil {
+				if awsup.AWSErrorCode(err) == "ValidationError" {
+					return fi.NewTryAgainLaterError("waiting for ASG to become ready")
+				}
 				return fmt.Errorf("error modifying warm pool: %w", err)
 			}
 		} else {