fix(controller): bad server-side diffs (#18213) #18840
Merged
Conversation
This file contains 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
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
|
/bns:deploy |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #18840 +/- ##
==========================================
+ Coverage 50.29% 50.36% +0.07%
==========================================
Files 315 315
Lines 43127 43182 +55
==========================================
+ Hits 21690 21748 +58
+ Misses 18958 18950 -8
- Partials 2479 2484 +5 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
ishitasequeira
approved these changes
Jun 29, 2024
|
/cherry-pick release-2.12 |
|
Cherry-pick failed with |
ggjulio
pushed a commit
to ggjulio/argo-cd
that referenced
this pull request
Jul 21, 2024
* fix(controller): bad server-side diffs (argoproj#18213) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * use upstream commit Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
jsolana
pushed a commit
to jsolana/argo-cd
that referenced
this pull request
Jul 24, 2024
* fix(controller): bad server-side diffs (argoproj#18213) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * use upstream commit Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Javier Solana <javier.solana@cabify.com> Signed-off-by: Javier Solana <javier.solana@cabify.com>
|
@crenshaw-dev any plans to include it in 2.10.xx patch release ? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
gitops-engine PR contains the explanation: argoproj/gitops-engine#587
fixes #18548
fixes #18213
fixes #18020
fixes #17968