Skip to content

Conversation

@agaudreault
Copy link
Member

@agaudreault agaudreault commented Sep 26, 2025

When the hydration "group" is processed, we must have as little errors as possible before retrieving the applications that are part of that group. Any errors that happen can only be logged in the controller, and the users will not have any feedback on their applications.

Once we have the applications, we can update the hydration status of the applications that failed with the correct error. We must also update all other applications in the same group with an error that will help the user identify the applciation in causing the hydration to fail.

image image

Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@bunnyshell
Copy link

bunnyshell bot commented Sep 26, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

Signed-off-by: Alexandre Gaudreault <[email protected]>
@codecov
Copy link

codecov bot commented Sep 26, 2025

Codecov Report

❌ Patch coverage is 90.53254% with 16 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (master@d5d7e8f). Learn more about missing BASE report.
⚠️ Report is 10 commits behind head on master.

Files with missing lines Patch % Lines
controller/hydrator/hydrator.go 90.47% 12 Missing and 4 partials ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##             master   #24755   +/-   ##
=========================================
  Coverage          ?   60.77%           
=========================================
  Files             ?      404           
  Lines             ?    66217           
  Branches          ?        0           
=========================================
  Hits              ?    40242           
  Misses            ?    22725           
  Partials          ?     3250           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@agaudreault agaudreault marked this pull request as ready for review September 29, 2025 20:49
@agaudreault agaudreault requested a review from a team as a code owner September 29, 2025 20:49
func (h *Hydrator) setAppHydratorError(app *appv1.Application, err error) {
// if the operation is not in progress, we do not update the status
if app.Status.SourceHydrator.CurrentOperation.Phase != appv1.HydrateOperationPhaseHydrating {
return
Copy link
Member

Choose a reason for hiding this comment

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

Maybe log a warning too? If we hit this line, I think we've encountered a version of the race condition described above.

Copy link
Member Author

Choose a reason for hiding this comment

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

i'll leave the stuff for the race condition to be handled in another PR. This is to make sure that while iterating on the app to set an error, we do not set a generic error if we've already set an app specific error

Copy link
Member

Choose a reason for hiding this comment

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

Do you have immediate plans to work on the race condition? If not, I think a log would be important to help people understand why their app is misbehaving.

agaudreault and others added 4 commits September 29, 2025 17:06
Co-authored-by: Michael Crenshaw <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Co-authored-by: Michael Crenshaw <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault agaudreault enabled auto-merge (squash) September 29, 2025 21:09
@agaudreault agaudreault added the cherry-pick/3.2 Candidate for cherry picking into the 3.2 release branch label Sep 29, 2025
Co-authored-by: Michael Crenshaw <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
agaudreault and others added 3 commits September 30, 2025 16:18
Co-authored-by: Michael Crenshaw <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault agaudreault merged commit 7396c1a into argoproj:master Sep 30, 2025
27 checks passed
@argo-cd-cherry-pick-bot
Copy link

❌ Cherry-pick failed for 3.2. Please check the workflow logs for details.

agaudreault added a commit to agaudreault/argo-cd that referenced this pull request Oct 1, 2025
Signed-off-by: Alexandre Gaudreault <[email protected]>
Co-authored-by: Michael Crenshaw <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
agaudreault added a commit that referenced this pull request Oct 1, 2025
Signed-off-by: Alexandre Gaudreault <[email protected]>
Co-authored-by: Michael Crenshaw <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-pick/3.2 Candidate for cherry picking into the 3.2 release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants