⚠️ remove cmamanagedby migration shim and drop addon-framework v0.9.3 support#383
⚠️ remove cmamanagedby migration shim and drop addon-framework v0.9.3 support#383tesshuflower wants to merge 1 commit into
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: tesshuflower The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (6)
💤 Files with no reviewable changes (4)
🚧 Files skipped from review as they are similar to previous changes (1)
WalkthroughThis PR removes the CMAManagedBy controller and its startup wiring, deletes the ManagedByAddonManager helper and v1alpha1 import, and updates tests to stop setting the addon lifecycle annotation when creating ClusterManagementAddOn objects. ChangesCMAManagedBy Controller and Lifecycle Annotation Removal
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related issues
Possibly related PRs
Suggested labels
Suggested reviewers
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
66a54c8 to
f11dab6
Compare
|
@coderabbitai review |
✅ Action performedReview finished.
|
|
/assign @haoqing0110 |
… support Removes all compatibility code that allowed addons built with addon-framework <=v0.9.3 (using the deprecated WithInstallStrategy()) to coexist with the OCM addon-manager via the lifecycle: self annotation. - Delete pkg/addonmanager/controllers/cmamanagedby/ — the migration shim that cleared lifecycle: self annotations on ClusterManagementAddOns - Remove cmamanagedby controller instantiation from base_manager.go - Remove ManagedByAddonManager filter function and AddonManagementFilterFunc type from pkg/utils/helpers.go — the annotation check is no longer needed - Remove lifecycle: addon-manager annotation from integration test CMA setup — the annotation is now inert and has no effect Addon developers still using WithInstallStrategy() must migrate to declaring spec.installStrategy in their ClusterManagementAddOn CR. See open-cluster-management-io/ocm#1428 Closes open-cluster-management-io/ocm#355 Signed-off-by: Tesshu Flower <tflower@redhat.com>
f11dab6 to
6dd2039
Compare
|
The e2e checks are hitting the same error with the GH action Started separate PR here to address: #386 |
Summary
Removes all compatibility code that allowed addons built with addon-framework ≤v0.9.3
(using the deprecated
WithInstallStrategy()) to coexist with the OCM addon-managervia the
lifecycle: selfannotation.WithInstallStrategy()was deprecated in v0.9.0and removed from addon-framework in v0.10.0. The migration period is now complete.
Changes
pkg/addonmanager/controllers/cmamanagedby/— the migration shim that clearedlifecycle: selfannotations onClusterManagementAddOnobjectscmamanagedbycontroller instantiation frombase_manager.goManagedByAddonManagerfilter function andAddonManagementFilterFunctypefrom
pkg/utils/helpers.go— no code reads the lifecycle annotation anymorelifecycle: addon-managerannotation from integration test CMA setup — now inertMigration
Addon developers still using
WithInstallStrategy()must migrate to declaringspec.installStrategyin theirClusterManagementAddOnCR. See thedeveloper guide.
Ref: open-cluster-management-io/ocm#1428
Summary by CodeRabbit
Refactor
Tests