-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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.
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
fix(appset): ensure appset don't attempt to remove application kind in patch requests #16056
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
…requests Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
crenshaw-dev
changed the title
fix: ensure appset don't attempt to remote application kind in patch requests
fix(appset): ensure appset don't attempt to remote application kind in patch requests
Oct 20, 2023
crenshaw-dev
approved these changes
Oct 20, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good find. Thanks!
/cherry-pick release-2.9 |
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #16056 +/- ##
==========================================
- Coverage 49.55% 49.54% -0.02%
==========================================
Files 269 269
Lines 46595 46599 +4
==========================================
- Hits 23091 23088 -3
- Misses 21232 21238 +6
- Partials 2272 2273 +1
☔ View full report in Codecov by Sentry. |
crenshaw-dev
changed the title
fix(appset): ensure appset don't attempt to remote application kind in patch requests
fix(appset): ensure appset don't attempt to remove application kind in patch requests
Oct 23, 2023
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Oct 23, 2023
…requests (#16056) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
ymktmk
pushed a commit
to ymktmk/argo-cd
that referenced
this pull request
Oct 29, 2023
…requests (argoproj#16056) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
jmilic1
pushed a commit
to jmilic1/argo-cd
that referenced
this pull request
Nov 13, 2023
…requests (argoproj#16056) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> Signed-off-by: jmilic1 <70441727+jmilic1@users.noreply.github.com>
vladfr
pushed a commit
to vladfr/argo-cd
that referenced
this pull request
Dec 13, 2023
…requests (argoproj#16056) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
tesla59
pushed a commit
to tesla59/argo-cd
that referenced
this pull request
Dec 16, 2023
…requests (argoproj#16056) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Hariharasuthan99
pushed a commit
to AmadeusITGroup/argo-cd
that referenced
this pull request
Jun 16, 2024
…requests (argoproj#16056) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
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.
Closes #15900
I was able to reproduce an issue only with the help of a debugger: request fails if patch body contains:
"kind": null
which happens only ifexistingObj
does not havekind/apiVersion
fields andobj
has it. I suspect this is happening due to k8s bug: kubernetes/kubernetes#80609 . Sometimes application is take from cache and it has apiVersion/kind and sometimes it is coming from API request without apiVersion/kind.PR ensures that
existingObj
has same apiVersion/kind asobj
so generated patch won't change apiVersion/kind