Add slice of callbacks to policy solver (projectcalico#9361)

phantooom · Oct 21, 2024 · 796b98d · 796b98d
1 parent add788d
commit 796b98d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/felix/calc/calc_graph.go b/felix/calc/calc_graph.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Tigera, Inc. All rights reserved.
+// Copyright (c) 2016-2024 Tigera, Inc. All rights reserved.
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -366,7 +366,7 @@ func NewCalculationGraph(callbacks PipelineCallbacks, conf *config.Config, liveC
 	activeRulesCalc.PolicyMatchListener = polResolver
 	polResolver.RegisterWith(allUpdDispatcher, localEndpointDispatcher)
 	// And hook its output to the callbacks.
-	polResolver.Callbacks = callbacks
+	polResolver.RegisterCallback(callbacks)
 	cg.policyResolver = polResolver
 
 	// Register for host IP updates.

diff --git a/felix/calc/policy_resolver.go b/felix/calc/policy_resolver.go
@@ -57,7 +57,7 @@ type PolicyResolver struct {
 	endpoints             map[model.Key]interface{}
 	dirtyEndpoints        set.Set[any] /* FIXME model.WorkloadEndpointKey or model.HostEndpointKey */
 	policySorter          *PolicySorter
-	Callbacks             PolicyResolverCallbacks
+	Callbacks             []PolicyResolverCallbacks
 	InSync                bool
 }
 
@@ -73,6 +73,7 @@ func NewPolicyResolver() *PolicyResolver {
 		endpoints:             make(map[model.Key]interface{}),
 		dirtyEndpoints:        set.New[any](),
 		policySorter:          NewPolicySorter(),
+		Callbacks:             []PolicyResolverCallbacks{},
 	}
 }
 
@@ -84,6 +85,10 @@ func (pr *PolicyResolver) RegisterWith(allUpdDispatcher, localEndpointDispatcher
 	localEndpointDispatcher.RegisterStatusHandler(pr.OnDatamodelStatus)
 }
 
+func (pr *PolicyResolver) RegisterCallback(cb PolicyResolverCallbacks) {
+	pr.Callbacks = append(pr.Callbacks, cb)
+}
+
 func (pr *PolicyResolver) OnUpdate(update api.Update) (filterOut bool) {
 	switch key := update.Key.(type) {
 	case model.WorkloadEndpointKey, model.HostEndpointKey:
@@ -178,7 +183,9 @@ func (pr *PolicyResolver) sendEndpointUpdate(endpointID interface{}) error {
 	endpoint, ok := pr.endpoints[endpointID.(model.Key)]
 	if !ok {
 		log.Debugf("Endpoint is unknown, sending nil update")
-		pr.Callbacks.OnEndpointTierUpdate(endpointID.(model.Key), nil, []TierInfo{})
+		for _, cb := range pr.Callbacks {
+			cb.OnEndpointTierUpdate(endpointID.(model.Key), nil, []TierInfo{})
+		}
 		return nil
 	}
 
@@ -210,6 +217,8 @@ func (pr *PolicyResolver) sendEndpointUpdate(endpointID interface{}) error {
 	}
 
 	log.Debugf("Endpoint tier update: %v -> %v", endpointID, applicableTiers)
-	pr.Callbacks.OnEndpointTierUpdate(endpointID.(model.Key), endpoint, applicableTiers)
+	for _, cb := range pr.Callbacks {
+		cb.OnEndpointTierUpdate(endpointID.(model.Key), endpoint, applicableTiers)
+	}
 	return nil
 }
diff --git a/felix/calc/policy_resolver_test.go b/felix/calc/policy_resolver_test.go
@@ -65,7 +65,7 @@ func TestPolicyResolver_OnUpdate(t *testing.T) {
 func createPolicyResolver() (*PolicyResolver, *policyResolverRecorder) {
 	pr := NewPolicyResolver()
 	recorder := newPolicyResolverRecorder()
-	pr.Callbacks = recorder
+	pr.RegisterCallback(recorder)
 	return pr, recorder
 }