watcher: Don't start watcher in NewK8sWatcher

[ upstream commit da91e33 ]

Since Start() is now an exported method of K8sWatcher, it makes sense to
separate responsibilities of creating and starting the watcher.

Signed-off-by: Anna Kapuscinska <anna@isovalent.com>
Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>

cmd/tetragon/main.go

@@ -387,6 +387,7 @@ func tetragonExecute() error {
 		log.Info("Disabling Kubernetes API")
 		k8sWatcher = watcher.NewFakeK8sWatcher(nil)
 	}
+	k8sWatcher.Start()
 	_, err := cilium.InitCiliumState(ctx, option.Config.EnableCilium)
 	if err != nil {
 		return err

pkg/process/podinfo_test.go

@@ -54,6 +54,7 @@ func TestK8sWatcher_GetPodInfo(t *testing.T) {
 
 	k8sClient := fake.NewSimpleClientset(&pod)
 	watcher := watcher.NewK8sWatcher(k8sClient, time.Hour)
+	watcher.Start()
 	pid := uint32(1)
 	podInfo := getPodInfo(watcher, "abcd1234", "curl", "cilium.io", 1)
 	assert.True(t, proto.Equal(podInfo, &tetragon.Pod{

pkg/watcher/watcher.go

@@ -146,8 +146,6 @@ func NewK8sWatcher(k8sClient kubernetes.Interface, stateSyncIntervalSec time.Dur
 
 	podhooks.InstallHooks(podInformer)
 
-	k8sWatcher.Start()
-
 	return k8sWatcher
 }