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

fixes an issue where the cluster-status-controller overwrites the remedyActions field #5030

Merged
merged 1 commit into from
Jun 12, 2024

Conversation

XiShanYongYe-Chang
Copy link
Member

@XiShanYongYe-Chang XiShanYongYe-Chang commented Jun 7, 2024

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

In order to fix the ci error:

https://github.com/karmada-io/karmada/actions/runs/9410947609/job/25923580671
https://github.com/karmada-io/karmada/actions/runs/9413749877/job/25931419319?pr=4986

Root error:

The cluster-status-controller updates cluster status while remedy-controller is updating cluster status, remedyActions field is overwritten by the cluster-status-controller.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

`karmada-controller-manager`: Fixed an issue that the cluster-status-controller overwrites the remedyActions field.

@karmada-bot karmada-bot added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Jun 7, 2024
@karmada-bot karmada-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 7, 2024
@XiShanYongYe-Chang XiShanYongYe-Chang changed the title add more infomation in the remedy-controller [WIP] add more infomation in the remedy-controller Jun 7, 2024
@karmada-bot karmada-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 7, 2024
@codecov-commenter
Copy link

codecov-commenter commented Jun 7, 2024

Codecov Report

Attention: Patch coverage is 83.33333% with 1 line in your changes missing coverage. Please review.

Project coverage is 28.23%. Comparing base (2ad9cbb) to head (d5a317a).

Files Patch % Lines
pkg/controllers/remediation/remedy_controller.go 0.00% 1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #5030   +/-   ##
=======================================
  Coverage   28.22%   28.23%           
=======================================
  Files         632      632           
  Lines       43431    43435    +4     
=======================================
+ Hits        12258    12262    +4     
  Misses      30278    30278           
  Partials      895      895           
Flag Coverage Δ
unittests 28.23% <83.33%> (+<0.01%) ⬆️

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.

@XiShanYongYe-Chang XiShanYongYe-Chang force-pushed the remedy-e2e-errors branch 2 times, most recently from 431b8d9 to bd0f584 Compare June 11, 2024 03:37
@karmada-bot karmada-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 11, 2024
@XiShanYongYe-Chang
Copy link
Member Author

/retest

@XiShanYongYe-Chang XiShanYongYe-Chang force-pushed the remedy-e2e-errors branch 2 times, most recently from 9ce54fc to 6274662 Compare June 11, 2024 08:51
@karmada-bot karmada-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 11, 2024
@karmada-bot karmada-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 11, 2024
@XiShanYongYe-Chang XiShanYongYe-Chang force-pushed the remedy-e2e-errors branch 3 times, most recently from a3b294f to c7609cf Compare June 11, 2024 12:40
@karmada-bot karmada-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 11, 2024
@karmada-bot karmada-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 11, 2024
@XiShanYongYe-Chang XiShanYongYe-Chang changed the title [WIP] add more infomation in the remedy-controller add more infomation in the remedy-controller Jun 12, 2024
@karmada-bot karmada-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 12, 2024
@XiShanYongYe-Chang
Copy link
Member Author

/kind bug

@karmada-bot karmada-bot added the kind/bug Categorizes issue or PR as related to a bug. label Jun 12, 2024
@XiShanYongYe-Chang XiShanYongYe-Chang changed the title add more infomation in the remedy-controller fixes an issue where the cluster-status-controller overwrites the remedyActions field Jun 12, 2024
@XiShanYongYe-Chang
Copy link
Member Author

/cc @RainbowMango

@karmada-bot karmada-bot requested a review from RainbowMango June 12, 2024 02:39
@whitewindmills
Copy link
Member

/assign

Signed-off-by: changzhen <[email protected]>
@karmada-bot karmada-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 12, 2024
Copy link
Member

@whitewindmills whitewindmills left a comment

Choose a reason for hiding this comment

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

/lgtm

@karmada-bot karmada-bot added the lgtm Indicates that a PR is ready to be merged. label Jun 12, 2024
@RainbowMango
Copy link
Member

/approve

@karmada-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: RainbowMango

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

@karmada-bot karmada-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 12, 2024
@karmada-bot karmada-bot merged commit 2ed4d77 into karmada-io:master Jun 12, 2024
12 checks passed
@XiShanYongYe-Chang XiShanYongYe-Chang deleted the remedy-e2e-errors branch June 12, 2024 09:17
karmada-bot added a commit that referenced this pull request Jun 13, 2024
…k-of-#5030-upstream-release-1.9

Automated cherry pick of #5030: fix-remedy-e2e-errors
karmada-bot added a commit that referenced this pull request Jun 13, 2024
…k-of-#5030-upstream-release-1.10

Automated cherry pick of #5030: fix-remedy-e2e-errors
@RainbowMango RainbowMango added this to the v1.11 milestone Aug 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants