edgemesh: delete beehiveContext fiield from edgemesh struct

Signed-off-by: zhangjie <iamkadisi@163.com>

4 files changed, 7 insertions, 16 deletions

diff --git a/edgemesh/pkg/module.go b/edgemesh/pkg/module.go
index d42f701ee..0cd622363 100644
--- a/edgemesh/pkg/module.go
+++ b/edgemesh/pkg/module.go
@@ -15,8 +15,7 @@ import (
 
 //EdgeMesh defines EdgeMesh object structure
 type EdgeMesh struct {
-	context *beehiveContext.Context
-	cancel  context.CancelFunc
+	cancel context.CancelFunc
 }
 
 // Register register edgemesh
@@ -35,8 +34,7 @@ func (em *EdgeMesh) Group() string {
 }
 
 //Start sets context and starts the controller
-func (em *EdgeMesh) Start(c *beehiveContext.Context) {
-	em.context = c
+func (em *EdgeMesh) Start() {
 	var ctx context.Context
 	ctx, em.cancel = context.WithCancel(context.Background())
 	proxy.Init()
@@ -49,7 +47,7 @@ func (em *EdgeMesh) Start(c *beehiveContext.Context) {
 			return
 		default:
 		}
-		msg, err := em.context.Receive(constant.ModuleNameEdgeMesh)
+		msg, err := beehiveContext.Receive(constant.ModuleNameEdgeMesh)
 		if err != nil {
 			klog.Warningf("edgemesh receive msg error %v", err)
 			continue
@@ -62,5 +60,5 @@ func (em *EdgeMesh) Start(c *beehiveContext.Context) {
 //Cleanup sets up context cleanup through EdgeMesh name
 func (em *EdgeMesh) Cleanup() {
 	em.cancel()
-	em.context.Cleanup(em.Name())
+	beehiveContext.Cleanup(em.Name())
 }
diff --git a/edgemesh/pkg/proxy/proxy.go b/edgemesh/pkg/proxy/proxy.go
index d0238c85e..78f259e03 100644
--- a/edgemesh/pkg/proxy/proxy.go
+++ b/edgemesh/pkg/proxy/proxy.go
@@ -11,7 +11,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/beehive/pkg/core/model"
 	"github.com/kubeedge/kubeedge/common/constants"
 	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
@@ -67,8 +66,7 @@ func Init() {
 	go func() {
 		unused = make([]string, 0)
 		addrByService = &addrTable{}
-		c := context.InitContext(context.MsgCtxTypeChannel)
-		metaClient = client.New(c)
+		metaClient = client.New()
 		//create virtual network device
 		for {
 			err := vdev.CreateDevice()
diff --git a/edgemesh/pkg/registry/registry.go b/edgemesh/pkg/registry/registry.go
index e776d4e20..162305a28 100644
--- a/edgemesh/pkg/registry/registry.go
+++ b/edgemesh/pkg/registry/registry.go
@@ -9,7 +9,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/klog"
 
-	"github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/common"
 )
@@ -40,9 +39,8 @@ func toProtocolMap(address v1.EndpointAddress, ports []v1.EndpointPort) map[stri
 }
 
 func NewServiceDiscovery(options registry.Options) registry.ServiceDiscovery {
-	c := context.InitContext(context.MsgCtxTypeChannel)
 	return &ServiceDiscovery{
-		metaClient: client.New(c),
+		metaClient: client.New(),
 		Name:       EdgeRegistry,
 	}
 }
diff --git a/edgemesh/pkg/server/dns.go b/edgemesh/pkg/server/dns.go
index bba1066de..8034efe9c 100644
--- a/edgemesh/pkg/server/dns.go
+++ b/edgemesh/pkg/server/dns.go
@@ -13,7 +13,6 @@ import (
 
 	"k8s.io/klog"
 
-	"github.com/kubeedge/beehive/pkg/core/context"
 	"github.com/kubeedge/kubeedge/edge/pkg/metamanager/client"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/common"
 	"github.com/kubeedge/kubeedge/edgemesh/pkg/proxy"
@@ -78,9 +77,7 @@ func DnsStart() {
 
 // startDnsServer start the DNS Server
 func startDnsServer() {
-	// init meta client
-	c := context.InitContext(context.MsgCtxTypeChannel)
-	metaClient = client.New(c)
+	metaClient = client.New()
 	//get DNS server name
 	lip, err := getIP()
 	if err != nil {