diff options
| author | Threestone <liuzhilei93@outlook.com> | 2020-12-25 16:36:19 +0800 |
|---|---|---|
| committer | Threestone <liuzhilei93@outlook.com> | 2021-01-07 16:08:35 +0800 |
| commit | e30238cec6ff2b573e6a6f9716a2afb96a6a02c2 (patch) | |
| tree | 66e2ad818ec98bf46b5b948f7a275c94dac4959a /edgesite/cmd | |
| parent | Merge pull request #2437 from Abirdcfly/master (diff) | |
| download | kubeedge-e30238cec6ff2b573e6a6f9716a2afb96a6a02c2.tar.gz | |
optimizeinformer
Diffstat (limited to 'edgesite/cmd')
| -rw-r--r-- | edgesite/cmd/edgesite/app/server.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/edgesite/cmd/edgesite/app/server.go b/edgesite/cmd/edgesite/app/server.go index 1631faee9..d02cef49a 100644 --- a/edgesite/cmd/edgesite/app/server.go +++ b/edgesite/cmd/edgesite/app/server.go @@ -10,6 +10,9 @@ import ( "k8s.io/klog/v2" "github.com/kubeedge/beehive/pkg/core" + beehiveContext "github.com/kubeedge/beehive/pkg/core/context" + "github.com/kubeedge/kubeedge/cloud/pkg/common/client" + "github.com/kubeedge/kubeedge/cloud/pkg/common/informers" "github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller" "github.com/kubeedge/kubeedge/edge/pkg/common/dbm" "github.com/kubeedge/kubeedge/edge/pkg/edged" @@ -53,10 +56,14 @@ runs on edge nodes and manages containerized applications.`, // To help debugging, immediately log version klog.Infof("Version: %+v", version.Get()) - + client.InitKubeEdgeClient(config.KubeAPIConfig) + gis := informers.GetGlobalInformers() + registerModules(config) registerModules(config) // start all modules - core.Run() + core.StartModules() + gis.Start(beehiveContext.Done()) + core.GracefulShutdown() }, } fs := cmd.Flags() @@ -85,7 +92,7 @@ runs on edge nodes and manages containerized applications.`, // registerModules register all the modules started in edgesite func registerModules(c *v1alpha1.EdgeSiteConfig) { edged.Register(c.Modules.Edged) - edgecontroller.Register(c.Modules.EdgeController, c.KubeAPIConfig, c.Modules.Edged.HostnameOverride, true) + edgecontroller.Register(c.Modules.EdgeController, c.Modules.Edged.HostnameOverride, true) metamanager.Register(c.Modules.MetaManager) // Nodte: Need to put it to the end, and wait for all models to register before executing dbm.InitDBConfig(c.DataBase.DriverName, c.DataBase.AliasName, c.DataBase.DataSource) |