Skip to content

fix: handle annotated git tags correctly in repo server cache #21771

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
merged 13 commits into from
Mar 18, 2025
Merged

fix: handle annotated git tags correctly in repo server cache #21771

merged 13 commits into from
Mar 18, 2025
+225 −2

Conversation

@aali309
Copy link
Contributor

@aali309 aali309 commented Feb 4, 2025

When using annotated git tags with auto-sync enabled but self-heal disabled, manual changes were getting reverted. This was happening because the repo server cache wasn't handling annotated tags correctly.

Fixes: #21548

See #20082 for detailed description of what caused the regression, but TL;DR: this behaviour is currently present in v2.11.x, v2.12.x, v2.13.x and current master

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 Toolchain Guide
  • 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.
  • [x ] 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 Feb 4, 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 Feb 4, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (master@2a50dcb). Learn more about missing BASE report.
⚠️ Report is 1453 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff            @@
##             master   #21771   +/-   ##
=========================================
  Coverage          ?   55.87%           
=========================================
  Files             ?      343           
  Lines             ?    57327           
  Branches          ?        0           
=========================================
  Hits              ?    32030           
  Misses            ?    22654           
  Partials          ?     2643

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

@aali309 aali309 force-pushed the self_heal branch 2 times, most recently from 964f4f8 to 3e5b8c9 Compare February 7, 2025 16:34
@aali309 aali309 marked this pull request as ready for review February 7, 2025 16:35
@aali309 aali309 requested a review from a team as a code owner February 7, 2025 16:35
@aali309 aali309 force-pushed the self_heal branch 5 times, most recently from 519e768 to 20430c0 Compare February 13, 2025 00:16
anandf
anandf reviewed Feb 14, 2025
View reviewed changes
anandf
anandf reviewed Feb 14, 2025
View reviewed changes
jgwest
jgwest reviewed Feb 14, 2025
View reviewed changes
@aali309 aali309 requested review from anandf and jgwest February 14, 2025 21:17
@aali309 aali309 force-pushed the self_heal branch 2 times, most recently from 51dbde2 to d44ccca Compare February 19, 2025 23:58
blakepettersson
blakepettersson reviewed Feb 21, 2025
View reviewed changes
blakepettersson
blakepettersson reviewed Feb 21, 2025
View reviewed changes
@blakepettersson
Copy link
Member

blakepettersson commented Feb 21, 2025

I followed the @anandf protocol™ and it looks like the issue has disappeared.

@blakepettersson blakepettersson mentioned this pull request Feb 4, 2025
Closed
6 tasks
blakepettersson
blakepettersson approved these changes Feb 26, 2025
View reviewed changes
Copy link
Member

@blakepettersson blakepettersson left a comment

Choose a reason for hiding this comment

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

LGTM

anandf
anandf approved these changes Feb 27, 2025
View reviewed changes
Copy link
Member

@anandf anandf left a comment

Choose a reason for hiding this comment

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

LGTM

@aali309 aali309 force-pushed the self_heal branch 4 times, most recently from d71e7f9 to 3b51d19 Compare March 4, 2025 18:20
@gcp-cherry-pick-bot
Copy link

gcp-cherry-pick-bot bot commented Mar 18, 2025

Cherry-pick failed with Merge error f6f10c0521557a05efe156065a61a8643fb2b7a3 into temp-cherry-pick-f06d01-release-2.13

@keithchong
Copy link
Contributor

keithchong commented Mar 18, 2025

/cherry-pick release-2.12

@gcp-cherry-pick-bot
Copy link

gcp-cherry-pick-bot bot commented Mar 18, 2025

Cherry-pick failed with Merge error f6f10c0521557a05efe156065a61a8643fb2b7a3 into temp-cherry-pick-f06d01-release-2.12

@svghadi
Copy link
Contributor

svghadi commented Mar 19, 2025

/cherry-pick release-2.14

@gcp-cherry-pick-bot
Copy link

gcp-cherry-pick-bot bot commented Mar 19, 2025

Cherry-pick failed with Merge error f6f10c0521557a05efe156065a61a8643fb2b7a3 into temp-cherry-pick-f06d01-release-2.14

aali309 added a commit to aali309/argo-cd that referenced this pull request Mar 19, 2025
@aali309
fix: handle annotated git tags correctly in repo server cache (argopr…
0eca9d9 
…oj#21771)

Signed-off-by: Atif Ali <[email protected]>
This was referenced Mar 19, 2025
Merged
Closed
aali309 added a commit to aali309/argo-cd that referenced this pull request Mar 19, 2025
@aali309
fix: handle annotated git tags correctly in repo server cache (argopr…
539e79c 
…oj#21771)

Signed-off-by: Atif Ali <[email protected]>
@aali309 aali309 mentioned this pull request Mar 19, 2025
Closed
14 tasks
aali309 added a commit to aali309/argo-cd that referenced this pull request Mar 19, 2025
@aali309
fix: handle annotated git tags correctly in repo server cache (argopr…
7993be5 
…oj#21771)

Signed-off-by: Atif Ali <[email protected]>
@aali309 aali309 mentioned this pull request Mar 19, 2025
Closed
14 tasks
aali309 added a commit to aali309/argo-cd that referenced this pull request Mar 20, 2025
@aali309
fix: handle annotated git tags correctly in repo server cache (argopr…
d94123c 
…oj#21771)

Signed-off-by: Atif Ali <[email protected]>
@aali309 aali309 mentioned this pull request Mar 20, 2025
Merged
14 tasks
aali309 added a commit to aali309/argo-cd that referenced this pull request Mar 21, 2025
@aali309
fix: handle annotated git tags correctly in repo server cache (argopr…
0538b2b 
…oj#21771)

Signed-off-by: Atif Ali <[email protected]>
@aali309 aali309 mentioned this pull request Mar 21, 2025
Closed
14 tasks
aali309 added a commit to aali309/argo-cd that referenced this pull request Mar 21, 2025
@aali309
fix: handle annotated git tags correctly in repo server cache (argopr…
dd35ab8 
…oj#21771)

Signed-off-by: Atif Ali <[email protected]>
aali309 added a commit to aali309/argo-cd that referenced this pull request Mar 21, 2025
@aali309
fix: handle annotated git tags correctly in repo server cache (argopr…
9eb6919 
…oj#21771)

Signed-off-by: Atif Ali <[email protected]>
keithchong pushed a commit that referenced this pull request Mar 21, 2025
@aali309
fix: handle annotated git tags correctly in repo server cache (#21771) (
872319e 
#22424)

Signed-off-by: Atif Ali <[email protected]>
keithchong pushed a commit that referenced this pull request Mar 21, 2025
@aali309
fix: handle annotated git tags correctly in repo server cache (#21771) (
6207fd0 
#22397)

Signed-off-by: Atif Ali <[email protected]>
PaulSonOfLars pushed a commit to PaulSonOfLars/argo-cd that referenced this pull request Mar 22, 2025
@aali309 @PaulSonOfLars
fix: handle annotated git tags correctly in repo server cache (argopr…
62fbe02 
…oj#21771)

Signed-off-by: Atif Ali <[email protected]>
Hapshanko pushed a commit to Hapshanko/argo-cd that referenced this pull request Apr 29, 2025
@aali309 @Hapshanko
fix: handle annotated git tags correctly in repo server cache (argopr…
e5f10a7 
…oj#21771)

Signed-off-by: Atif Ali <[email protected]>
Signed-off-by: Hapshanko <[email protected]>
@aali309 aali309 deleted the self_heal branch October 16, 2025 17:31
@blakepettersson blakepettersson mentioned this pull request Nov 3, 2025
Closed
blakepettersson pushed a commit to blakepettersson/argo-cd that referenced this pull request Nov 10, 2025
@aali309 @blakepettersson
fix: handle annotated git tags correctly in repo server cache (argopr…
6c722b0 
…oj#21771)

Signed-off-by: Atif Ali <[email protected]>
@blakepettersson blakepettersson added the cherry-pick/3.0 Candidate for cherry picking into the 3.0 release branch label Nov 10, 2025
argo-cd-cherry-pick-bot bot pushed a commit that referenced this pull request Nov 10, 2025
@aali309 @github-actions
fix: handle annotated git tags correctly in repo server cache (#21771)
6a5895e 
Signed-off-by: Atif Ali <[email protected]>
@argo-cd-cherry-pick-bot
Copy link

argo-cd-cherry-pick-bot bot commented Nov 10, 2025

🍒 Cherry-pick PR created for 3.0: #25241

@argo-cd-cherry-pick-bot argo-cd-cherry-pick-bot bot mentioned this pull request Nov 10, 2025
Merged
blakepettersson pushed a commit that referenced this pull request Nov 10, 2025
@argo-cd-cherry-pick-bot @aali309
fix: handle annotated git tags correctly in repo server cache (cherry…
b53d2a2 
…-pick #21771 for 3.0) (#25241)

Signed-off-by: Atif Ali <[email protected]>
Co-authored-by: Atif Ali <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blakepettersson blakepettersson blakepettersson approved these changes

@keithchong keithchong keithchong approved these changes

@jgwest jgwest Awaiting requested review from jgwest

+1 more reviewer

@anandf anandf anandf approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Regression: Application targetting an annotated tag will self heal, even when self-healing is disabled.

6 participants

@aali309 @blakepettersson @keithchong @svghadi @anandf @jgwest