Cleanup predicate calling code per @barkbay suggestion.

Fix test
elastic · Dec 1, 2021 · 777a727 · 777a727
1 parent bdf2cb0
commit 777a727
Show file tree

Hide file tree

Showing 26 changed files with 48 additions and 49 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -462,6 +462,9 @@ func startOperator(ctx context.Context) error {
 
 	// configure the manager cache based on the number of managed namespaces
 	managedNamespaces := viper.GetStringSlice(operator.NamespacesFlag)
+	// initialize the managed namespace predicate to ignore events outside of the namespaces the operator is concerned with
+	predicates.ManagedNamespacePredicate = predicates.NewManagedNamespacesPredicate(managedNamespaces)
+
 	switch {
 	case len(managedNamespaces) == 0:
 		log.Info("Operator configured to manage all namespaces")
@@ -789,7 +792,7 @@ func setupWebhook(mgr manager.Manager, params operator.Parameters, clientset kub
 			os.Exit(1)
 		}
 
-		if err := webhook.Add(mgr, webhookParams, clientset, wh, predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)); err != nil {
+		if err := webhook.Add(mgr, webhookParams, clientset, wh, predicates.ManagedNamespacePredicate); err != nil {
 			log.Error(err, "unable to create controller", "controller", webhook.ControllerName)
 			os.Exit(1)
 		}

diff --git a/pkg/controller/agent/controller.go b/pkg/controller/agent/controller.go
@@ -45,7 +45,7 @@ func Add(mgr manager.Manager, params operator.Parameters) error {
 	if err != nil {
 		return err
 	}
-	return addWatches(c, r, predicates.ManagedNamespacesPredicate(params.ManagedNamespaces))
+	return addWatches(c, r, predicates.ManagedNamespacePredicate)
 }
 
 // newReconciler returns a new reconcile.Reconciler.

diff --git a/pkg/controller/apmserver/controller.go b/pkg/controller/apmserver/controller.go
@@ -84,7 +84,7 @@ func Add(mgr manager.Manager, params operator.Parameters) error {
 	if err != nil {
 		return err
 	}
-	return addWatches(c, reconciler, predicates.ManagedNamespacesPredicate(params.ManagedNamespaces))
+	return addWatches(c, reconciler, predicates.ManagedNamespacePredicate)
 }
 
 // newReconciler returns a new reconcile.Reconciler

diff --git a/pkg/controller/association/controller/agent_fleetserver.go b/pkg/controller/association/controller/agent_fleetserver.go
@@ -41,7 +41,7 @@ func AddAgentFleetServer(mgr manager.Manager, accessReviewer rbac.AccessReviewer
 		AssociationConfAnnotationNameBase:     commonv1.FleetServerConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      agent.NameLabelName,
 		AssociationResourceNamespaceLabelName: agent.NamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 
 		ElasticsearchUserCreation: nil,
 	})

diff --git a/pkg/controller/association/controller/agent_kibana.go b/pkg/controller/association/controller/agent_kibana.go
@@ -39,7 +39,7 @@ func AddAgentKibana(mgr manager.Manager, accessReviewer rbac.AccessReviewer, par
 		AssociationConfAnnotationNameBase:     commonv1.KibanaConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      kibana.KibanaNameLabelName,
 		AssociationResourceNamespaceLabelName: kibana.KibanaNamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 
 		ElasticsearchUserCreation: &association.ElasticsearchUserCreation{
 			ElasticsearchRef: getElasticsearchFromKibana,

diff --git a/pkg/controller/association/controller/apm_es.go b/pkg/controller/association/controller/apm_es.go
@@ -57,7 +57,7 @@ func AddApmES(mgr manager.Manager, accessReviewer rbac.AccessReviewer, params op
 		AssociationConfAnnotationNameBase:     commonv1.ElasticsearchConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      eslabel.ClusterNameLabelName,
 		AssociationResourceNamespaceLabelName: eslabel.ClusterNamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 
 		ElasticsearchUserCreation: &association.ElasticsearchUserCreation{
 			ElasticsearchRef: func(c k8s.Client, association commonv1.Association) (bool, commonv1.ObjectSelector, error) {

diff --git a/pkg/controller/association/controller/apm_kibana.go b/pkg/controller/association/controller/apm_kibana.go
@@ -44,7 +44,7 @@ func AddApmKibana(mgr manager.Manager, accessReviewer rbac.AccessReviewer, param
 		AssociationConfAnnotationNameBase:     commonv1.KibanaConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      kibana.KibanaNameLabelName,
 		AssociationResourceNamespaceLabelName: kibana.KibanaNamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 
 		ElasticsearchUserCreation: &association.ElasticsearchUserCreation{
 			ElasticsearchRef: getElasticsearchFromKibana,

diff --git a/pkg/controller/association/controller/beat_es.go b/pkg/controller/association/controller/beat_es.go
@@ -58,7 +58,7 @@ func AddBeatES(mgr manager.Manager, accessReviewer rbac.AccessReviewer, params o
 		AssociationConfAnnotationNameBase:     commonv1.ElasticsearchConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      eslabel.ClusterNameLabelName,
 		AssociationResourceNamespaceLabelName: eslabel.ClusterNamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 
 		ElasticsearchUserCreation: &association.ElasticsearchUserCreation{
 			ElasticsearchRef: func(c k8s.Client, association commonv1.Association) (bool, commonv1.ObjectSelector, error) {

diff --git a/pkg/controller/association/controller/beat_kibana.go b/pkg/controller/association/controller/beat_kibana.go
@@ -45,7 +45,7 @@ func AddBeatKibana(mgr manager.Manager, accessReviewer rbac.AccessReviewer, para
 		AssociationConfAnnotationNameBase:     commonv1.KibanaConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      kibana.KibanaNameLabelName,
 		AssociationResourceNamespaceLabelName: kibana.KibanaNamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 
 		ElasticsearchUserCreation: &association.ElasticsearchUserCreation{
 			ElasticsearchRef: getElasticsearchFromKibana,

diff --git a/pkg/controller/association/controller/ent_es.go b/pkg/controller/association/controller/ent_es.go
@@ -53,7 +53,7 @@ func AddEntES(mgr manager.Manager, accessReviewer rbac.AccessReviewer, params op
 		AssociationConfAnnotationNameBase:     commonv1.ElasticsearchConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      eslabel.ClusterNameLabelName,
 		AssociationResourceNamespaceLabelName: eslabel.ClusterNamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 
 		ElasticsearchUserCreation: &association.ElasticsearchUserCreation{
 			ElasticsearchRef: func(c k8s.Client, association commonv1.Association) (bool, commonv1.ObjectSelector, error) {

diff --git a/pkg/controller/association/controller/es_monitoring.go b/pkg/controller/association/controller/es_monitoring.go
@@ -59,7 +59,7 @@ func esMonitoringAssociationInfo(params operator.Parameters) association.Associa
 		AssociationConfAnnotationNameBase:     commonv1.ElasticsearchConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      eslabel.ClusterNameLabelName,
 		AssociationResourceNamespaceLabelName: eslabel.ClusterNamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 
 		ElasticsearchUserCreation: &association.ElasticsearchUserCreation{
 			ElasticsearchRef: func(c k8s.Client, association commonv1.Association) (bool, commonv1.ObjectSelector, error) {

diff --git a/pkg/controller/association/controller/kb_monitoring.go b/pkg/controller/association/controller/kb_monitoring.go
@@ -44,7 +44,7 @@ func AddKbMonitoring(mgr manager.Manager, accessReviewer rbac.AccessReviewer, pa
 		AssociationConfAnnotationNameBase:     commonv1.ElasticsearchConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      eslabel.ClusterNameLabelName,
 		AssociationResourceNamespaceLabelName: eslabel.ClusterNamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 
 		ElasticsearchUserCreation: &association.ElasticsearchUserCreation{
 			ElasticsearchRef: func(c k8s.Client, association commonv1.Association) (bool, commonv1.ObjectSelector, error) {

diff --git a/pkg/controller/association/controller/kibana_ent.go b/pkg/controller/association/controller/kibana_ent.go
@@ -42,7 +42,7 @@ func AddKibanaEnt(mgr manager.Manager, accessReviewer rbac.AccessReviewer, param
 		AssociationConfAnnotationNameBase:     commonv1.EntConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      entctl.EnterpriseSearchNameLabelName,
 		AssociationResourceNamespaceLabelName: entctl.EnterpriseSearchNamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 		ElasticsearchUserCreation:             nil, // no dedicated ES user required for Kibana->Ent connection
 	})
 }

diff --git a/pkg/controller/association/controller/kibana_es.go b/pkg/controller/association/controller/kibana_es.go
@@ -57,7 +57,7 @@ func AddKibanaES(mgr manager.Manager, accessReviewer rbac.AccessReviewer, params
 		AssociationConfAnnotationNameBase:     commonv1.ElasticsearchConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      eslabel.ClusterNameLabelName,
 		AssociationResourceNamespaceLabelName: eslabel.ClusterNamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 
 		ElasticsearchUserCreation: &association.ElasticsearchUserCreation{
 			ElasticsearchRef: func(c k8s.Client, association commonv1.Association) (bool, commonv1.ObjectSelector, error) {

diff --git a/pkg/controller/association/controller/maps_es.go b/pkg/controller/association/controller/maps_es.go
@@ -56,7 +56,7 @@ func AddMapsES(mgr manager.Manager, accessReviewer rbac.AccessReviewer, params o
 		AssociationConfAnnotationNameBase:     commonv1.ElasticsearchConfigAnnotationNameBase,
 		AssociationResourceNameLabelName:      eslabel.ClusterNameLabelName,
 		AssociationResourceNamespaceLabelName: eslabel.ClusterNamespaceLabelName,
-		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacesPredicate(params.ManagedNamespaces)),
+		Predicates:                            predicates.WithPredicates(predicates.ManagedNamespacePredicate),
 
 		ElasticsearchUserCreation: &association.ElasticsearchUserCreation{
 			ElasticsearchRef: func(c k8s.Client, association commonv1.Association) (bool, commonv1.ObjectSelector, error) {

diff --git a/pkg/controller/autoscaling/elasticsearch.go b/pkg/controller/autoscaling/elasticsearch.go
@@ -29,5 +29,5 @@ func Add(mgr manager.Manager, p operator.Parameters) error {
 		return err
 	}
 	// Watch for changes on Elasticsearch clusters.
-	return c.Watch(&source.Kind{Type: &esv1.Elasticsearch{}}, &handler.EnqueueRequestForObject{}, predicates.ManagedNamespacesPredicate(p.ManagedNamespaces))
+	return c.Watch(&source.Kind{Type: &esv1.Elasticsearch{}}, &handler.EnqueueRequestForObject{}, predicates.ManagedNamespacePredicate)
 }
diff --git a/pkg/controller/beat/controller.go b/pkg/controller/beat/controller.go
@@ -56,7 +56,7 @@ func Add(mgr manager.Manager, params operator.Parameters) error {
 	if err != nil {
 		return err
 	}
-	return addWatches(c, r, predicates.ManagedNamespacesPredicate(params.ManagedNamespaces))
+	return addWatches(c, r, predicates.ManagedNamespacePredicate)
 }
 
 // newReconciler returns a new reconcile.Reconciler.

diff --git a/pkg/controller/common/predicates/predicate_test.go b/pkg/controller/common/predicates/predicate_test.go
@@ -57,7 +57,7 @@ func TestManagedNamespacesPredicate(t *testing.T) {
 	require.NoError(t, err)
 
 	bldr := builder.ControllerManagedBy(mgr).
-		For(&appsv1.Deployment{}, builder.WithPredicates(predicates.ManagedNamespacesPredicate([]string{managedNamespace})))
+		For(&appsv1.Deployment{}, builder.WithPredicates(predicates.NewManagedNamespacesPredicate([]string{managedNamespace})))
 	require.NoError(t, bldr.Complete(reconciler))
 
 	ctx, cancel := context.WithCancel(context.Background())

diff --git a/pkg/controller/common/predicates/predicates.go b/pkg/controller/common/predicates/predicates.go
@@ -5,48 +5,44 @@
 package predicates
 
 import (
+	"k8s.io/utils/strings/slices"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 )
 
-func namespaceInSlice(namespace string, namespaces []string) bool {
-	// If the operator is managing all namespaces,
-	// never ignore any namespace.
-	if len(namespaces) == 0 {
-		return true
-	}
-	for _, ns := range namespaces {
-		if namespace == ns {
-			return true
-		}
-	}
-	return false
-}
-
-// WithPredicates is a helper function to convert one or more predicates
-// into a slice of predicates.
-func WithPredicates(predicates ...predicate.Predicate) []predicate.Predicate {
-	return predicates
-}
+// ManagedNamespacePredicate is a predicate that will ignore events that exist
+// outside of the namespaces that the operator manages.
+var ManagedNamespacePredicate predicate.Predicate
 
-// ManagedNamespacesPredicate will return a predicate that will ignore events
+// NewManagedNamespacesPredicate will return a predicate that will ignore events
 // that exist outside of the given managed namespaces,
-func ManagedNamespacesPredicate(managedNamespaces []string) predicate.Predicate {
+func NewManagedNamespacesPredicate(managedNamespaces []string) predicate.Predicate {
 	return predicate.Funcs{
 		CreateFunc: func(e event.CreateEvent) bool {
 			// Ignore resources that do not exist within the managed namespaces
-			return namespaceInSlice(e.Object.GetNamespace(), managedNamespaces)
+			return IsNamespaceManaged(e.Object.GetNamespace(), managedNamespaces)
 		},
 		UpdateFunc: func(e event.UpdateEvent) bool {
 			// Ignore resources that do not exist within the managed namespaces
-			return namespaceInSlice(e.ObjectNew.GetNamespace(), managedNamespaces)
+			return IsNamespaceManaged(e.ObjectNew.GetNamespace(), managedNamespaces)
 		},
 		DeleteFunc: func(e event.DeleteEvent) bool {
 			// Ignore resources that do not exist within the managed namespaces
-			return namespaceInSlice(e.Object.GetNamespace(), managedNamespaces)
+			return IsNamespaceManaged(e.Object.GetNamespace(), managedNamespaces)
 		},
 		GenericFunc: func(e event.GenericEvent) bool {
 			return namespaceInSlice(e.Object.GetNamespace(), managedNamespaces)
 		},
 	}
 }
+
+// IsNamespaceManaged returns true if the namespace is managed by the operator.
+func IsNamespaceManaged(namespace string, managedNamespaces []string) bool {
+	return len(managedNamespaces) == 0 || slices.Contains(managedNamespaces, namespace)
+}
+
+// WithPredicates is a helper function to convert one or more predicates
+// into a slice of predicates.
+func WithPredicates(predicates ...predicate.Predicate) []predicate.Predicate {
+	return predicates
+}
diff --git a/pkg/controller/elasticsearch/elasticsearch_controller.go b/pkg/controller/elasticsearch/elasticsearch_controller.go
@@ -62,7 +62,7 @@ func Add(mgr manager.Manager, params operator.Parameters) error {
 	if err != nil {
 		return err
 	}
-	return addWatches(c, reconciler, predicates.ManagedNamespacesPredicate(params.ManagedNamespaces))
+	return addWatches(c, reconciler, predicates.ManagedNamespacePredicate)
 }
 
 // newReconciler returns a new reconcile.Reconciler

diff --git a/pkg/controller/enterprisesearch/enterprisesearch_controller.go b/pkg/controller/enterprisesearch/enterprisesearch_controller.go
@@ -57,7 +57,7 @@ func Add(mgr manager.Manager, params operator.Parameters) error {
 	if err != nil {
 		return err
 	}
-	return addWatches(c, reconciler, predicates.ManagedNamespacesPredicate(params.ManagedNamespaces))
+	return addWatches(c, reconciler, predicates.ManagedNamespacePredicate)
 }
 
 // newReconciler returns a new reconcile.Reconciler

diff --git a/pkg/controller/kibana/controller.go b/pkg/controller/kibana/controller.go
@@ -53,7 +53,7 @@ func Add(mgr manager.Manager, params operator.Parameters) error {
 	if err != nil {
 		return err
 	}
-	return addWatches(c, reconciler, predicates.ManagedNamespacesPredicate(params.ManagedNamespaces))
+	return addWatches(c, reconciler, predicates.ManagedNamespacePredicate)
 }
 
 // newReconciler returns a new reconcile.Reconciler

diff --git a/pkg/controller/license/license_controller.go b/pkg/controller/license/license_controller.go
@@ -67,7 +67,7 @@ func Add(mgr manager.Manager, p operator.Parameters) error {
 	if err != nil {
 		return err
 	}
-	return addWatches(c, r.Client, predicates.ManagedNamespacesPredicate(p.ManagedNamespaces))
+	return addWatches(c, r.Client, predicates.ManagedNamespacePredicate)
 }
 
 // newReconciler returns a new reconcile.Reconciler

diff --git a/pkg/controller/license/license_controller_integration_test.go b/pkg/controller/license/license_controller_integration_test.go
@@ -49,7 +49,7 @@ func TestReconcile(t *testing.T) {
 		if err != nil {
 			return err
 		}
-		return addWatches(c, r.Client, p)
+		return addWatches(c, r.Client)
 
 	}, operator.Parameters{})
 	defer stop()

diff --git a/pkg/controller/maps/controller.go b/pkg/controller/maps/controller.go
@@ -59,7 +59,7 @@ func Add(mgr manager.Manager, params operator.Parameters) error {
 	if err != nil {
 		return err
 	}
-	return addWatches(c, reconciler, predicates.ManagedNamespacesPredicate(params.ManagedNamespaces))
+	return addWatches(c, reconciler, predicates.ManagedNamespacePredicate)
 }
 
 // newReconciler returns a new reconcile.Reconciler

diff --git a/pkg/controller/remoteca/controller.go b/pkg/controller/remoteca/controller.go
@@ -50,7 +50,7 @@ func Add(mgr manager.Manager, accessReviewer rbac.AccessReviewer, params operato
 	if err != nil {
 		return err
 	}
-	return AddWatches(c, r, predicates.ManagedNamespacesPredicate(params.ManagedNamespaces))
+	return AddWatches(c, r, predicates.ManagedNamespacePredicate)
 }
 
 // NewReconciler returns a new reconcile.Reconciler