Skip to content

Fix enqueing the same revision while reconciling#1430

Merged
matheuscscp merged 1 commit intomainfrom
fix-1429
Mar 11, 2026
Merged

Fix enqueing the same revision while reconciling#1430
matheuscscp merged 1 commit intomainfrom
fix-1429

Conversation

@matheuscscp
Copy link
Member

@matheuscscp matheuscscp commented Mar 4, 2026

Fixes: #1429

We traced the behavior reported in the issue back to the enqueue functions: they skip enqueue when the object is Ready=True and the revision matches. This should also happen if Reconciling=True. This check works because the object is patched with the attempted revision on the beginning of the reconciliation. Note that there's still a (very) small window where the object is not patched yet in which the issue can still happen.

@matheuscscp matheuscscp requested a review from stefanprodan March 4, 2026 12:21
@matheuscscp matheuscscp added bug Something isn't working backport:release/v1.5.x To be backported to release/v1.5.x labels Mar 4, 2026
@hiddeco
Copy link
Member

hiddeco commented Mar 4, 2026

Redundant with the predicate. If the source hasn't finished reconciling its latest generation, it also hasn't produced a new artifact yet, so helm-controller would just use the existing artifact (which is fine).

From the top of my head, this was put in place to ensure an update of e.g. the chart version in combination with a new set of values (especially when making use of a chart template) would not result in an upgrade with the old chart and new values.

@matheuscscp
Copy link
Member Author

@hiddeco I restored the observed generation check, please take another look 🙏

@matheuscscp matheuscscp force-pushed the fix-1429 branch 2 times, most recently from 418a192 to 9c63eba Compare March 4, 2026 14:15
@hiddeco
Copy link
Member

hiddeco commented Mar 4, 2026

@matheuscscp in the middle of moving this week so I won't have proper time until next week.

If you end-to-end confirmed this to not cause issues, I trust your judgement.

@matheuscscp
Copy link
Member Author

@hiddeco No worries, there's a bug in upstream Helm that is staged for 4.1.2 next Wednesday. A Flux patch release is scheduled for the day after. I already did some testing and will do more in any case, but if by the release you have time for another peek it would be most welcome 🙏

Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
@matheuscscp matheuscscp changed the title Fix reacting to source readiness changes and unneeded stalling on source not ready Fix enqueing the same revision while reconciling Mar 10, 2026
Copy link
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@matheuscscp matheuscscp merged commit ace9141 into main Mar 11, 2026
5 checks passed
@matheuscscp matheuscscp deleted the fix-1429 branch March 11, 2026 08:01
@fluxcdbot
Copy link
Member

Successfully created backport PR for release/v1.5.x:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:release/v1.5.x To be backported to release/v1.5.x bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

HelmRelease stuck as not ready (CancelHealthCheckOnNewRevision)

4 participants