tetragon: Remove mapDir from StartSensorManager

Removing mapDir from StartSensorManager and related callers. Signed-off-by: Jiri Olsa <jolsa@kernel.org>
cilium · Feb 21, 2024 · b476825 · b476825
1 parent 00adc6f
commit b476825
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/pkg/observer/observer.go b/pkg/observer/observer.go
@@ -330,9 +330,9 @@ type Observer struct {
 // On errors we also print a warning that advanced Cgroups tracking will be
 // disabled which might affect process association with kubernetes pods and
 // containers.
-func (k *Observer) UpdateRuntimeConf(mapDir string) error {
+func (k *Observer) UpdateRuntimeConf(bpfDir string) error {
 	pid := os.Getpid()
-	err := confmap.UpdateTgRuntimeConf(mapDir, pid)
+	err := confmap.UpdateTgRuntimeConf(bpfDir, pid)
 	if err != nil {
 		k.log.WithField("observer", "confmap-update").WithError(err).Warn("Update TetragonConf map failed, advanced Cgroups tracking will be disabled")
 		k.log.WithField("observer", "confmap-update").Warn("Continuing without advanced Cgroups tracking. Process association with Pods and Containers might be limited")
@@ -354,7 +354,7 @@ func (k *Observer) Start(ctx context.Context) error {
 
 // InitSensorManager starts the sensor controller
 func (k *Observer) InitSensorManager(waitChan chan struct{}) error {
-	mgr, err := sensors.StartSensorManager(option.Config.BpfDir, option.Config.MapDir, waitChan)
+	mgr, err := sensors.StartSensorManager(option.Config.BpfDir, waitChan)
 	if err != nil {
 		return err
 	}
@@ -412,7 +412,7 @@ func (k *Observer) PrintStats() {
 }
 
 func (k *Observer) RemovePrograms() {
-	RemovePrograms(option.Config.BpfDir, option.Config.MapDir)
+	RemovePrograms(option.Config.BpfDir)
 }
 
 func RemoveSensors(ctx context.Context) {

diff --git a/pkg/observer/program.go b/pkg/observer/program.go
@@ -9,8 +9,7 @@ import (
 	"github.com/cilium/tetragon/pkg/sensors"
 )
 
-func RemovePrograms(bpfDir, mapDir string) {
+func RemovePrograms(bpfDir string) {
 	sensors.UnloadAll()
 	os.Remove(bpfDir)
-	os.Remove(mapDir)
 }
diff --git a/pkg/sensors/manager.go b/pkg/sensors/manager.go
@@ -33,7 +33,7 @@ type SensorStatus struct {
 // something is received. The intention of this is to allow the main function
 // to first load the base sensor before the sensor manager starts loading other sensors.
 func StartSensorManager(
-	bpfDir, mapDir string,
+	bpfDir string,
 	waitChan chan struct{},
 ) (*Manager, error) {
 	pfState, err := policyfilter.GetState()

diff --git a/pkg/sensors/manager_test.go b/pkg/sensors/manager_test.go
@@ -40,7 +40,7 @@ func TestAddPolicy(t *testing.T) {
 	})
 
 	policy := v1alpha1.TracingPolicy{}
-	mgr, err := StartSensorManager("", "", nil)
+	mgr, err := StartSensorManager("", nil)
 	assert.NoError(t, err)
 	t.Cleanup(func() {
 		if err := mgr.StopSensorManager(ctx); err != nil {
@@ -68,7 +68,7 @@ func TestAddPolicies(t *testing.T) {
 	})
 
 	policy := v1alpha1.TracingPolicy{}
-	mgr, err := StartSensorManager("", "", nil)
+	mgr, err := StartSensorManager("", nil)
 	assert.NoError(t, err)
 	t.Cleanup(func() {
 		if err := mgr.StopSensorManager(ctx); err != nil {
@@ -99,7 +99,7 @@ func TestAddPolicySpecError(t *testing.T) {
 	})
 
 	policy := v1alpha1.TracingPolicy{}
-	mgr, err := StartSensorManager("", "", nil)
+	mgr, err := StartSensorManager("", nil)
 	assert.NoError(t, err)
 	t.Cleanup(func() {
 		if err := mgr.StopSensorManager(ctx); err != nil {
@@ -131,7 +131,7 @@ func TestAddPolicyLoadError(t *testing.T) {
 	})
 
 	policy := v1alpha1.TracingPolicy{}
-	mgr, err := StartSensorManager("", "", nil)
+	mgr, err := StartSensorManager("", nil)
 	assert.NoError(t, err)
 	t.Cleanup(func() {
 		if err := mgr.StopSensorManager(ctx); err != nil {

diff --git a/pkg/sensors/tracing/generickprobe_test.go b/pkg/sensors/tracing/generickprobe_test.go
@@ -123,7 +123,7 @@ func Test_Kprobe_DisableEnablePolicy(t *testing.T) {
 
 	tus.LoadSensor(t, base.GetInitialSensor())
 	path := bpf.MapPrefixPath()
-	mgr, err := sensors.StartSensorManager(path, path, nil)
+	mgr, err := sensors.StartSensorManager(path, nil)
 	assert.NoError(t, err)
 	t.Cleanup(func() {
 		if err := mgr.StopSensorManager(ctx); err != nil {

diff --git a/pkg/testutils/sensors/sensors.go b/pkg/testutils/sensors/sensors.go
@@ -47,7 +47,7 @@ func GetTestSensorManager(ctx context.Context, t *testing.T) *TestSensorManager
 	}
 
 	path := bpf.MapPrefixPath()
-	mgr, err := sensors.StartSensorManager(path, path, nil)
+	mgr, err := sensors.StartSensorManager(path, nil)
 	if err != nil {
 		t.Fatalf("startSensorController failed: %s", err)
 	}