informer: wait for cache sync before adding event handlers (#2768)

kubeovn · May 8, 2023 · d3d0176 · d3d0176
1 parent a23dd86
commit d3d0176
Show file tree

Hide file tree

Showing 4 changed files with 153 additions and 144 deletions.
diff --git a/cmd/controller/controller.go b/cmd/controller/controller.go
@@ -116,8 +116,7 @@ func CmdMain() {
 		RetryPeriod:   6 * time.Second,
 		Callbacks: leaderelection.LeaderCallbacks{
 			OnStartedLeading: func(ctx context.Context) {
-				ctl := controller.NewController(config)
-				ctl.Run(ctx)
+				controller.Run(ctx, config)
 			},
 			OnStoppedLeading: func() {
 				select {

diff --git a/cmd/daemon/cniserver.go b/cmd/daemon/cniserver.go
@@ -73,13 +73,10 @@ func CmdMain() {
 		kubeovninformer.WithTweakListOptions(func(listOption *v1.ListOptions) {
 			listOption.AllowWatchBookmarks = true
 		}))
-	ctl, err := daemon.NewController(config, podInformerFactory, nodeInformerFactory, kubeovnInformerFactory)
+	ctl, err := daemon.NewController(config, stopCh, podInformerFactory, nodeInformerFactory, kubeovnInformerFactory)
 	if err != nil {
 		util.LogFatalAndExit(err, "failed to create controller")
 	}
-	podInformerFactory.Start(stopCh)
-	nodeInformerFactory.Start(stopCh)
-	kubeovnInformerFactory.Start(stopCh)
 	klog.Info("start daemon controller")
 	go ctl.Run(stopCh)
 	go daemon.RunServer(config, ctl)