summaryrefslogtreecommitdiff
path: root/edgesite
diff options
context:
space:
mode:
authorzhangjie <iamkadisi@163.com>2020-01-15 16:23:50 +0800
committerzhangjie <iamkadisi@163.com>2020-01-19 17:29:41 +0800
commita408ab19b5dc2dc0cab1d15f8da0e7b7986e0906 (patch)
treed5cac7d17b278d20a498ad5f5d3487bf11ddab74 /edgesite
parentdelete edge/pkg/common/config package (diff)
downloadkubeedge-a408ab19b5dc2dc0cab1d15f8da0e7b7986e0906.tar.gz
fix:make verify,lint,edge_test error, recreate module gomock files, e2e test,edge integration
Signed-off-by: zhangjie <iamkadisi@163.com>
Diffstat (limited to 'edgesite')
-rw-r--r--edgesite/cmd/app/server.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/edgesite/cmd/app/server.go b/edgesite/cmd/app/server.go
index 12562c300..fb504e7a8 100644
--- a/edgesite/cmd/app/server.go
+++ b/edgesite/cmd/app/server.go
@@ -43,13 +43,13 @@ runs on edge nodes and manages containerized applications.`,
os.Exit(1)
}
- c, err := opts.Config()
+ config, err := opts.Config()
if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1)
}
- if errs := validation.ValidateEdgeSiteConfiguration(c); len(errs) > 0 {
+ if errs := validation.ValidateEdgeSiteConfiguration(config); len(errs) > 0 {
fmt.Fprintf(os.Stderr, "%v\n", errs)
os.Exit(1)
}
@@ -57,7 +57,7 @@ runs on edge nodes and manages containerized applications.`,
// To help debugging, immediately log version
klog.Infof("Version: %+v", version.Get())
- registerModules(c)
+ registerModules(config)
// start all modules
core.Run()
},
@@ -89,5 +89,5 @@ runs on edge nodes and manages containerized applications.`,
func registerModules(c *v1alpha1.EdgeSiteConfig) {
edged.Register(c.Modules.Edged)
edgecontroller.Register(c.Modules.EdgeController, c.KubeAPIConfig, c.Modules.Edged.HostnameOverride, true)
- metamanager.Register(c.Modules.MetaManager, c.DataBase)
+ metamanager.Register(c.Modules.MetaManager)
}