Refactor

Signed-off-by: Zhengyi Lai <zheng1@yunify.com>

Dockerfile

@@ -11,8 +11,7 @@ COPY . .
 
 RUN mkdir -p /openpitrix_bin
 RUN go generate openpitrix.io/openpitrix/pkg/version && \
-	CGO_ENABLED=0 GOBIN=/openpitrix_bin go install -ldflags '-w -s' -v -tags netgo openpitrix.io/openpitrix/cmd/... && \
-	CGO_ENABLED=0 GOBIN=/openpitrix_bin go install -ldflags '-w -s' -v -tags netgo openpitrix.io/openpitrix/metadata/cmd/...
+	CGO_ENABLED=0 GOBIN=/openpitrix_bin go install -ldflags '-w -s' -v -tags netgo openpitrix.io/openpitrix/cmd/hyperpitrix
 
 FROM alpine:3.7
 

Dockerfile.dev

@@ -1,6 +1,6 @@
 FROM alpine:3.7
 
-COPY ./* /usr/local/bin/
+COPY ./hyperpitrix /usr/local/bin/
 
 RUN apk add --update ca-certificates && \
     update-ca-certificates && \

Makefile

@@ -36,7 +36,7 @@ endef
 COMPOSE_APP_SERVICES=openpitrix-runtime-manager openpitrix-app-manager openpitrix-category-manager openpitrix-repo-indexer openpitrix-api-gateway openpitrix-repo-manager openpitrix-job-manager openpitrix-task-manager openpitrix-cluster-manager openpitrix-market-manager openpitrix-pilot-service openpitrix-account-service openpitrix-attachment-manager openpitrix-isv-manager openpitrix-notification openpitrix-im-service openpitrix-am-service
 #COMPOSE_APP_SERVICES=openpitrix-pilot-service openpitrix-im-service openpitrix-am-service hyperpitrix
 COMPOSE_DB_CTRL=openpitrix-db-init openpitrix-im-db-init openpitrix-am-db-init openpitrix-app-db-ctrl openpitrix-repo-db-ctrl openpitrix-runtime-db-ctrl openpitrix-job-db-ctrl openpitrix-task-db-ctrl openpitrix-cluster-db-ctrl openpitrix-iam-db-ctrl openpitrix-attachment-db-ctrl openpitrix-isv-db-ctrl openpitrix-notification-db-ctrl openpitrix-im-db-ctrl openpitrix-am-db-ctrl
-CMD?=...
+CMD?=hyperpitrix
 WITH_METADATA?=yes
 WITH_K8S=no
 comma:= ,

cmd/hyperpitrix/main.go

@@ -6,7 +6,6 @@
 package main
 
 import (
-	"openpitrix.io/openpitrix/pkg/apigateway"
 	"openpitrix.io/openpitrix/pkg/config"
 	"openpitrix.io/openpitrix/pkg/service/app"
 	"openpitrix.io/openpitrix/pkg/service/attachment"
@@ -40,7 +39,5 @@ func main() {
 	go app.Serve(getConf("app"))
 	go attachment.Serve(getConf("attachment"))
 	go runtime_provider.Serve(getConf(""))
-	go helm.Serve(getConf(""))
-
-	apigateway.Serve(getConf(""))
+	helm.Serve(getConf(""))
 }

pkg/config/global_config.go

@@ -89,6 +89,9 @@ func (r *RuntimeProviderConfig) GetPort() int {
 }
 
 func (r *RuntimeProviderConfig) GetHost(provider string) string {
+	if provider == constants.ProviderKubernetes {
+		return constants.ClusterManagerHost
+	}
 	if len(r.Host) > 0 {
 		return r.Host
 	} else {

pkg/constants/common.go

@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	hyperpitrix                = "hyperpitrix"
+	hyperpitrix                = "127.0.0.1"
 	prefix                     = "openpitrix-"
 	ProviderPrefix             = "openpitrix-rp-"
 	RepoManagerHost            = hyperpitrix

pkg/service/app/resource_control.go

@@ -491,10 +491,6 @@ func formatAppSet(ctx context.Context, apps []*models.App, active bool) ([]*pb.A
 	if err != nil {
 		return pbApps, err
 	}
-	vendorMap, err := getVendorMap(ctx, userIds)
-	if err != nil {
-		return pbApps, err
-	}
 	for _, app := range apps {
 
 		var pbApp *pb.App
@@ -508,12 +504,6 @@ func formatAppSet(ctx context.Context, apps []*models.App, active bool) ([]*pb.A
 		if categorySet, ok := rcMap[app.AppId]; ok {
 			pbApp.CategorySet = categorySet
 		}
-		if vendor, ok := vendorMap[app.Isv]; ok {
-			pbApp.CompanyJoinTime = vendor.StatusTime
-			pbApp.CompanyName = vendor.CompanyName
-			pbApp.CompanyProfile = vendor.CompanyProfile
-			pbApp.CompanyWebsite = vendor.CompanyWebsite
-		}
 
 		pbApps = append(pbApps, pbApp)
 	}

pkg/service/helm/constants.go

@@ -4,8 +4,10 @@
 
 package helm
 
+import "openpitrix.io/openpitrix/pkg/constants"
+
 const (
-	Provider       = "kubernetes"
+	Provider       = constants.ProviderKubernetes
 	ProviderConfig = `
 provider_type: helm
 enable: true

pkg/service/helm/server.go

@@ -1,7 +1,6 @@
 package helm
 
 import (
-	providerclient "openpitrix.io/openpitrix/pkg/client/runtime_provider"
 	"openpitrix.io/openpitrix/pkg/config"
 	"openpitrix.io/openpitrix/pkg/manager"
 	runtimeprovider "openpitrix.io/openpitrix/pkg/service/runtime_provider"
@@ -20,7 +19,7 @@ type Server struct {
 
 func Serve(cfg *config.Config) {
 	pi.SetGlobal(cfg)
-	err := providerclient.RegisterRuntimeProvider(Provider, ProviderConfig)
+	err := pi.Global().RegisterRuntimeProvider(Provider, ProviderConfig)
 	if err != nil {
 		logger.Critical(nil, "failed to register provider config: %+v", err)
 	}

pkg/service/task/controller.go

@@ -136,13 +136,14 @@ func (c *Controller) HandleTask(ctx context.Context, taskId string, cb func()) e
 			return err
 		}
 
-		pilotClient, err := pilotclient.NewClient()
-		if err != nil {
-			logger.Error(ctx, "Connect to pilot service failed: %+v", err)
-			return err
-		}
-
 		if task.Target == constants.TargetPilot {
+
+			pilotClient, err := pilotclient.NewClient()
+			if err != nil {
+				logger.Error(ctx, "Connect to pilot service failed: %+v", err)
+				return err
+			}
+
 			switch task.TaskAction {
 			case vmbased.ActionSetDroneConfig:
 				config := new(pbtypes.SetDroneConfigRequest)