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: Ignore diff with schema #9170

Merged
merged 13 commits into from
May 31, 2022
Merged

Conversation

leoluz
Copy link
Collaborator

@leoluz leoluz commented Apr 22, 2022

Fix #9071

  • fix: managed fields diff using proper schema from cluster cache

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).

@leoluz leoluz changed the title fix/ignore diff with schema fix: Ignore diff with schema Apr 22, 2022
util/argo/diff/diff.go Outdated Show resolved Hide resolved
@leoluz leoluz marked this pull request as ready for review April 22, 2022 21:16
@leoluz leoluz force-pushed the fix/ignore-diff-with-schema branch from 96d4a3c to 98f5b64 Compare April 28, 2022 20:18
@codecov
Copy link

codecov bot commented Apr 28, 2022

Codecov Report

Merging #9170 (ac6b1af) into master (7005453) will decrease coverage by 0.05%.
The diff coverage is 37.50%.

@@            Coverage Diff             @@
##           master    #9170      +/-   ##
==========================================
- Coverage   45.86%   45.81%   -0.06%     
==========================================
  Files         221      222       +1     
  Lines       26309    26377      +68     
==========================================
+ Hits        12067    12084      +17     
- Misses      12586    12631      +45     
- Partials     1656     1662       +6     
Impacted Files Coverage Δ
controller/appcontroller.go 52.07% <0.00%> (-0.21%) ⬇️
util/argo/managedfields/parser.go 100.00% <ø> (ø)
util/argo/managedfields/managed_fields.go 42.04% <36.61%> (-32.96%) ⬇️
controller/state.go 73.64% <50.00%> (-0.26%) ⬇️
controller/sync.go 56.84% <50.00%> (-0.12%) ⬇️
util/argo/diff/diff.go 52.20% <60.00%> (-0.07%) ⬇️

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 7005453...ac6b1af. Read the comment docs.

@leoluz leoluz force-pushed the fix/ignore-diff-with-schema branch from 0126566 to 07d6d6e Compare May 6, 2022 16:09
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. Please don't forget to update gitops engine version before merging.

@leoluz leoluz added the cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch label May 31, 2022
leoluz added 11 commits May 31, 2022 12:11
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
@leoluz leoluz force-pushed the fix/ignore-diff-with-schema branch from 07d6d6e to d0312a1 Compare May 31, 2022 16:16
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ignoreDifferences.managedFieldsManagers not working as expected
2 participants