From c71264cd087d90d2de574860e914de69165d1d29 Mon Sep 17 00:00:00 2001 From: Andre Fredette Date: Fri, 21 Jun 2024 12:08:03 -0400 Subject: [PATCH] Add watch on pod events back to BpfApplicationReconciler It was there, but got dropped at some point. Also, added a strings.ToLower() to sanitize(). Signed-off-by: Andre Fredette --- controllers/bpfman-agent/application-program.go | 6 ++++++ controllers/bpfman-agent/common.go | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/controllers/bpfman-agent/application-program.go b/controllers/bpfman-agent/application-program.go index 32a3f6a2e..accbd8c81 100644 --- a/controllers/bpfman-agent/application-program.go +++ b/controllers/bpfman-agent/application-program.go @@ -280,5 +280,11 @@ func (r *BpfApplicationReconciler) SetupWithManager(mgr ctrl.Manager) error { &handler.EnqueueRequestForObject{}, builder.WithPredicates(predicate.And(predicate.LabelChangedPredicate{}, nodePredicate(r.NodeName))), ). + // Watch for changes in Pod resources in case we are using a container selector. + Watches( + &v1.Pod{}, + &handler.EnqueueRequestForObject{}, + builder.WithPredicates(podOnNodePredicate(r.NodeName)), + ). Complete(r) } diff --git a/controllers/bpfman-agent/common.go b/controllers/bpfman-agent/common.go index 0f0a50937..72fd87e4b 100644 --- a/controllers/bpfman-agent/common.go +++ b/controllers/bpfman-agent/common.go @@ -896,5 +896,6 @@ func getClientset() (*kubernetes.Clientset, error) { // sanitize a string to work as a bpfProgram name func sanitize(name string) string { name = strings.TrimPrefix(name, "/") - return strings.Replace(strings.Replace(name, "/", "-", -1), "_", "-", -1) + name = strings.Replace(strings.Replace(name, "/", "-", -1), "_", "-", -1) + return strings.ToLower(name) }