✨ Add template-based addon handling to prevent premature processing (open-cluster-management-io#334)

* Rename addonFilterFunc to cmaFilterFunc for clarity

The filter function parameter is specifically used for ClusterManagementAddon
objects, so the new name cmaFilterFunc is more descriptive and accurate than
the generic addonFilterFunc.

Signed-off-by: Claude <[email protected]>
🤖 Generated with Claude Code

Co-Authored-By: Claude <[email protected]>
Signed-off-by: zhujian <[email protected]>

* Add ManagedClusterAddOn filter functionality to addon framework

This commit introduces a new filtering mechanism for ManagedClusterAddOn objects
to enable selective processing of addons based on custom criteria.

Key changes:
1. Created pkg/utils/addon.go with filter functions:
   - ManagedClusterAddOnFilterFunc type for custom filtering
   - AllowAllAddOns function that accepts all addons
   - FilterTemplateBasedAddOns function that filters template-based addons

2. Updated all addon controllers to accept and use the filter function:
   - addonconfig controller
   - agentdeploy controller
   - certificate controllers (CSR approve/sign)
   - registration controller

3. Added comprehensive test coverage in pkg/utils/addon_test.go

4. Updated BaseAddonManager interface to include mcaFilterFunc parameter

This enables selective processing of addons, particularly useful for
filtering template-based addons vs regular addons based on their
status.configReferences.

🤖 Generated with Claude Code

Co-Authored-By: Claude <[email protected]>
Signed-off-by: zhujian <[email protected]>

* Fix error handling in registration controller

Improve error handling in addonRegistrationController.sync() by:
- Only returning errors when operations actually fail
- Adding proper error wrapping with descriptive messages
- Returning nil when operations succeed

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>
Signed-off-by: zhujian <[email protected]>

* Improve templateBasedAddOn parameter documentation and implementation

- Rename parameter from templateAddOn to templateBasedAddOn for clarity
- Add comprehensive documentation explaining the parameter's purpose
- Update comments to explain why addon-config-controller bypasses filtering
- Remove mcaFilterFunc parameter from addon-config-controller
- Reference GitHub issue #1181 for additional context
- Fix typos and improve comment readability

This change helps prevent premature processing of template-based addons
before their configurations are ready, reducing unnecessary errors.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>
Signed-off-by: zhujian <[email protected]>

* Refactor template-based addon handling to avoid breaking interface changes

- Move templateBasedAddOn parameter from interface to concrete implementation
- Add SetTemplateBasedAddOn() method to BaseAddonManager interface
- Add templateBasedAddOn field to BaseAddonManagerImpl struct
- Revert StartWithInformers interface to original signature
- Update all callers to use the original interface method
- Maintain backward compatibility while providing new functionality

This allows users to configure template-based addon handling through the
public API without breaking existing external implementations:

  manager, _ := addonmanager.New(config)
  manager.SetTemplateBasedAddOn(true)  // Enable template filtering
  manager.StartWithInformers(ctx, ...) // Uses configured setting

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>
Signed-off-by: zhujian <[email protected]>

* Rename SetTemplateBasedAddOn to SetTemplateMode for better clarity

- Update method name from SetTemplateBasedAddOn to SetTemplateMode
- Change parameter name from templateBasedAddOn to enabled
- Keep existing comments and documentation unchanged
- Provides cleaner, more intuitive API naming

Usage becomes:
  manager.SetTemplateMode(true)  // Enable template mode

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>
Signed-off-by: zhujian <[email protected]>

* Refactor to use constructor options pattern to avoid breaking interface changes

- Remove SetTemplateMode method from BaseAddonManager interface
- Add Option type and WithTemplateMode(bool) constructor option
- Update NewBaseAddonManagerImpl to accept ...Option parameters
- Add NewWithOptions function for public API with options
- Preserve existing New() function for backward compatibility
- Remove SetTemplateMode method from implementation

This maintains full backward compatibility while providing template mode
configuration through constructor options:

  // Existing usage unchanged
  manager, _ := addonmanager.New(config)

  // New usage with template mode
  manager, _ := addonmanager.NewWithOptions(config, addonmanager.WithTemplateMode(true))

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>
Signed-off-by: zhujian <[email protected]>

* Implement public Option struct with OptionFunc pattern

- Add public Option struct with public TemplateBasedAddOn field
- Add OptionFunc type and WithTemplateMode function
- Add WithOption helper to bridge struct and functional patterns
- Remove NewWithOptions in favor of unified NewWithOptionFuncs
- Remove ApplyOptions method to keep cleaner API
- Fix tautological condition warning

This provides flexible configuration supporting both patterns:
  // Functional pattern
  manager, _ := addonmanager.NewWithOptionFuncs(config, addonmanager.WithTemplateMode(true))

  // Struct pattern with helper
  opt := &addonmanager.Option{TemplateBasedAddOn: true}
  manager, _ := addonmanager.NewWithOptionFuncs(config, addonmanager.WithOption(opt))

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>
Signed-off-by: zhujian <[email protected]>

---------

Signed-off-by: zhujian <[email protected]>
Co-authored-by: Claude <[email protected]>

Author: zhujian7

pkg/addonmanager/base_manager.go

@@ -26,13 +26,47 @@ import (
 	"open-cluster-management.io/sdk-go/pkg/basecontroller/factory"
 )
 
+// Option contains configuration options for BaseAddonManagerImpl.
+type Option struct {
+	// TemplateBasedAddOn configures whether the manager is handling template-based addons.
+	//   - true: all ManagedClusterAddOn controllers except "addon-config-controller" will only process addons
+	//     when the referenced AddOnTemplate resources in their status.configReferences are properly set;
+	//     the "addon-config-controller" is responsible for setting these values
+	//   - false: process all addons without waiting for template configuration
+	//
+	// This prevents premature processing of template-based addons before their configurations
+	// are fully ready, avoiding unnecessary errors and retries.
+	// See https://github.com/open-cluster-management-io/ocm/issues/1181 for more context.
+	TemplateBasedAddOn bool
+}
+
+// OptionFunc is a function that modifies Option.
+type OptionFunc func(*Option)
+
+// WithTemplateMode returns an OptionFunc that sets the template mode.
+func WithTemplateMode(enabled bool) OptionFunc {
+	return func(option *Option) {
+		option.TemplateBasedAddOn = enabled
+	}
+}
+
+// WithOption returns an OptionFunc that applies the given Option struct.
+func WithOption(opt *Option) OptionFunc {
+	return func(option *Option) {
+		if opt != nil {
+			*option = *opt
+		}
+	}
+}
+
 // BaseAddonManagerImpl is the base implementation of BaseAddonManager
 // that manages the addon agents and configs.
 type BaseAddonManagerImpl struct {
-	addonAgents  map[string]agent.AgentAddon
-	addonConfigs map[schema.GroupVersionResource]bool
-	config       *rest.Config
-	syncContexts []factory.SyncContext
+	addonAgents        map[string]agent.AgentAddon
+	addonConfigs       map[schema.GroupVersionResource]bool
+	config             *rest.Config
+	syncContexts       []factory.SyncContext
+	templateBasedAddOn bool
 }
 
 // NewBaseAddonManagerImpl creates a new BaseAddonManagerImpl instance with the given config.
@@ -45,6 +79,15 @@ func NewBaseAddonManagerImpl(config *rest.Config) *BaseAddonManagerImpl {
 	}
 }
 
+// ApplyOptionFuncs applies OptionFunc functions to create and configure options.
+func (a *BaseAddonManagerImpl) ApplyOptionFuncs(optionFuncs ...OptionFunc) {
+	option := &Option{}
+	for _, fn := range optionFuncs {
+		fn(option)
+	}
+	a.templateBasedAddOn = option.TemplateBasedAddOn
+}
+
 func (a *BaseAddonManagerImpl) GetConfig() *rest.Config {
 	return a.config
 }
@@ -77,7 +120,13 @@ func (a *BaseAddonManagerImpl) StartWithInformers(ctx context.Context,
 	kubeInformers kubeinformers.SharedInformerFactory,
 	addonInformers addoninformers.SharedInformerFactory,
 	clusterInformers clusterv1informers.SharedInformerFactory,
-	dynamicInformers dynamicinformer.DynamicSharedInformerFactory) error {
+	dynamicInformers dynamicinformer.DynamicSharedInformerFactory,
+) error {
+	// Determine the appropriate filter function based on templateBasedAddOn field
+	mcaFilterFunc := utils.AllowAllAddOns
+	if a.templateBasedAddOn {
+		mcaFilterFunc = utils.FilterTemplateBasedAddOns
+	}
 
 	kubeClient, err := kubernetes.NewForConfig(a.config)
 	if err != nil {
@@ -107,13 +156,15 @@ func (a *BaseAddonManagerImpl) StartWithInformers(ctx context.Context,
 		addonInformers.Addon().V1alpha1().ManagedClusterAddOns(),
 		workInformers,
 		a.addonAgents,
+		mcaFilterFunc,
 	)
 
 	registrationController := registration.NewAddonRegistrationController(
 		addonClient,
 		clusterInformers.Cluster().V1().ManagedClusters(),
 		addonInformers.Addon().V1alpha1().ManagedClusterAddOns(),
 		a.addonAgents,
+		mcaFilterFunc,
 	)
 
 	// This controller is used during migrating addons to be managed by addon-manager.
@@ -128,6 +179,13 @@ func (a *BaseAddonManagerImpl) StartWithInformers(ctx context.Context,
 
 	var addonConfigController, managementAddonConfigController factory.Controller
 	if len(a.addonConfigs) != 0 {
+		// ManagedClusterAddOn filter is intentionally disabled for the addon-config-controller.
+		// This is because template-based addons require this controller to set the specHash in
+		// managedclusteraddon.status.configReferences for addontemplates. Without this, all other
+		// ManagedClusterAddOn controllers would wait indefinitely for the template configurations
+		// to be applied.
+		// Consider moving the logic of setting managedclusteraddon.status.configReferences
+		// for addontemplates to the ocm addon-manager.
 		addonConfigController = addonconfig.NewAddonConfigController(
 			addonClient,
 			addonInformers.Addon().V1alpha1().ManagedClusterAddOns(),
@@ -159,13 +217,15 @@ func (a *BaseAddonManagerImpl) StartWithInformers(ctx context.Context,
 			nil,
 			addonInformers.Addon().V1alpha1().ManagedClusterAddOns(),
 			a.addonAgents,
+			mcaFilterFunc,
 		)
 		csrSignController = certificate.NewCSRSignController(
 			kubeClient,
 			clusterInformers.Cluster().V1().ManagedClusters(),
 			kubeInformers.Certificates().V1().CertificateSigningRequests(),
 			addonInformers.Addon().V1alpha1().ManagedClusterAddOns(),
 			a.addonAgents,
+			mcaFilterFunc,
 		)
 	} else if v1beta1Supported {
 		csrApproveController = certificate.NewCSRApprovingController(
@@ -175,6 +235,7 @@ func (a *BaseAddonManagerImpl) StartWithInformers(ctx context.Context,
 			kubeInformers.Certificates().V1beta1().CertificateSigningRequests(),
 			addonInformers.Addon().V1alpha1().ManagedClusterAddOns(),
 			a.addonAgents,
+			mcaFilterFunc,
 		)
 	}
 

pkg/addonmanager/cloudevents/manager.go

@@ -176,7 +176,8 @@ func (a *cloudeventsAddonManager) Start(ctx context.Context) error {
 		return err
 	}
 
-	err = a.StartWithInformers(ctx, workClient, workInformers, kubeInformers, addonInformers, clusterInformers, dynamicInformers)
+	err = a.StartWithInformers(ctx, workClient, workInformers, kubeInformers, addonInformers, clusterInformers,
+		dynamicInformers)
 	if err != nil {
 		return err
 	}

pkg/addonmanager/controllers/addonconfig/controller.go

@@ -36,7 +36,7 @@ type addonConfigController struct {
 	addonIndexer                 cache.Indexer
 	configListers                map[schema.GroupResource]dynamiclister.Lister
 	queue                        workqueue.TypedRateLimitingInterface[string]
-	addonFilterFunc              factory.EventFilterFunc
+	cmaFilterFunc                factory.EventFilterFunc
 	configGVRs                   map[schema.GroupVersionResource]bool
 	clusterManagementAddonLister addonlisterv1alpha1.ClusterManagementAddOnLister
 }
@@ -47,7 +47,7 @@ func NewAddonConfigController(
 	clusterManagementAddonInformers addoninformerv1alpha1.ClusterManagementAddOnInformer,
 	configInformerFactory dynamicinformer.DynamicSharedInformerFactory,
 	configGVRs map[schema.GroupVersionResource]bool,
-	addonFilterFunc factory.EventFilterFunc,
+	cmaFilterFunc factory.EventFilterFunc,
 ) factory.Controller {
 	syncCtx := factory.NewSyncContext(controllerName)
 
@@ -57,7 +57,7 @@ func NewAddonConfigController(
 		addonIndexer:                 addonInformers.Informer().GetIndexer(),
 		configListers:                map[schema.GroupResource]dynamiclister.Lister{},
 		queue:                        syncCtx.Queue(),
-		addonFilterFunc:              addonFilterFunc,
+		cmaFilterFunc:                cmaFilterFunc,
 		configGVRs:                   configGVRs,
 		clusterManagementAddonLister: clusterManagementAddonInformers.Lister(),
 	}
@@ -153,7 +153,7 @@ func (c *addonConfigController) sync(ctx context.Context, syncCtx factory.SyncCo
 		return err
 	}
 
-	if !c.addonFilterFunc(cma) {
+	if c.cmaFilterFunc != nil && !c.cmaFilterFunc(cma) {
 		return nil
 	}
 

pkg/addonmanager/controllers/addonconfig/controller_test.go

@@ -371,7 +371,7 @@ func TestSync(t *testing.T) {
 				addonLister:                  addonInformers.Addon().V1alpha1().ManagedClusterAddOns().Lister(),
 				clusterManagementAddonLister: addonInformers.Addon().V1alpha1().ClusterManagementAddOns().Lister(),
 				configListers:                map[schema.GroupResource]dynamiclister.Lister{},
-				addonFilterFunc:              func(obj interface{}) bool { return true },
+				cmaFilterFunc:                func(obj interface{}) bool { return true },
 				configGVRs:                   map[schema.GroupVersionResource]bool{fakeGVR: true},
 			}
 

pkg/addonmanager/controllers/agentdeploy/controller.go

@@ -32,6 +32,7 @@ import (
 	"open-cluster-management.io/addon-framework/pkg/addonmanager/constants"
 	"open-cluster-management.io/addon-framework/pkg/agent"
 	"open-cluster-management.io/addon-framework/pkg/index"
+	"open-cluster-management.io/addon-framework/pkg/utils"
 	"open-cluster-management.io/sdk-go/pkg/basecontroller/factory"
 )
 
@@ -50,6 +51,7 @@ type addonDeployController struct {
 	workIndexer                cache.Indexer
 	agentAddons                map[string]agent.AgentAddon
 	queue                      workqueue.TypedRateLimitingInterface[string]
+	mcaFilterFunc              utils.ManagedClusterAddOnFilterFunc
 }
 
 func NewAddonDeployController(
@@ -59,6 +61,7 @@ func NewAddonDeployController(
 	addonInformers addoninformerv1alpha1.ManagedClusterAddOnInformer,
 	workInformers workinformers.ManifestWorkInformer,
 	agentAddons map[string]agent.AgentAddon,
+	mcaFilterFunc utils.ManagedClusterAddOnFilterFunc,
 ) factory.Controller {
 	syncCtx := factory.NewSyncContext(controllerName)
 
@@ -74,6 +77,7 @@ func NewAddonDeployController(
 		managedClusterAddonIndexer: addonInformers.Informer().GetIndexer(),
 		workIndexer:                workInformers.Informer().GetIndexer(),
 		agentAddons:                agentAddons,
+		mcaFilterFunc:              mcaFilterFunc,
 	}
 
 	c.setClusterInformerHandler(clusterInformers)
@@ -235,6 +239,10 @@ func (c *addonDeployController) sync(ctx context.Context, syncCtx factory.SyncCo
 		return err
 	}
 
+	if c.mcaFilterFunc != nil && !c.mcaFilterFunc(addon) {
+		return nil
+	}
+
 	// to deploy agents if there is RegistrationApplied condition.
 	if meta.FindStatusCondition(addon.Status.Conditions, addonapiv1alpha1.ManagedClusterAddOnRegistrationApplied) == nil {
 		return nil
@@ -307,7 +315,7 @@ func (c *addonDeployController) sync(ctx context.Context, syncCtx factory.SyncCo
 	}
 
 	if err = c.updateAddon(ctx, addon, oldAddon); err != nil {
-		return err
+		return fmt.Errorf("failed to update addon %s/%s: %w", addon.Namespace, addon.Name, err)
 	}
 	return errorsutil.NewAggregate(errs)
 }
@@ -317,7 +325,10 @@ func (c *addonDeployController) sync(ctx context.Context, syncCtx factory.SyncCo
 func (c *addonDeployController) updateAddon(ctx context.Context, new, old *addonapiv1alpha1.ManagedClusterAddOn) error {
 	if !equality.Semantic.DeepEqual(new.GetFinalizers(), old.GetFinalizers()) {
 		_, err := c.addonClient.AddonV1alpha1().ManagedClusterAddOns(new.Namespace).Update(ctx, new, metav1.UpdateOptions{})
-		return err
+		if err != nil {
+			return fmt.Errorf("failed to update addon finalizers: %w", err)
+		}
+		return nil
 	}
 
 	addonPatcher := patcher.NewPatcher[
@@ -326,7 +337,10 @@ func (c *addonDeployController) updateAddon(ctx context.Context, new, old *addon
 		addonapiv1alpha1.ManagedClusterAddOnStatus](c.addonClient.AddonV1alpha1().ManagedClusterAddOns(new.Namespace))
 
 	_, err := addonPatcher.PatchStatus(ctx, new, new.Status, old.Status)
-	return err
+	if err != nil {
+		return fmt.Errorf("failed to update addon status: %w", err)
+	}
+	return nil
 }
 
 func (c *addonDeployController) applyWork(ctx context.Context, appliedType string,

pkg/addonmanager/controllers/certificate/csrapprove.go

@@ -27,6 +27,7 @@ import (
 	clusterv1 "open-cluster-management.io/api/cluster/v1"
 
 	"open-cluster-management.io/addon-framework/pkg/agent"
+	"open-cluster-management.io/addon-framework/pkg/utils"
 	"open-cluster-management.io/sdk-go/pkg/basecontroller/factory"
 )
 
@@ -58,6 +59,7 @@ type csrApprovingController struct {
 	managedClusterAddonLister addonlisterv1alpha1.ManagedClusterAddOnLister
 	csrLister                 certificateslisters.CertificateSigningRequestLister
 	csrListerBeta             v1beta1certificateslisters.CertificateSigningRequestLister
+	mcaFilterFunc             utils.ManagedClusterAddOnFilterFunc
 }
 
 // NewCSRApprovingController creates a new csr approving controller
@@ -68,6 +70,7 @@ func NewCSRApprovingController(
 	csrBetaInformer v1beta1certificatesinformers.CertificateSigningRequestInformer,
 	addonInformers addoninformerv1alpha1.ManagedClusterAddOnInformer,
 	agentAddons map[string]agent.AgentAddon,
+	mcaFilterFunc utils.ManagedClusterAddOnFilterFunc,
 ) factory.Controller {
 	if (csrV1Informer != nil) == (csrBetaInformer != nil) {
 		klog.Fatalf("V1 and V1beta1 CSR informer cannot be present or absent at the same time")
@@ -77,6 +80,7 @@ func NewCSRApprovingController(
 		agentAddons:               agentAddons,
 		managedClusterLister:      clusterInformers.Lister(),
 		managedClusterAddonLister: addonInformers.Lister(),
+		mcaFilterFunc:             mcaFilterFunc,
 	}
 	var csrInformer cache.SharedIndexInformer
 	if csrV1Informer != nil {
@@ -162,6 +166,9 @@ func (c *csrApprovingController) sync(ctx context.Context, syncCtx factory.SyncC
 	if err != nil {
 		return err
 	}
+	if c.mcaFilterFunc != nil && !c.mcaFilterFunc(managedClusterAddon) {
+		return nil
+	}
 
 	if registrationOption.CSRApproveCheck == nil {
 		klog.V(4).Infof("addon csr %q cannont be auto approved due to approve check not defined", csr.GetName())

pkg/addonmanager/controllers/certificate/csrsign.go

@@ -22,6 +22,7 @@ import (
 	clusterv1 "open-cluster-management.io/api/cluster/v1"
 
 	"open-cluster-management.io/addon-framework/pkg/agent"
+	"open-cluster-management.io/addon-framework/pkg/utils"
 	"open-cluster-management.io/sdk-go/pkg/basecontroller/factory"
 )
 
@@ -32,6 +33,7 @@ type csrSignController struct {
 	managedClusterLister      clusterlister.ManagedClusterLister
 	managedClusterAddonLister addonlisterv1alpha1.ManagedClusterAddOnLister
 	csrLister                 certificateslisters.CertificateSigningRequestLister
+	mcaFilterFunc             utils.ManagedClusterAddOnFilterFunc
 }
 
 // NewCSRApprovingController creates a new csr approving controller
@@ -41,13 +43,15 @@ func NewCSRSignController(
 	csrInformer certificatesinformers.CertificateSigningRequestInformer,
 	addonInformers addoninformerv1alpha1.ManagedClusterAddOnInformer,
 	agentAddons map[string]agent.AgentAddon,
+	mcaFilterFunc utils.ManagedClusterAddOnFilterFunc,
 ) factory.Controller {
 	c := &csrSignController{
 		kubeClient:                kubeClient,
 		agentAddons:               agentAddons,
 		managedClusterLister:      clusterInformers.Lister(),
 		managedClusterAddonLister: addonInformers.Lister(),
 		csrLister:                 csrInformer.Lister(),
+		mcaFilterFunc:             mcaFilterFunc,
 	}
 	return factory.New().
 		WithFilteredEventsInformersQueueKeysFunc(
@@ -131,6 +135,9 @@ func (c *csrSignController) sync(ctx context.Context, syncCtx factory.SyncContex
 	if err != nil {
 		return err
 	}
+	if c.mcaFilterFunc != nil && !c.mcaFilterFunc(addon) {
+		return nil
+	}
 
 	if registrationOption.CSRSign == nil {
 		return nil

pkg/addonmanager/controllers/cmaconfig/controller.go

@@ -37,7 +37,7 @@ type cmaConfigController struct {
 	clusterManagementAddonIndexer cache.Indexer
 	configListers                 map[schema.GroupResource]dynamiclister.Lister
 	queue                         workqueue.TypedRateLimitingInterface[string]
-	addonFilterFunc               factory.EventFilterFunc
+	cmaFilterFunc                 factory.EventFilterFunc
 	configGVRs                    map[schema.GroupVersionResource]bool
 	addonPatcher                  patcher.Patcher[*addonapiv1alpha1.ClusterManagementAddOn,
 		addonapiv1alpha1.ClusterManagementAddOnSpec,
@@ -49,7 +49,7 @@ func NewCMAConfigController(
 	clusterManagementAddonInformers addoninformerv1alpha1.ClusterManagementAddOnInformer,
 	configInformerFactory dynamicinformer.DynamicSharedInformerFactory,
 	configGVRs map[schema.GroupVersionResource]bool,
-	addonFilterFunc factory.EventFilterFunc,
+	cmaFilterFunc factory.EventFilterFunc,
 ) factory.Controller {
 	syncCtx := factory.NewSyncContext(controllerName)
 
@@ -59,7 +59,7 @@ func NewCMAConfigController(
 		clusterManagementAddonIndexer: clusterManagementAddonInformers.Informer().GetIndexer(),
 		configListers:                 map[schema.GroupResource]dynamiclister.Lister{},
 		queue:                         syncCtx.Queue(),
-		addonFilterFunc:               addonFilterFunc,
+		cmaFilterFunc:                 cmaFilterFunc,
 		configGVRs:                    configGVRs,
 		addonPatcher: patcher.NewPatcher[*addonapiv1alpha1.ClusterManagementAddOn,
 			addonapiv1alpha1.ClusterManagementAddOnSpec,
@@ -145,7 +145,7 @@ func (c *cmaConfigController) sync(ctx context.Context, syncCtx factory.SyncCont
 		return err
 	}
 
-	if !c.addonFilterFunc(cma) {
+	if c.cmaFilterFunc != nil && !c.cmaFilterFunc(cma) {
 		return nil
 	}
 

pkg/addonmanager/controllers/cmaconfig/controller_test.go

@@ -259,7 +259,7 @@ func TestSync(t *testing.T) {
 				addonClient:                  fakeAddonClient,
 				clusterManagementAddonLister: addonInformers.Addon().V1alpha1().ClusterManagementAddOns().Lister(),
 				configListers:                map[schema.GroupResource]dynamiclister.Lister{},
-				addonFilterFunc:              func(obj interface{}) bool { return true },
+				cmaFilterFunc:                func(obj interface{}) bool { return true },
 				configGVRs:                   map[schema.GroupVersionResource]bool{fakeGVR: true},
 				addonPatcher: patcher.NewPatcher[*addonapiv1alpha1.ClusterManagementAddOn,
 					addonapiv1alpha1.ClusterManagementAddOnSpec,