Skip to content

fix(engine): always preserve sync status for hooks #25692

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 19 commits into from
Dec 19, 2025
Merged

fix(engine): always preserve sync status for hooks #25692

agaudreault merged 19 commits into from
Dec 19, 2025

Conversation

@agaudreault
Copy link
Member

@agaudreault agaudreault commented Dec 16, 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).

@agaudreault agaudreault requested a review from a team as a code owner December 16, 2025 15:41
@bunnyshell
Copy link

bunnyshell bot commented Dec 16, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@agaudreault agaudreault marked this pull request as draft December 16, 2025 17:44
reggie-k and others added 18 commits December 16, 2025 16:32
@reggie-k @agaudreault
docs: added 3.2 to 3.3 upgrade overview section (argoproj#25671)
b175afe 
Signed-off-by: reggie-k <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
rename setOperationFailed
45d9150 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
always preserve sync status
d92514e 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
rename
7cbdb85 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
fix some e2e
a0775db 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
fix e2e
4f1676c 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@github-actions @reggie-k @agaudreault
chore: Bump version in master (argoproj#25670)
180a8c6 
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: reggie-k <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @agaudreault
chore(deps): bump actions/upload-artifact from 5.0.0 to 6.0.0 (argopr…
1758507 
…oj#25679)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @agaudreault
chore(deps): bump actions/cache from 5.0.0 to 5.0.1 (argoproj#25678)
72452f1 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @agaudreault
chore(deps): bump gitlab.com/gitlab-org/api/client-go from 1.8.1 to 1…
cbbb781 
….8.2 (argoproj#25676)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @agaudreault
chore(deps): bump github.com/expr-lang/expr from 1.17.6 to 1.17.7 (ar…
1128313 
…goproj#25677)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@renovate @reggie-k @agaudreault
chore(deps): update module k8s.io/kubernetes to v1.34.2 [security] (a…
7ffbe2c 
…rgoproj#25682)

Signed-off-by: reggie-k <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: reggie-k <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @reggie-k @agaudreault
chore(deps): bump k8s.io/kubernetes from 1.34.0 to 1.34.2 in /gitops-…
d583919 
…engine (argoproj#25675)

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: reggie-k <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: reggie-k <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@afzal442 @blakepettersson @agaudreault
docs: improve managedNamespaceMetadata section with details on tracki… (
9d6e710 
argoproj#25536)

Signed-off-by: Afzal Ansari <[email protected]>
Co-authored-by: Blake Pettersson <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@reggie-k @agaudreault
docs: grafana-org-operator healthcehck to upgrade manual (argoproj#25672
fb88779 
)

Signed-off-by: reggie-k <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
test(engine): refactor engine tests to ignore dry-run results (argopr…
e6b8d11 
…oj#25674)

Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
chore: bump gitops-engine with force+replace test (argoproj#24508)
83a0b49 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@juliev0 @crenshaw-dev @agaudreault
docs: clarify that updating customLabels in ArgoCD requires a restart…
23bab5b 
… to the Controller to take effect (argoproj#25693)

Signed-off-by: Julie Vogelman <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>
Co-authored-by: Michael Crenshaw <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault agaudreault marked this pull request as ready for review December 16, 2025 21:33
@agaudreault agaudreault enabled auto-merge (squash) December 16, 2025 21:33
@codecov
Copy link

codecov bot commented Dec 17, 2025 •
edited
Loading

Codecov Report

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

Additional details and impacted files 
@@           Coverage Diff           @@
##           master   #25692   +/-   ##
=======================================
  Coverage   62.56%   62.57%           
=======================================
  Files         353      353           
  Lines       50087    50087           
=======================================
+ Hits        31336    31340    +4     
+ Misses      15736    15732    -4     
  Partials     3015     3015

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

leoluz
leoluz requested changes Dec 18, 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.

Minor comment. Otherwise LGTM

leoluz
leoluz approved these changes Dec 19, 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 1dc85e5 into argoproj:master Dec 19, 2025
41 of 43 checks passed
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.

5 participants

@agaudreault @leoluz @reggie-k @afzal442 @juliev0