Enable selectable watching core provider changes in generic reconcilers

enable it for all non core provider types (Infrastructure, Bootstrap, ControlPlane, Addon, IPAM, RuntimeExtension).

Signed-off-by: Danil-Grigorev <[email protected]>

Author: Danil-Grigorev

cmd/main.go

@@ -244,6 +244,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, watchConfigSecretCh
 		Client:                   mgr.GetClient(),
 		Config:                   mgr.GetConfig(),
 		WatchConfigSecretChanges: watchConfigSecretChanges,
+		WatchCoreProviderChanges: true,
 	}).SetupWithManager(ctx, mgr, concurrency(concurrencyNumber)); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "InfrastructureProvider")
 		os.Exit(1)
@@ -255,6 +256,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, watchConfigSecretCh
 		Client:                   mgr.GetClient(),
 		Config:                   mgr.GetConfig(),
 		WatchConfigSecretChanges: watchConfigSecretChanges,
+		WatchCoreProviderChanges: true,
 	}).SetupWithManager(ctx, mgr, concurrency(concurrencyNumber)); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "BootstrapProvider")
 		os.Exit(1)
@@ -266,6 +268,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, watchConfigSecretCh
 		Client:                   mgr.GetClient(),
 		Config:                   mgr.GetConfig(),
 		WatchConfigSecretChanges: watchConfigSecretChanges,
+		WatchCoreProviderChanges: true,
 	}).SetupWithManager(ctx, mgr, concurrency(concurrencyNumber)); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "ControlPlaneProvider")
 		os.Exit(1)
@@ -277,6 +280,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, watchConfigSecretCh
 		Client:                   mgr.GetClient(),
 		Config:                   mgr.GetConfig(),
 		WatchConfigSecretChanges: watchConfigSecretChanges,
+		WatchCoreProviderChanges: true,
 	}).SetupWithManager(ctx, mgr, concurrency(concurrencyNumber)); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "AddonProvider")
 		os.Exit(1)
@@ -288,6 +292,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, watchConfigSecretCh
 		Client:                   mgr.GetClient(),
 		Config:                   mgr.GetConfig(),
 		WatchConfigSecretChanges: watchConfigSecretChanges,
+		WatchCoreProviderChanges: true,
 	}).SetupWithManager(ctx, mgr, concurrency(concurrencyNumber)); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "IPAMProvider")
 		os.Exit(1)
@@ -299,6 +304,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, watchConfigSecretCh
 		Client:                   mgr.GetClient(),
 		Config:                   mgr.GetConfig(),
 		WatchConfigSecretChanges: watchConfigSecretChanges,
+		WatchCoreProviderChanges: true,
 	}).SetupWithManager(ctx, mgr, concurrency(concurrencyNumber)); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "RuntimeExtensionProvider")
 		os.Exit(1)

internal/controller/genericprovider_controller.go

@@ -23,7 +23,6 @@ import (
 	"errors"
 	"fmt"
 	"hash"
-	"reflect"
 
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -49,6 +48,7 @@ type GenericProviderReconciler struct {
 	Client                   client.Client
 	Config                   *rest.Config
 	WatchConfigSecretChanges bool
+	WatchCoreProviderChanges bool
 
 	DeletePhases    []PhaseFn
 	ReconcilePhases []PhaseFn
@@ -58,17 +58,17 @@ const (
 	appliedSpecHashAnnotation = "operator.cluster.x-k8s.io/applied-spec-hash"
 )
 
-func (r *GenericProviderReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
+func (r *GenericProviderReconciler) BuildWithManager(ctx context.Context, mgr ctrl.Manager) (*ctrl.Builder, error) {
 	builder := ctrl.NewControllerManagedBy(mgr).
 		For(r.Provider)
 
 	if r.WatchConfigSecretChanges {
 		if err := mgr.GetFieldIndexer().IndexField(ctx, r.Provider, configSecretNameField, configSecretNameIndexFunc); err != nil {
-			return err
+			return nil, err
 		}
 
 		if err := mgr.GetFieldIndexer().IndexField(ctx, r.Provider, configSecretNamespaceField, configSecretNamespaceIndexFunc); err != nil {
-			return err
+			return nil, err
 		}
 
 		builder.Watches(
@@ -78,7 +78,7 @@ func (r *GenericProviderReconciler) SetupWithManager(ctx context.Context, mgr ct
 	}
 
 	// We don't want to receive secondary events from the CoreProvider for itself.
-	if reflect.TypeOf(r.Provider) != reflect.TypeOf(genericprovider.GenericProvider(&operatorv1.CoreProvider{})) {
+	if r.WatchCoreProviderChanges {
 		builder.Watches(
 			&operatorv1.CoreProvider{},
 			handler.EnqueueRequestsFromMapFunc(newCoreProviderToProviderFuncMapForProviderList(r.Client, r.ProviderList)),
@@ -102,8 +102,16 @@ func (r *GenericProviderReconciler) SetupWithManager(ctx context.Context, mgr ct
 		reconciler.Delete,
 	}
 
-	return builder.WithOptions(options).
-		Complete(r)
+	return builder, nil
+}
+
+func (r *GenericProviderReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
+	builder, err := r.BuildWithManager(ctx, mgr)
+	if err != nil {
+		return err
+	}
+
+	return builder.WithOptions(options).Complete(r)
 }
 
 func (r *GenericProviderReconciler) Reconcile(ctx context.Context, req reconcile.Request) (_ reconcile.Result, reterr error) {

internal/controller/suite_test.go

@@ -58,6 +58,7 @@ func TestMain(m *testing.M) {
 		ProviderList:             &operatorv1.InfrastructureProviderList{},
 		Client:                   env,
 		WatchConfigSecretChanges: true,
+		WatchCoreProviderChanges: true,
 	}).SetupWithManager(ctx, env.Manager, controller.Options{MaxConcurrentReconciles: 1}); err != nil {
 		panic(fmt.Sprintf("Failed to start InfrastructureProviderReconciler: %v", err))
 	}
@@ -67,6 +68,7 @@ func TestMain(m *testing.M) {
 		ProviderList:             &operatorv1.BootstrapProviderList{},
 		Client:                   env,
 		WatchConfigSecretChanges: true,
+		WatchCoreProviderChanges: true,
 	}).SetupWithManager(ctx, env.Manager, controller.Options{MaxConcurrentReconciles: 1}); err != nil {
 		panic(fmt.Sprintf("Failed to start BootstrapProviderReconciler: %v", err))
 	}
@@ -76,6 +78,7 @@ func TestMain(m *testing.M) {
 		ProviderList:             &operatorv1.ControlPlaneProviderList{},
 		Client:                   env,
 		WatchConfigSecretChanges: true,
+		WatchCoreProviderChanges: true,
 	}).SetupWithManager(ctx, env.Manager, controller.Options{MaxConcurrentReconciles: 1}); err != nil {
 		panic(fmt.Sprintf("Failed to start ControlPlaneProviderReconciler: %v", err))
 	}