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 manifestwork and appliedmanifestwork unsync issue #636

Merged

Conversation

qiujian16
Copy link
Member

merge the two controller as reconcilers for one controller

Summary

Related issue(s)

Fixes #

@qiujian16
Copy link
Member Author

/hold

@qiujian16 qiujian16 force-pushed the fix-amw-unsync branch 2 times, most recently from eb1bf59 to 133ebcf Compare September 30, 2024 06:23
Copy link

codecov bot commented Sep 30, 2024

Codecov Report

Attention: Patch coverage is 72.26027% with 81 lines in your changes missing coverage. Please review.

Project coverage is 63.75%. Comparing base (2b86b8d) to head (64d8f73).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...lers/manifestcontroller/manifestwork_reconciler.go 75.94% 30 Missing and 8 partials ⚠️
...nifestcontroller/appliedmanifestwork_reconciler.go 67.04% 23 Missing and 6 partials ⚠️
...lers/manifestcontroller/manifestwork_controller.go 58.82% 13 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #636      +/-   ##
==========================================
+ Coverage   63.64%   63.75%   +0.10%     
==========================================
  Files         182      183       +1     
  Lines       17634    17615      -19     
==========================================
+ Hits        11223    11230       +7     
+ Misses       5480     5458      -22     
+ Partials      931      927       -4     
Flag Coverage Δ
unit 63.75% <72.26%> (+0.10%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

openshift-ci bot commented Oct 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qiujian16

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@qiujian16 qiujian16 force-pushed the fix-amw-unsync branch 2 times, most recently from 11c472e to 333faf4 Compare October 29, 2024 06:57
}

return err
if !mwUpdated && !amwUpdated && requeueTime < MaxRequeueDuration {
Copy link
Contributor

Choose a reason for hiding this comment

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

In a case where a ManifestWork includes more than 1 manifest and one of them is failed to apply due to lack of permission, wmUpdated and amwUpdated will be true and requeueTime will be less than MaxRequeueDuration, but the requeue is still needed.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think so

merge the two controller as reconcilers for one controller

Signed-off-by: Jian Qiu <[email protected]>
Signed-off-by: Jian Qiu <[email protected]>
@elgnay
Copy link
Contributor

elgnay commented Nov 11, 2024

/lgtm

@qiujian16
Copy link
Member Author

/unhold

@openshift-merge-bot openshift-merge-bot bot merged commit 5911a7e into open-cluster-management-io:main Nov 11, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants