From 1b67b013c5bd0d0e81d29fd5b0823b01d115781c Mon Sep 17 00:00:00 2001
From: Ron Federman <73110295+RonFed@users.noreply.github.com>
Date: Thu, 19 Dec 2024 14:26:13 +0200
Subject: [PATCH] Pass the errorgroup context to all the running components of
 odiglet (#2027)

---
 odiglet/odiglet.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/odiglet/odiglet.go b/odiglet/odiglet.go
index 9214e968b..8bac5348b 100644
--- a/odiglet/odiglet.go
+++ b/odiglet/odiglet.go
@@ -98,7 +98,7 @@ func (o *Odiglet) Run(ctx context.Context) {
 	})
 
 	g.Go(func() error {
-		err := o.ebpfManager.Run(ctx)
+		err := o.ebpfManager.Run(groupCtx)
 		if err != nil {
 			log.Logger.Error(err, "Failed to run ebpf manager")
 		}
@@ -109,7 +109,7 @@ func (o *Odiglet) Run(ctx context.Context) {
 	// start OpAmp server
 	odigosNs := k8senv.GetCurrentNamespace()
 	g.Go(func() error {
-		err := server.StartOpAmpServer(ctx, log.Logger, o.mgr, o.clientset, env.Current.NodeName, odigosNs)
+		err := server.StartOpAmpServer(groupCtx, log.Logger, o.mgr, o.clientset, env.Current.NodeName, odigosNs)
 		if err != nil {
 			log.Logger.Error(err, "Failed to start opamp server")
 		}
@@ -119,7 +119,7 @@ func (o *Odiglet) Run(ctx context.Context) {
 
 	// start kube manager
 	g.Go(func() error {
-		err := o.mgr.Start(ctx)
+		err := o.mgr.Start(groupCtx)
 		if err != nil {
 			log.Logger.Error(err, "error starting kube manager")
 		} else {