perf: Reduce API component dependency on ETCD

api/controller/manager.go

@@ -22,11 +22,9 @@ import (
 	"net/http"
 
 	"github.com/goodrain/rainbond/api/api"
-	"github.com/goodrain/rainbond/api/discover"
 	"github.com/goodrain/rainbond/api/proxy"
 	"github.com/goodrain/rainbond/cmd/api/option"
 	mqclient "github.com/goodrain/rainbond/mq/client"
-	etcdutil "github.com/goodrain/rainbond/util/etcd"
 	"github.com/goodrain/rainbond/worker/client"
 )
 
@@ -69,13 +67,7 @@ func GetManager() V2Manager {
 
 // NewManager new manager
 func NewManager(conf option.Config, statusCli *client.AppRuntimeSyncClient) (*V2Routes, error) {
-	etcdClientArgs := &etcdutil.ClientArgs{
-		Endpoints: conf.EtcdEndpoint,
-		CaFile:    conf.EtcdCaFile,
-		CertFile:  conf.EtcdCertFile,
-		KeyFile:   conf.EtcdKeyFile,
-	}
-	mqClient, err := mqclient.NewMqClient(etcdClientArgs, conf.MQAPI)
+	mqClient, err := mqclient.NewMqClient(conf.MQAPI)
 	if err != nil {
 		return nil, err
 	}
@@ -86,7 +78,7 @@ func NewManager(conf option.Config, statusCli *client.AppRuntimeSyncClient) (*V2
 	v2r.GatewayStruct.cfg = &conf
 	v2r.LabelController.optconfig = &conf
 	eventServerProxy := proxy.CreateProxy("eventlog", "http", []string{"local=>rbd-eventlog:6363"})
-	discover.GetEndpointDiscover().AddProject("event_log_event_http", eventServerProxy)
+	//discover.GetEndpointDiscover().AddProject("event_log_event_http", eventServerProxy)
 	v2r.EventLogStruct.EventlogServerProxy = eventServerProxy
 	return &v2r, nil
 }

api/controller/websocket.go

@@ -25,118 +25,117 @@ import (
 	"path"
 
 	"github.com/go-chi/chi"
-	"github.com/goodrain/rainbond/api/discover"
 	"github.com/goodrain/rainbond/api/handler"
 	"github.com/goodrain/rainbond/api/proxy"
 	ctxutil "github.com/goodrain/rainbond/api/util/ctx"
 	"github.com/goodrain/rainbond/util/constants"
 	"github.com/sirupsen/logrus"
 )
 
-//DockerConsole docker console
+// DockerConsole docker console
 type DockerConsole struct {
 	socketproxy proxy.Proxy
 }
 
-var defaultDockerConsoleEndpoints = []string{"127.0.0.1:7171"}
+var defaultDockerConsoleEndpoints = []string{"rbd-webcli:7171"}
 var defaultEventLogEndpoints = []string{"local=>rbd-eventlog:6363"}
 
 var dockerConsole *DockerConsole
 
-//GetDockerConsole get Docker console
+// GetDockerConsole get Docker console
 func GetDockerConsole() *DockerConsole {
 	if dockerConsole != nil {
 		return dockerConsole
 	}
 	dockerConsole = &DockerConsole{
 		socketproxy: proxy.CreateProxy("dockerconsole", "websocket", defaultDockerConsoleEndpoints),
 	}
-	discover.GetEndpointDiscover().AddProject("acp_webcli", dockerConsole.socketproxy)
+	//discover.GetEndpointDiscover().AddProject("acp_webcli", dockerConsole.socketproxy)
 	return dockerConsole
 }
 
-//Get get
+// Get get
 func (d DockerConsole) Get(w http.ResponseWriter, r *http.Request) {
 	d.socketproxy.Proxy(w, r)
 }
 
 var dockerLog *DockerLog
 
-//DockerLog docker log
+// DockerLog docker log
 type DockerLog struct {
 	socketproxy proxy.Proxy
 }
 
-//GetDockerLog get docker log
+// GetDockerLog get docker log
 func GetDockerLog() *DockerLog {
 	if dockerLog == nil {
 		dockerLog = &DockerLog{
 			socketproxy: proxy.CreateProxy("dockerlog", "websocket", defaultEventLogEndpoints),
 		}
-		discover.GetEndpointDiscover().AddProject("event_log_event_http", dockerLog.socketproxy)
+		//discover.GetEndpointDiscover().AddProject("event_log_event_http", dockerLog.socketproxy)
 	}
 	return dockerLog
 }
 
-//Get get
+// Get get
 func (d DockerLog) Get(w http.ResponseWriter, r *http.Request) {
 	d.socketproxy.Proxy(w, r)
 }
 
-//MonitorMessage monitor message
+// MonitorMessage monitor message
 type MonitorMessage struct {
 	socketproxy proxy.Proxy
 }
 
 var monitorMessage *MonitorMessage
 
-//GetMonitorMessage get MonitorMessage
+// GetMonitorMessage get MonitorMessage
 func GetMonitorMessage() *MonitorMessage {
 	if monitorMessage == nil {
 		monitorMessage = &MonitorMessage{
 			socketproxy: proxy.CreateProxy("monitormessage", "websocket", defaultEventLogEndpoints),
 		}
-		discover.GetEndpointDiscover().AddProject("event_log_event_http", monitorMessage.socketproxy)
+		//discover.GetEndpointDiscover().AddProject("event_log_event_http", monitorMessage.socketproxy)
 	}
 	return monitorMessage
 }
 
-//Get get
+// Get get
 func (d MonitorMessage) Get(w http.ResponseWriter, r *http.Request) {
 	d.socketproxy.Proxy(w, r)
 }
 
-//EventLog event log
+// EventLog event log
 type EventLog struct {
 	socketproxy proxy.Proxy
 }
 
 var eventLog *EventLog
 
-//GetEventLog get event log
+// GetEventLog get event log
 func GetEventLog() *EventLog {
 	if eventLog == nil {
 		eventLog = &EventLog{
 			socketproxy: proxy.CreateProxy("eventlog", "websocket", defaultEventLogEndpoints),
 		}
-		discover.GetEndpointDiscover().AddProject("event_log_event_http", eventLog.socketproxy)
+		//discover.GetEndpointDiscover().AddProject("event_log_event_http", eventLog.socketproxy)
 	}
 	return eventLog
 }
 
-//Get get
+// Get get
 func (d EventLog) Get(w http.ResponseWriter, r *http.Request) {
 	d.socketproxy.Proxy(w, r)
 }
 
-//LogFile log file down server
+// LogFile log file down server
 type LogFile struct {
 	Root string
 }
 
 var logFile *LogFile
 
-//GetLogFile get  log file
+// GetLogFile get  log file
 func GetLogFile() *LogFile {
 	root := os.Getenv("SERVICE_LOG_ROOT")
 	if root == "" {
@@ -151,7 +150,7 @@ func GetLogFile() *LogFile {
 	return logFile
 }
 
-//Get get
+// Get get
 func (d LogFile) Get(w http.ResponseWriter, r *http.Request) {
 	gid := chi.URLParam(r, "gid")
 	filename := chi.URLParam(r, "filename")
@@ -180,23 +179,23 @@ func (d LogFile) GetInstallLog(w http.ResponseWriter, r *http.Request) {
 
 var pubSubControll *PubSubControll
 
-//PubSubControll service pub sub
+// PubSubControll service pub sub
 type PubSubControll struct {
 	socketproxy proxy.Proxy
 }
 
-//GetPubSubControll get service pub sub controller
+// GetPubSubControll get service pub sub controller
 func GetPubSubControll() *PubSubControll {
 	if pubSubControll == nil {
 		pubSubControll = &PubSubControll{
 			socketproxy: proxy.CreateProxy("dockerlog", "websocket", defaultEventLogEndpoints),
 		}
-		discover.GetEndpointDiscover().AddProject("event_log_event_http", pubSubControll.socketproxy)
+		//discover.GetEndpointDiscover().AddProject("event_log_event_http", pubSubControll.socketproxy)
 	}
 	return pubSubControll
 }
 
-//Get pubsub controller
+// Get pubsub controller
 func (d PubSubControll) Get(w http.ResponseWriter, r *http.Request) {
 	serviceID := chi.URLParam(r, "serviceID")
 	name, _ := handler.GetEventHandler().GetLogInstance(serviceID)
@@ -207,7 +206,7 @@ func (d PubSubControll) Get(w http.ResponseWriter, r *http.Request) {
 	d.socketproxy.Proxy(w, r)
 }
 
-//GetHistoryLog get service docker logs
+// GetHistoryLog get service docker logs
 func (d PubSubControll) GetHistoryLog(w http.ResponseWriter, r *http.Request) {
 	serviceID := r.Context().Value(ctxutil.ContextKey("service_id")).(string)
 	name, _ := handler.GetEventHandler().GetLogInstance(serviceID)