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: trigger refresh on changed ignoreDifferences #12607

Merged

Conversation

crenshaw-dev
Copy link
Member

@crenshaw-dev crenshaw-dev commented Feb 24, 2023

Fixes #12610

Tested locally and confirmed I can't reproduce the reported issue.

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

codecov bot commented Feb 24, 2023

Codecov Report

Patch coverage: 50.00% and no project coverage change.

Comparison is base (944eadd) 49.25% compared to head (db897d3) 49.25%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #12607   +/-   ##
=======================================
  Coverage   49.25%   49.25%           
=======================================
  Files         251      251           
  Lines       43521    43525    +4     
=======================================
+ Hits        21438    21440    +2     
- Misses      19949    19951    +2     
  Partials     2134     2134           
Impacted Files Coverage Δ
pkg/apis/application/v1alpha1/types.go 59.58% <0.00%> (-0.10%) ⬇️
controller/appcontroller.go 53.45% <100.00%> (+0.06%) ⬆️

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

…-ignore-differences

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev crenshaw-dev marked this pull request as ready for review March 8, 2023 15:58
…-ignore-differences

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

jannfis commented Apr 3, 2023

Because this PR contains a CRD change, I'm not sure whether we should cherry-pick it except for the upcoming 2.7 release.

Personally, I would expect patch releases not to touch any CRDs or deployment manifests (with certain exceptions).

@crenshaw-dev
Copy link
Member Author

@jannfis agreed, dropped the cherry-pick comments. LGTY otherwise?

…-ignore-differences

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

/cherry-pick release-2.8

…-ignore-differences

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

@jannfis jannfis left a comment

Choose a reason for hiding this comment

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

LGTM!

@jannfis jannfis merged commit e2e0da7 into argoproj:master Jul 7, 2023
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Jul 7, 2023
* fix: trigger refresh on changed ignoreDifferences

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

* make the tests mean things

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

---------

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
crenshaw-dev added a commit that referenced this pull request Jul 11, 2023
* fix: trigger refresh on changed ignoreDifferences



* make the tests mean things



---------

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 crenshaw-dev deleted the refresh-on-changing-ignore-differences branch July 11, 2023 14:49
yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
* fix: trigger refresh on changed ignoreDifferences

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

* make the tests mean things

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

---------

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
* fix: trigger refresh on changed ignoreDifferences

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

* make the tests mean things

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

---------

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
None yet
Development

Successfully merging this pull request may close these issues.

ignoreDifferences is not automatically refreshed.
2 participants