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

feat: Allow configuring system wide ignore differences for all resources #8224

Merged
merged 2 commits into from Jan 19, 2022

Conversation

leoluz
Copy link
Collaborator

@leoluz leoluz commented Jan 19, 2022

Fix #7926

Signed-off-by: Leonardo Luz Almeida leonardo_almeida@intuit.com

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
@codecov
Copy link

codecov bot commented Jan 19, 2022

Codecov Report

Merging #8224 (c5eef88) into master (988d760) will increase coverage by 0.00%.
The diff coverage is 56.25%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #8224   +/-   ##
=======================================
  Coverage   41.61%   41.61%           
=======================================
  Files         174      174           
  Lines       22717    22725    +8     
=======================================
+ Hits         9453     9458    +5     
- Misses      11908    11910    +2     
- Partials     1356     1357    +1     
Impacted Files Coverage Δ
controller/sync.go 56.96% <50.00%> (-0.55%) ⬇️
util/argo/diff/normalize.go 44.00% <50.00%> (+4.86%) ⬆️
util/settings/settings.go 47.14% <100.00%> (+0.12%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 988d760...c5eef88. Read the comment docs.

@leoluz leoluz added this to the v2.3 milestone Jan 19, 2022

```yaml
data:
resource.customizations.ignoreDifferences.all: |
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please add resource.customizations.ignoreDifferences.all to https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/argocd-cm.yaml as well.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good point! Forgot about that file.
Pushed a new commit.

Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

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

Add minor comment about updating argocd-cm.yaml. LGTM once it is resolved.

Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
@leoluz leoluz requested a review from alexmt January 19, 2022 21:44
Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

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

LGTM

@alexmt alexmt merged commit 1547b44 into argoproj:master Jan 19, 2022
@leoluz leoluz deleted the feat/ignore-diff-sysconfig branch January 20, 2022 14:56
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.

Allow configuring system-wide ignore differences for managed fields managers for all resources
2 participants