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>
cilium · Apr 4, 2024 · 6efaf89 · 6efaf89
1 parent bd123c0
commit 6efaf89
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/pkg/process/podinfo_test.go b/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{

diff --git a/pkg/watcher/watcher.go b/pkg/watcher/watcher.go
@@ -146,8 +146,6 @@ func NewK8sWatcher(k8sClient kubernetes.Interface, stateSyncIntervalSec time.Dur
 
 	podhooks.InstallHooks(podInformer)
 
-	k8sWatcher.Start()
-
 	return k8sWatcher
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     	podhooks.InstallHooks(podInformer)
-    	k8sWatcher.Start()
     	return k8sWatcher
     }
@@ Expand Down @@