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

🌱 remove duplicate controller and installstrategy #252

Merged

Conversation

haoqing0110
Copy link
Member

@haoqing0110 haoqing0110 commented Mar 19, 2024

Summary

Ref open-cluster-management-io/ocm#355

  • Remove duplicate config controller and owner controller code in framework.
  • Remove WithInstallStrategy() func in framework.
  • If use addon-framework, remove annotation addon.open-cluster-management.io/lifecycle: self.

Related issue(s)

Fixes #

Signed-off-by: haoqing0110 <[email protected]>
Signed-off-by: haoqing0110 <[email protected]>
@haoqing0110
Copy link
Member Author

/assign @qiujian16

@haoqing0110 haoqing0110 changed the title [wip] 🌱 remove duplicate controller and installstrategy 🌱 remove duplicate controller and installstrategy Mar 25, 2024
@haoqing0110
Copy link
Member Author

/cc @zhujian7 @zhiweiyin318

)

// clusterManagementAddonController reconciles cma on the hub.
type clusterManagementAddonController struct {
// cmaManagedByController reconciles clustermanagementaddon on the hub
Copy link
Member

Choose a reason for hiding this comment

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

Is it necessary to remove this? will remove this controller later when addon manager no longer honor this annotation?

Copy link
Member Author

@haoqing0110 haoqing0110 Mar 26, 2024

Choose a reason for hiding this comment

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

Keep the controller is to remove the "self" added by framework 0.8.1/0.9.0.

will remove this controller later when addon manager no longer honor this annotation?

Yes. May need to keep this as long as we support 0.8.1/0.9.0, or users have to remove the "self" manually when they do a framework upgrade.

@qiujian16
Copy link
Member

/approve

Copy link
Contributor

openshift-ci bot commented Mar 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haoqing0110, 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
Copy link
Member

/assign @zhujian7

@zhujian7
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Mar 27, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit b0ef02a into open-cluster-management-io:main Mar 27, 2024
14 checks passed
@haoqing0110 haoqing0110 deleted the br-migration branch March 27, 2024 03:34
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.

3 participants