kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Make warm pool no ASG found error retryable
This commit is contained in:
Kubernetes Prow Robot 2021-04-23 08:14:02 -07:00 committed by GitHub
parent cc16b528f6 b3f52ee39f
commit c3727bffa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upup/pkg/fi/cloudup/awstasks/warmpool.go
View File

@ -52,6 +52,9 @@ func (e *WarmPool) Find(c *fi.Context) (*WarmPool, error) {
AutoScalingGroupName: e.Name, AutoScalingGroupName: e.Name,
}) })
if err != nil { if err != nil {
if awsup.AWSErrorCode(err) == "ValidationError" {
return nil, nil
}
return nil, err return nil, err
} }
if warmPool.WarmPoolConfiguration == nil { if warmPool.WarmPoolConfiguration == nil {
@ -96,6 +99,9 @@ func (*WarmPool) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *WarmPool) error
_, err := svc.PutWarmPool(request) _, err := svc.PutWarmPool(request)
if err != nil { 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) return fmt.Errorf("error modifying warm pool: %w", err)
} }
} else { } else {