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

set conflictResolution attribute for resources that follow dependency distribution #5731

Closed
wants to merge 1 commit into from

Conversation

chaosi-zju
Copy link
Member

@chaosi-zju chaosi-zju commented Oct 23, 2024

What type of PR is this?

/kind feature

What this PR does / why we need it:

When users enable dependency distribution for a resource template, it will inherit the ConflictResolution attribute from the resource they are following. As a result, we can migrate resources that follow dependency distribution.

Which issue(s) this PR fixes:

Fixes

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

`karmada-controller-manager`: set conflictResolution attribute for resources that follow dependency distribution

@karmada-bot karmada-bot added the kind/feature Categorizes issue or PR as related to a new feature. label Oct 23, 2024
@karmada-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign xishanyongye-chang for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 23, 2024
@codecov-commenter
Copy link

codecov-commenter commented Oct 23, 2024

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 40.86%. Comparing base (7347f11) to head (2393b0c).

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

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5731      +/-   ##
==========================================
- Coverage   40.86%   40.86%   -0.01%     
==========================================
  Files         651      651              
  Lines       55259    55262       +3     
==========================================
- Hits        22582    22581       -1     
- Misses      31237    31240       +3     
- Partials     1440     1441       +1     
Flag Coverage Δ
unittests 40.86% <100.00%> (-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.

@RainbowMango
Copy link
Member

Fixes #5577

??

@RainbowMango
Copy link
Member

Duplicate of #4418.

@RainbowMango
Copy link
Member

Duplicate of #4418

@RainbowMango RainbowMango marked this as a duplicate of #4418 Oct 25, 2024
@RainbowMango
Copy link
Member

/close

@karmada-bot
Copy link
Collaborator

@RainbowMango: Closed this PR.

In response to this:

/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Categorizes issue or PR as related to a new feature. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants