Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(controller): Fix for rollouts getting stuck in loop #2689

Merged
merged 4 commits into from
May 1, 2023
Merged

fix(controller): Fix for rollouts getting stuck in loop #2689

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd8498f
possible fix for sutck rollouts
zachaller Mar 31, 2023
528c91f
add comments
zachaller Apr 6, 2023
a14902e
add comments
zachaller Apr 6, 2023
fa42e3d
update comments
zachaller Apr 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions rollout/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,13 +413,18 @@ func (c *Controller) syncHandler(ctx context.Context, key string) error {
}

err = roCtx.reconcile()
if roCtx.newRollout != nil {
c.writeBackToInformer(roCtx.newRollout)
}
if err != nil {
logCtx.Errorf("roCtx.reconcile err %v", err)
// return an err here so that we do not update the informer cache with a "bad" rollout object, for the case when
// we get an error during reconciliation but c.newRollout still gets updated this can happen in syncReplicaSetRevision
// https://github.com/argoproj/argo-rollouts/issues/2522#issuecomment-1492181154 I also believe there are other cases
// that newRollout can get updated while we get an error during reconciliation
return err
}
return err
if roCtx.newRollout != nil {
c.writeBackToInformer(roCtx.newRollout)
}
return nil
}

// writeBackToInformer writes a just recently updated Rollout back into the informer cache.
Expand Down