Merge pull request #4825 from wangxf1987/master

add: Use opts.ResyncPeriod as controlPlaneInformerManager and sharedF…
karmada-io · Apr 25, 2024 · 87c7782 · 87c7782
2 parents 40d65f9 + 3232c52
commit 87c7782
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmd/controller-manager/app/controllermanager.go b/cmd/controller-manager/app/controllermanager.go
@@ -735,10 +735,10 @@ func setupControllers(mgr controllerruntime.Manager, opts *options.Options, stop
 		return
 	}
 
-	controlPlaneInformerManager := genericmanager.NewSingleClusterInformerManager(dynamicClientSet, 0, stopChan)
+	controlPlaneInformerManager := genericmanager.NewSingleClusterInformerManager(dynamicClientSet, opts.ResyncPeriod.Duration, stopChan)
 	// We need a service lister to build a resource interpreter with `ClusterIPServiceResolver`
 	// witch allows connection to the customized interpreter webhook without a cluster DNS service.
-	sharedFactory := informers.NewSharedInformerFactory(kubeClientSet, 0)
+	sharedFactory := informers.NewSharedInformerFactory(kubeClientSet, opts.ResyncPeriod.Duration)
 	serviceLister := sharedFactory.Core().V1().Services().Lister()
 	sharedFactory.Start(stopChan)
 	sharedFactory.WaitForCacheSync(stopChan)

diff --git a/pkg/resourceinterpreter/interpreter.go b/pkg/resourceinterpreter/interpreter.go
@@ -99,6 +99,7 @@ func (i *customResourceInterpreterImpl) Start(ctx context.Context) (err error) {
 	i.defaultInterpreter = native.NewDefaultInterpreter()
 
 	i.informer.Start()
+	i.informer.WaitForCacheSync()
 	<-ctx.Done()
 	klog.Infof("Stopped as stopCh closed.")
 	return nil