⚠️ remove cmamanagedby migration shim and drop addon-framework v0.9.3 support (#383)

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>

Author: tesshuflower

pkg/addonmanager/base_manager.go

@@ -20,7 +20,6 @@ import (
 	"open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/agentdeploy"
 	"open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/certificate"
 	"open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/cmaconfig"
-	"open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/cmamanagedby"
 	"open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/registration"
 	"open-cluster-management.io/addon-framework/pkg/agent"
 	"open-cluster-management.io/addon-framework/pkg/utils"
@@ -163,16 +162,6 @@ func (a *BaseAddonManagerImpl) StartWithInformers(ctx context.Context,
 		mcaFilterFunc,
 	)
 
-	// This controller is used during migrating addons to be managed by addon-manager.
-	// This should be removed when the migration is done.
-	// The migration plan refer to https://github.com/open-cluster-management-io/ocm/issues/355.
-	managementAddonController := cmamanagedby.NewCMAManagedByController(
-		addonClient,
-		addonInformers.Addon().V1beta1().ClusterManagementAddOns(),
-		a.addonAgents,
-		utils.FilterByAddonName(a.addonAgents),
-	)
-
 	var addonConfigController, managementAddonConfigController factory.Controller
 	if len(a.addonConfigs) != 0 {
 		// ManagedClusterAddOn filter is intentionally disabled for the addon-config-controller.
@@ -225,7 +214,6 @@ func (a *BaseAddonManagerImpl) StartWithInformers(ctx context.Context,
 
 	go deployController.Run(ctx, 1)
 	go registrationController.Run(ctx, 1)
-	go managementAddonController.Run(ctx, 1)
 
 	if addonConfigController != nil {
 		go addonConfigController.Run(ctx, 1)

pkg/addonmanager/controllers/cmamanagedby/controller.go

@@ -18,11 +18,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1"
 
-	addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
+	"open-cluster-management.io/addon-framework/pkg/agent"
 	addonapiv1beta1 "open-cluster-management.io/api/addon/v1beta1"
 	clusterv1 "open-cluster-management.io/api/cluster/v1"
-
-	"open-cluster-management.io/addon-framework/pkg/agent"
 )
 
 func MergeRelatedObjects(modified *bool, objs *[]addonapiv1beta1.ObjectReference, obj addonapiv1beta1.ObjectReference) {
@@ -249,24 +247,6 @@ func ownerRefMatched(existing, required metav1.OwnerReference) bool {
 	return true
 }
 
-// AddonManagementFilterFunc is to check if the addon should be managed by addon manager or self-managed
-type AddonManagementFilterFunc func(cma *addonapiv1beta1.ClusterManagementAddOn) bool
-
-func ManagedByAddonManager(obj interface{}) bool {
-	accessor, _ := meta.Accessor(obj)
-	annotations := accessor.GetAnnotations()
-	if len(annotations) == 0 {
-		return true
-	}
-
-	value, ok := annotations[addonapiv1alpha1.AddonLifecycleAnnotationKey]
-	if !ok {
-		return true
-	}
-
-	return value == addonapiv1alpha1.AddonLifecycleAddonManagerAnnotationValue
-}
-
 func FilterByAddonName(agentAddons map[string]agent.AgentAddon) func(obj interface{}) bool {
 	return func(obj interface{}) bool {
 		accessor, _ := meta.Accessor(obj)

pkg/addonmanager/controllers/cmamanagedby/controller_test.go

@@ -14,7 +14,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"open-cluster-management.io/addon-framework/pkg/utils"
-	addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
 	addonapiv1beta1 "open-cluster-management.io/api/addon/v1beta1"
 )
 
@@ -55,9 +54,6 @@ func createClusterManagementAddOn(name, defaultConfigNamespace, defaultConfigNam
 			&addonapiv1beta1.ClusterManagementAddOn{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: name,
-					Annotations: map[string]string{
-						addonapiv1alpha1.AddonLifecycleAnnotationKey: addonapiv1alpha1.AddonLifecycleAddonManagerAnnotationValue,
-					},
 				},
 				Spec: addonapiv1beta1.ClusterManagementAddOnSpec{
 					DefaultConfigs: []addonapiv1beta1.AddOnConfig{

pkg/utils/helpers.go

@@ -54,9 +54,6 @@ func createClusterManagementAddOn(name, defaultConfigNamespace, defaultConfigNam
 			&addonapiv1alpha1.ClusterManagementAddOn{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: name,
-					Annotations: map[string]string{
-						addonapiv1alpha1.AddonLifecycleAnnotationKey: addonapiv1alpha1.AddonLifecycleAddonManagerAnnotationValue,
-					},
 				},
 				Spec: addonapiv1alpha1.ClusterManagementAddOnSpec{
 					SupportedConfigs: []addonapiv1alpha1.ConfigMeta{