Skip to content
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(controller): populate ignoreDifferences in sync status #14542

Merged

Conversation

crenshaw-dev
Copy link
Collaborator

This PR was incomplete. It correctly checks whether ignoreDifferences was changed since the last sync and requests a new sync if it wasn't. But it incorrectly fails to populate the ignoreDifferences field in the last sync state. So for any app with ignoreDifferences set, refreshes will be constantly requested.

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev
Copy link
Collaborator Author

/cherry-pick release-2.8

@codecov
Copy link

codecov bot commented Jul 17, 2023

Codecov Report

Patch coverage: 92.85% and no project coverage change.

Comparison is base (4bd8b07) 49.79% compared to head (f614a13) 49.80%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #14542   +/-   ##
=======================================
  Coverage   49.79%   49.80%           
=======================================
  Files         261      261           
  Lines       44751    44757    +6     
=======================================
+ Hits        22283    22289    +6     
  Misses      20274    20274           
  Partials     2194     2194           
Impacted Files Coverage Δ
controller/state.go 72.50% <88.88%> (+0.09%) ⬆️
...cationset/controllers/applicationset_controller.go 62.64% <100.00%> (+0.10%) ⬆️
util/argo/argo.go 66.49% <100.00%> (+0.04%) ⬆️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@woehrl01
Copy link
Contributor

woehrl01 commented Jul 17, 2023

Fixes continuous loop of spec.ignoreDifferences differs reasons for reconciliation in 2.8.0-rc3.

image

@crenshaw-dev crenshaw-dev marked this pull request as ready for review July 17, 2023 15:49
Copy link
Member

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Collaborator

@leoluz leoluz left a comment

Choose a reason for hiding this comment

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

LGTM

@leoluz leoluz merged commit 15eeb30 into argoproj:master Jul 17, 2023
24 checks passed
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Jul 17, 2023
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
crenshaw-dev added a commit that referenced this pull request Jul 17, 2023
…14557)

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
…14542)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: Jimmy Neville <jimmyeneville@gmail.com>
@crenshaw-dev crenshaw-dev deleted the populate-ignoredifferences-sync-status branch July 26, 2023 19:52
yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
…14542)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@suzaku suzaku mentioned this pull request Aug 15, 2023
tesla59 pushed a commit to tesla59/argo-cd that referenced this pull request Dec 16, 2023
…14542)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Completed
Development

Successfully merging this pull request may close these issues.

None yet

4 participants