Merge pull request #123 from Poorunga/remove-docker0-new2

Remove docker0 dependency

agent/cmd/edgemesh-agent/app/config/config.go

@@ -22,11 +22,17 @@ const (
 	GroupName  = "agent.edgemesh.config.kubeedge.io"
 	APIVersion = "v1alpha1"
 	Kind       = "EdgeMeshAgent"
+
+	DefaultDummyDeviceName = "edgemesh0"
+	DefaultDummyDeviceIP   = "169.254.96.16"
 )
 
 // EdgeMeshAgentConfig indicates the config of edgeMeshAgent which get from edgeMeshAgent config file
 type EdgeMeshAgentConfig struct {
 	metav1.TypeMeta
+	// CommonConfig indicates common config for all modules
+	// +Required
+	CommonConfig *CommonConfig `json:"commonConfig,omitempty"`
 	// KubeAPIConfig indicates the kubernetes cluster info which edgeMeshAgent will connected
 	// +Required
 	KubeAPIConfig *v1alpha1.KubeAPIConfig `json:"kubeAPIConfig,omitempty"`
@@ -38,6 +44,16 @@ type EdgeMeshAgentConfig struct {
 	Modules *Modules `json:"modules,omitempty"`
 }
 
+// CommonConfig defines some common configuration items
+type CommonConfig struct {
+	// DummyDeviceName indicates the name of the dummy device will be created
+	// default edgemesh0
+	DummyDeviceName string `json:"dummyDeviceName,omitempty"`
+	// DummyDeviceIP indicates the IP bound to the dummy device
+	// default "169.254.96.16"
+	DummyDeviceIP string `json:"dummyDeviceIP,omitempty"`
+}
+
 // Modules indicates the modules of edgeMeshAgent will be use
 type Modules struct {
 	// EdgeDNSConfig indicates edgedns module config
@@ -57,6 +73,10 @@ func NewEdgeMeshAgentConfig() *EdgeMeshAgentConfig {
 			Kind:       Kind,
 			APIVersion: path.Join(GroupName, APIVersion),
 		},
+		CommonConfig: &CommonConfig{
+			DummyDeviceName: DefaultDummyDeviceName,
+			DummyDeviceIP:   DefaultDummyDeviceIP,
+		},
 		KubeAPIConfig: &v1alpha1.KubeAPIConfig{
 			Master:      "",
 			ContentType: runtime.ContentTypeJSON,

agent/cmd/edgemesh-agent/app/server.go

@@ -20,6 +20,7 @@ import (
 	"github.com/kubeedge/edgemesh/agent/pkg/proxy"
 	"github.com/kubeedge/edgemesh/agent/pkg/tunnel"
 	"github.com/kubeedge/edgemesh/common/informers"
+	commonutil "github.com/kubeedge/edgemesh/common/util"
 	"github.com/kubeedge/kubeedge/pkg/util"
 	"github.com/kubeedge/kubeedge/pkg/util/flag"
 	"github.com/kubeedge/kubeedge/pkg/version"
@@ -92,6 +93,12 @@ func Run(cfg *config.EdgeMeshAgentConfig) error {
 	}
 	trace++
 
+	klog.Infof("[%d] Prepare agent to run", trace)
+	if err = prepareRun(cfg, ifm); err != nil {
+		return err
+	}
+	trace++
+
 	klog.Infof("[%d] Register beehive modules", trace)
 	if errs := registerModules(cfg, ifm); len(errs) > 0 {
 		return fmt.Errorf(util.SpliceErrors(errs))
@@ -143,3 +150,19 @@ func registerModules(c *config.EdgeMeshAgentConfig, ifm *informers.Manager) []er
 	}
 	return errs
 }
+
+// prepareRun prepares edgemesh-agent to run
+func prepareRun(c *config.EdgeMeshAgentConfig, ifm *informers.Manager) error {
+	if err := commonutil.CreateDummyDevice(c.CommonConfig.DummyDeviceName, c.CommonConfig.DummyDeviceIP); err != nil {
+		return fmt.Errorf("create dummy device %s err: %v", c.CommonConfig.DummyDeviceName, err)
+	}
+	// set dns and proxy modules listenInterface
+	if c.Modules.EdgeDNSConfig.Enable {
+		c.Modules.EdgeDNSConfig.ListenInterface = c.CommonConfig.DummyDeviceName
+	}
+	if c.Modules.EdgeProxyConfig.Enable {
+		c.Modules.EdgeProxyConfig.ListenInterface = c.CommonConfig.DummyDeviceName
+	}
+
+	return nil
+}

agent/pkg/dns/config/config.go

@@ -6,17 +6,16 @@ type EdgeDNSConfig struct {
 	// default true
 	Enable bool `json:"enable,omitempty"`
 	// ListenInterface indicates the listen interface of edgedns
-	// default "docker0"
-	ListenInterface string `json:"listenInterface,omitempty"`
+	// do not allow users to configure manually
+	ListenInterface string
 	// ListenPort indicates the listen port of edgedns
 	// default 53
 	ListenPort int `json:"listenPort,omitempty"`
 }
 
 func NewEdgeDNSConfig() *EdgeDNSConfig {
 	return &EdgeDNSConfig{
-		Enable:          true,
-		ListenInterface: "docker0",
-		ListenPort:      53,
+		Enable:     true,
+		ListenPort: 53,
 	}
 }

agent/pkg/proxy/config/config.go

@@ -9,18 +9,17 @@ type EdgeProxyConfig struct {
 	// default "10.96.0.0/12", equals to k8s default service-cluster-ip-range
 	SubNet string `json:"subNet,omitempty"`
 	// ListenInterface indicates the listen interface of edgeproxy
-	// default "docker0"
-	ListenInterface string `json:"listenInterface,omitempty"`
+	// do not allow users to configure manually
+	ListenInterface string
 	// ListenPort indicates the listen port of edgeproxy
 	// default 40001
 	ListenPort int `json:"listenPort,omitempty"`
 }
 
 func NewEdgeProxyConfig() *EdgeProxyConfig {
 	return &EdgeProxyConfig{
-		Enable:          true,
-		SubNet:          "10.96.0.0/12",
-		ListenInterface: "docker0",
-		ListenPort:      40001,
+		Enable:     true,
+		SubNet:     "10.96.0.0/12",
+		ListenPort: 40001,
 	}
 }