fix(appset): normalize app spec before applying#14481
Merged
leoluz merged 3 commits intoargoproj:masterfrom Jul 17, 2023
Merged
fix(appset): normalize app spec before applying#14481leoluz merged 3 commits intoargoproj:masterfrom
leoluz merged 3 commits intoargoproj:masterfrom
Conversation
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: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## master #14481 +/- ##
==========================================
+ Coverage 49.73% 49.76% +0.02%
==========================================
Files 261 261
Lines 44705 44758 +53
==========================================
+ Hits 22234 22272 +38
- Misses 20284 20295 +11
- Partials 2187 2191 +4
☔ View full report in Codecov by Sentry. |
Member
Author
|
/cherry-pick release-2.8 |
Member
Author
|
/cherry-pick release-2.7 |
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Jul 17, 2023
* fix(appset): normalize app spec before applying Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix nil ref, add test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix another test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Member
Author
|
/cherry-pick release-2.6 |
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Jul 17, 2023
* fix(appset): normalize app spec before applying Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix nil ref, add test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix another test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Member
Author
|
/cherry-pick release-2.5 |
|
Cherry-pick failed with |
|
Cherry-pick failed with |
crenshaw-dev
added a commit
that referenced
this pull request
Jul 17, 2023
* fix(appset): normalize app spec before applying * fix nil ref, add test * fix another test --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
crenshaw-dev
added a commit
that referenced
this pull request
Jul 17, 2023
* fix(appset): normalize app spec before applying * fix nil ref, add test * fix another test --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Jneville0815
pushed a commit
to radiusmethod/argo-cd
that referenced
this pull request
Jul 18, 2023
* fix(appset): normalize app spec before applying Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix nil ref, add test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix another test 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: Jimmy Neville <jimmyeneville@gmail.com>
schakrad
pushed a commit
to schakrad/argo-cd
that referenced
this pull request
Jul 24, 2023
…oproj#14555) * fix(appset): normalize app spec before applying * fix nil ref, add test * fix another test --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com>
3 tasks
yyzxw
pushed a commit
to yyzxw/argo-cd
that referenced
this pull request
Aug 9, 2023
* fix(appset): normalize app spec before applying Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix nil ref, add test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix another test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Closed
tesla59
pushed a commit
to tesla59/argo-cd
that referenced
this pull request
Dec 16, 2023
* fix(appset): normalize app spec before applying Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix nil ref, add test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix another test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
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
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.
The AppSet controller can get into a state where it fights with the application controller.
For example, try an appset like this:
Note that the application controller logs a bunch of stuff like this:
It's fighting with the appset controller.
This PR normalizes before applying so there's nothing to fight about.