Skip to content

fix(engine): improve operation phase messages #25668

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

Jump to bottom
Merged
agaudreault merged 8 commits into from
Dec 16, 2025
Merged

fix(engine): improve operation phase messages #25668

agaudreault merged 8 commits into from
Dec 16, 2025

Conversation

@agaudreault
Copy link
Member

@agaudreault agaudreault commented Dec 15, 2025

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Title of the PR
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@bunnyshell
Copy link

bunnyshell bot commented Dec 15, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@codecov
Copy link

codecov bot commented Dec 15, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 62.57%. Comparing base (e8eebd7) to head (223eae0).
⚠️ Report is 2 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #25668      +/-   ##
==========================================
+ Coverage   62.56%   62.57%   +0.01%     
==========================================
  Files         353      353              
  Lines       50087    50087              
==========================================
+ Hits        31336    31343       +7     
+ Misses      15736    15731       -5     
+ Partials     3015     3013       -2

☔ 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 December 15, 2025 17:32
@agaudreault agaudreault requested a review from a team as a code owner December 15, 2025 17:32
@agaudreault agaudreault enabled auto-merge (squash) December 16, 2025 18:00
leoluz
leoluz requested changes Dec 16, 2025
View reviewed changes
gitops-engine/pkg/sync/sync_context.go Outdated
hooks, resources := tasks.Split(func(task *syncTask) bool { return task.isHook() })

waitingFor := "completion of hook"
andMore := "resources"
Copy link
Collaborator

@leoluz leoluz Dec 16, 2025

Choose a reason for hiding this comment

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

nit: can you please rename these variables to something more meaningful? andMore and moreTasks are very confusing names to reason about.

Copy link
Member Author

@agaudreault agaudreault Dec 16, 2025

Choose a reason for hiding this comment

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

updated

ppapapetrou76 and others added 7 commits December 16, 2025 14:24
@ppapapetrou76 @agaudreault
docs: adds a section for OCI private repos in OCI dcos (argoproj#25572)
de3d735 
Signed-off-by: Patroklos Papapetrou <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@reggie-k @agaudreault
docs: listed added healthchecks in 3.3 (argoproj#25665)
231d708 
Signed-off-by: reggie-k <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
fix(sync): improve operation phase messages to distinguish hooks from…
615c93d 
… resources

Refactor setRunningPhase to:
- Split tasks into hooks and resources for clearer messaging
- Prioritize hooks in the 'waiting for' message
- Add 'hook' suffix when pending deletion of hooks
- Handle empty task list gracefully

This provides more accurate status messages during sync operations.

Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
test(sync): add comprehensive unit tests for setRunningPhase
2a8059f 
Add table-driven tests covering all message generation scenarios:
- Empty tasks
- Single/multiple resources waiting for healthy state
- Single/multiple hooks waiting for completion
- Mixed hooks and resources (prioritizes hooks)
- Pending deletion for resources and hooks

Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
rename
e87f732 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@sathieu @agaudreault
feat(health): add grafana-org-operator Health (argoproj#25662)
7437860 
Signed-off-by: Mathieu Parent <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@onasser1 @agaudreault
chore: add search option to docs while previewing locally (argoproj#2…
9bf4e93 
…5660)

Signed-off-by: Omar Nasser <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault agaudreault force-pushed the fix/sync-context-phase-message branch from 873994c to 9bf4e93 Compare December 16, 2025 19:24
@agaudreault agaudreault requested review from a team as code owners December 16, 2025 19:24
leoluz
leoluz approved these changes Dec 16, 2025
View reviewed changes
Copy link
Collaborator

@leoluz leoluz left a comment

Choose a reason for hiding this comment

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

LGTM

@agaudreault agaudreault merged commit 95d19f2 into argoproj:master Dec 16, 2025
41 of 42 checks passed
@MrFreezeex MrFreezeex mentioned this pull request Jan 9, 2026
Open
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leoluz leoluz leoluz approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@agaudreault @leoluz @ppapapetrou76 @reggie-k @sathieu @onasser1