fix: ArgoCD 2.11 - Loop of PATCH calls to Application objects#19340
Merged
crenshaw-dev merged 1 commit intoargoproj:masterfrom Aug 1, 2024
Merged
fix: ArgoCD 2.11 - Loop of PATCH calls to Application objects#19340crenshaw-dev merged 1 commit intoargoproj:masterfrom
crenshaw-dev merged 1 commit intoargoproj:masterfrom
Conversation
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
alexmt
force-pushed
the
18151-loop-patch
branch
from
e318883 to
7004632
Compare
crenshaw-dev
reviewed
Aug 1, 2024
alexmt
force-pushed
the
18151-loop-patch
branch
2 times, most recently
from
f537bbf to
002091d
Compare
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
alexmt
force-pushed
the
18151-loop-patch
branch
from
002091d to
60b1e8c
Compare
Member
|
/cherry-pick release-2.11 |
Member
|
/cherry-pick release-2.12 |
crenshaw-dev
approved these changes
Aug 1, 2024
Member
|
nice! |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #19340 +/- ##
==========================================
+ Coverage 52.78% 52.79% +0.01%
==========================================
Files 316 316
Lines 43581 43602 +21
==========================================
+ Hits 23004 23021 +17
+ Misses 18026 18024 -2
- Partials 2551 2557 +6 ☔ View full report in Codecov by Sentry. |
|
Cherry-pick failed with |
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Aug 1, 2024
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Member
|
@alexmt mind manually cherry-picking 2.11? |
Collaborator
Author
|
Sure, doing it! |
Contributor
|
since the issue has been introduced in 2.10.10, would it make sense to cherry-pick to 2.10 as well? |
crenshaw-dev
pushed a commit
that referenced
this pull request
Aug 1, 2024
#19343) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
alexmt
added a commit
to alexmt/argo-cd
that referenced
this pull request
Aug 1, 2024
…oj#19340) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
alexmt
added a commit
to alexmt/argo-cd
that referenced
this pull request
Aug 1, 2024
…oj#19340) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Collaborator
Author
|
@alexmt thank you for finding and fixing that issue. |
alexmt
added a commit
that referenced
this pull request
Aug 4, 2024
#19348) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
alexmt
added a commit
that referenced
this pull request
Aug 4, 2024
#19347) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
rhyswilliamsza
pushed a commit
to rhyswilliamsza/argo-cd
that referenced
this pull request
Aug 12, 2024
…oj#19340) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> Signed-off-by: Rhys Williams <rhys.williams@electrum.co.za>
alexmt
added a commit
to alexmt/argo-cd
that referenced
this pull request
Aug 16, 2024
…oj#19340) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
alexmt
added a commit
to alexmt/argo-cd
that referenced
this pull request
Aug 16, 2024
…oj#19340) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
alexmt
added a commit
to alexmt/argo-cd
that referenced
this pull request
Aug 18, 2024
…oj#19340) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
alexmt
added a commit
to alexmt/argo-cd
that referenced
this pull request
Aug 18, 2024
…oj#19340) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
todaywasawesome
pushed a commit
that referenced
this pull request
Aug 21, 2024
#19569) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
todaywasawesome
pushed a commit
that referenced
this pull request
Aug 21, 2024
#19570) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #18151
PR fixes a bug introduced by #18061 . We were trying to fix #15126 - error which happened while generating status patch using strategic merge strategy.
We've added
replacemerge strategy tostatus.comparedTofield which apparently does not work as I expected. Instead of generating a patch that replacescomparedTofield it just uses newcomparedTofield value as a patch without trying to merge. As a result, fields understatus. comparednever gets removed, which causes all kinds of issues. For example, if the user switches the app destination from cluster name to cluster server URL, thenstatus.comparedTo.destinationends up having bothnameandserverfields. Once it happens, the controller will keep continuously reconciling the application because it thinks the destination has changed.Fix: just don't use a strategic merge patch because controller is the only manager of application status. PR changes controller to generate simple merge patch to update secret. It solves both #18151 and #15126 .