Merge pull request #3 from Tencent/dev_wesley

minor: adjust k8s-watch in makefile and numactl-devel in docs
TencentBlueKing · Apr 30, 2019 · 562120c · 562120c
2 parents 7f3bb7b + d95d101
commit 562120c
Show file tree

Hide file tree

Showing 22 changed files with 53 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 *.DS_Store
+.idea/
+build/
+vendor/github.com/Sirupsen/Sirupsen
 vendor/github.com/Nvveen/Gotty/
 vendor/github.com/bitly/go-simplejson/
 vendor/github.com/coredns/coredns/

diff --git a/Makefile b/Makefile
@@ -34,16 +34,17 @@ CONFPATH=./build/bcs.${VERSION}/conf
 COMMONPATH=./build/bcs.${VERSION}/common
 EXPORTPATH=./build/api_export
 
+# options
+default:api dns health client storage check executor driver mesos_watch scheduler loadbalance k8s_watch kube_agent api_export
+specific:api dns health client storage check executor driver mesos_watch scheduler loadbalance metricservice metriccollector exporter k8s_watch kube_agent api_export hpacontroller
+
 # tag for different edition compiling
 inner:
-	$(MAKE) default bcs_edition=inner_edition
+	$(MAKE) specific bcs_edition=inner_edition
 ce:
-	$(MAKE) default bcs_edition=communication_edition
+	$(MAKE) specific bcs_edition=communication_edition
 ee:
-	$(MAKE) default bcs_edition=enterprise_edition
-
-# options
-default:api dns health client storage check executor driver mesos_watch scheduler loadbalance metricservice metriccollector exporter k8s_watch kube_agent api_export hpacontroller
+	$(MAKE) specific bcs_edition=enterprise_edition
 
 clean:
 	rm -rf ./build
@@ -125,8 +126,8 @@ hpacontroller:pre
 
 k8s_watch:pre
 	mkdir -p ${BINARYPATH}/bcs-k8s-watch
-	go build ${LDFLAG} -o ${BINARYPATH}/bcs-k8s-watch/bcs-k8s-watch ./bcs-k8s/k8s-watch/main.go
-	cp ./bcs-k8s/k8s-watch/Dockerfile_new ${BINARYPATH}/bcs-k8s-watch/Dockerfile
+	go build ${LDFLAG} -o ${BINARYPATH}/bcs-k8s-watch/bcs-k8s-watch ./bcs-k8s/bcs-k8s-watch/main.go
+	cp ./bcs-k8s/bcs-k8s-watch/Dockerfile_new ${BINARYPATH}/bcs-k8s-watch/Dockerfile
 
 api_export:pre
 	mkdir -p ${EXPORTPATH}

diff --git a/bcs-k8s/bcs-k8s-watch/app/app.go b/bcs-k8s/bcs-k8s-watch/app/app.go
@@ -25,17 +25,17 @@ import (
 
 	"bk-bcs/bcs-common/common/types"
 	bcsVersion "bk-bcs/bcs-common/common/version"
-	"bk-bcs/bcs-k8s/k8s-watch/app/bcs"
-	"bk-bcs/bcs-k8s/k8s-watch/app/k8s"
-	"bk-bcs/bcs-k8s/k8s-watch/app/options"
-	"bk-bcs/bcs-k8s/k8s-watch/app/output"
-	"bk-bcs/bcs-k8s/k8s-watch/app/output/action"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/bcs"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/k8s"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/options"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output/action"
 
 	global "bk-bcs/bcs-common/common"
 	glog "bk-bcs/bcs-common/common/blog"
 	"bk-bcs/bcs-common/common/metric"
-	disbcs "bk-bcs/bcs-k8s/k8s-watch/pkg/discovery/bcs"
-	disreg "bk-bcs/bcs-k8s/k8s-watch/pkg/discovery/register"
+	disbcs "bk-bcs/bcs-k8s/bcs-k8s-watch/pkg/discovery/bcs"
+	disreg "bk-bcs/bcs-k8s/bcs-k8s-watch/pkg/discovery/register"
 )
 
 var globalStopChan = make(chan struct{})

diff --git a/bcs-k8s/bcs-k8s-watch/app/bcs/cluster.go b/bcs-k8s/bcs-k8s-watch/app/bcs/cluster.go
@@ -26,7 +26,7 @@ import (
 	glog "bk-bcs/bcs-common/common/blog"
 	"bk-bcs/bcs-common/common/ssl"
 	"bk-bcs/bcs-common/common/types"
-	"bk-bcs/bcs-k8s/k8s-watch/app/options"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/options"
 )
 
 type ClusterKeeperResponse struct {

diff --git a/bcs-k8s/bcs-k8s-watch/app/bcs/storage.go b/bcs-k8s/bcs-k8s-watch/app/bcs/storage.go
@@ -23,7 +23,7 @@ import (
 	"bk-bcs/bcs-common/common/RegisterDiscover"
 	glog "bk-bcs/bcs-common/common/blog"
 	"bk-bcs/bcs-common/common/types"
-	"bk-bcs/bcs-k8s/k8s-watch/app/options"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/options"
 	"strings"
 )
 

diff --git a/bcs-k8s/bcs-k8s-watch/app/healthz.go b/bcs-k8s/bcs-k8s-watch/app/healthz.go
@@ -24,7 +24,7 @@ import (
 	glog "bk-bcs/bcs-common/common/blog"
 	"bk-bcs/bcs-common/common/ssl"
 
-	"bk-bcs/bcs-k8s/k8s-watch/app/options"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/options"
 )
 
 type HealthChecker struct {

diff --git a/bcs-k8s/bcs-k8s-watch/app/k8s/cluster.go b/bcs-k8s/bcs-k8s-watch/app/k8s/cluster.go
@@ -33,9 +33,9 @@ import (
 	"k8s.io/client-go/rest"
 
 	glog "bk-bcs/bcs-common/common/blog"
-	"bk-bcs/bcs-k8s/k8s-watch/app/bcs"
-	"bk-bcs/bcs-k8s/k8s-watch/app/options"
-	"bk-bcs/bcs-k8s/k8s-watch/app/output"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/bcs"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/options"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output"
 )
 
 // =================== interface & struct ===================

diff --git a/bcs-k8s/bcs-k8s-watch/app/k8s/exportservice.go b/bcs-k8s/bcs-k8s-watch/app/k8s/exportservice.go
@@ -26,8 +26,8 @@ import (
 	"k8s.io/api/extensions/v1beta1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	"bk-bcs/bcs-k8s/k8s-watch/app/output"
-	"bk-bcs/bcs-k8s/k8s-watch/app/output/action"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output/action"
 
 	commtypes "bk-bcs/bcs-common/common/types"
 	lbtypes "bk-bcs/bcs-common/pkg/loadbalance/v2"

diff --git a/bcs-k8s/bcs-k8s-watch/app/k8s/synchronizer.go b/bcs-k8s/bcs-k8s-watch/app/k8s/synchronizer.go
@@ -22,9 +22,9 @@ import (
 	jsoniter "github.com/json-iterator/go"
 
 	glog "bk-bcs/bcs-common/common/blog"
-	"bk-bcs/bcs-k8s/k8s-watch/app/bcs"
-	"bk-bcs/bcs-k8s/k8s-watch/app/output/action"
-	"bk-bcs/bcs-k8s/k8s-watch/app/output/http"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/bcs"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output/action"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output/http"
 )
 
 type Synchronizer struct {

diff --git a/bcs-k8s/bcs-k8s-watch/app/k8s/watcher.go b/bcs-k8s/bcs-k8s-watch/app/k8s/watcher.go
@@ -39,8 +39,8 @@ import (
 	//"k8s.io/api/apps/v1beta2"
 
 	glog "bk-bcs/bcs-common/common/blog"
-	"bk-bcs/bcs-k8s/k8s-watch/app/output"
-	"bk-bcs/bcs-k8s/k8s-watch/app/output/action"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output/action"
 )
 
 // =================== interface & struct ===================

diff --git a/bcs-k8s/bcs-k8s-watch/app/output/action/alertor.go b/bcs-k8s/bcs-k8s-watch/app/output/action/alertor.go
@@ -21,9 +21,9 @@ import (
 	glog "bk-bcs/bcs-common/common/blog"
 	"bk-bcs/bcs-common/common/version"
 
-	"bk-bcs/bcs-k8s/k8s-watch/app/options"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/options"
 
-	//"bk-bcs/bcs-k8s/k8s-watch/app/output/action"
+	//"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output/action"
 	"k8s.io/api/core/v1"
 )
 

diff --git a/bcs-k8s/bcs-k8s-watch/app/output/action/log.go b/bcs-k8s/bcs-k8s-watch/app/output/action/log.go
@@ -17,7 +17,7 @@ import (
 	"github.com/json-iterator/go"
 
 	glog "bk-bcs/bcs-common/common/blog"
-	"bk-bcs/bcs-k8s/k8s-watch/app/bcs"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/bcs"
 )
 
 type LogAction struct {

diff --git a/bcs-k8s/bcs-k8s-watch/app/output/action/storage.go b/bcs-k8s/bcs-k8s-watch/app/output/action/storage.go
@@ -17,8 +17,8 @@ package action
 import (
 	glog "bk-bcs/bcs-common/common/blog"
 
-	"bk-bcs/bcs-k8s/k8s-watch/app/bcs"
-	"bk-bcs/bcs-k8s/k8s-watch/app/output/http"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/bcs"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output/http"
 )
 
 type StorageAction struct {

diff --git a/bcs-k8s/bcs-k8s-watch/app/output/handler.go b/bcs-k8s/bcs-k8s-watch/app/output/handler.go
@@ -19,7 +19,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	glog "bk-bcs/bcs-common/common/blog"
-	"bk-bcs/bcs-k8s/k8s-watch/app/output/action"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output/action"
 )
 
 // =================== interface & struct ===================

diff --git a/bcs-k8s/bcs-k8s-watch/app/output/http/client.go b/bcs-k8s/bcs-k8s-watch/app/output/http/client.go
@@ -29,7 +29,7 @@ import (
 	glog "bk-bcs/bcs-common/common/blog"
 	"bk-bcs/bcs-common/common/ssl"
 	"bk-bcs/bcs-common/common/types"
-	"bk-bcs/bcs-k8s/k8s-watch/app/bcs"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/bcs"
 )
 
 type Client interface {

diff --git a/bcs-k8s/bcs-k8s-watch/app/output/http/client_test.go b/bcs-k8s/bcs-k8s-watch/app/output/http/client_test.go
@@ -16,7 +16,7 @@ package http
 import (
 	"testing"
 
-	"bk-bcs/bcs-k8s/k8s-watch/app/bcs"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/bcs"
 )
 
 func TestGetURL(t *testing.T) {

diff --git a/bcs-k8s/bcs-k8s-watch/app/output/writer.go b/bcs-k8s/bcs-k8s-watch/app/output/writer.go
@@ -19,8 +19,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	glog "bk-bcs/bcs-common/common/blog"
-	"bk-bcs/bcs-k8s/k8s-watch/app/bcs"
-	"bk-bcs/bcs-k8s/k8s-watch/app/output/action"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/bcs"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app/output/action"
 )
 
 // writer queue -> handler queue -> action func

diff --git a/bcs-k8s/bcs-k8s-watch/main.go b/bcs-k8s/bcs-k8s-watch/main.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"bk-bcs/bcs-k8s/k8s-watch/app"
-	"bk-bcs/bcs-k8s/k8s-watch/pkg/util/basic"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/app"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/pkg/util/basic"
 
 	glog "bk-bcs/bcs-common/common/blog"
 	"bk-bcs/bcs-common/common/conf"

diff --git a/bcs-k8s/bcs-k8s-watch/pkg/discovery/bcs/leaderelection.go b/bcs-k8s/bcs-k8s-watch/pkg/discovery/bcs/leaderelection.go
@@ -15,7 +15,7 @@ package bcs
 
 import (
 	"bk-bcs/bcs-common/common/blog"
-	"bk-bcs/bcs-k8s/k8s-watch/pkg/discovery/register"
+	"bk-bcs/bcs-k8s/bcs-k8s-watch/pkg/discovery/register"
 	"fmt"
 
 	"github.com/json-iterator/go"

diff --git a/bcs-services/bcs-client/cmd/main.go b/bcs-services/bcs-client/cmd/main.go
@@ -28,7 +28,6 @@ import (
 	"bk-bcs/bcs-services/bcs-client/cmd/get"
 	"bk-bcs/bcs-services/bcs-client/cmd/inspect"
 	"bk-bcs/bcs-services/bcs-client/cmd/list"
-	"bk-bcs/bcs-services/bcs-client/cmd/metric"
 	"bk-bcs/bcs-services/bcs-client/cmd/offer"
 	"bk-bcs/bcs-services/bcs-client/cmd/template"
 	"bk-bcs/bcs-services/bcs-client/cmd/update"
@@ -53,7 +52,7 @@ func main() {
 		list.NewListCommand(),
 		inspect.NewInspectCommand(),
 		get.NewGetCommand(),
-		metric.NewMetricCommand(),
+		//metric.NewMetricCommand(),
 		deployment.NewCancelCommand(),
 		deployment.NewPauseCommand(),
 		deployment.NewResumeCommand(),

diff --git a/docs/install/source_compile.md b/docs/install/source_compile.md
@@ -11,6 +11,11 @@ mkdir -p $GOPATH/src    #为GOPATH新建源代码存放路径
 ## 编译环境
 
 - golang >= 1.11.2
+- numactl-devel >= 2.0.9
+
+``` shell
+sudo yum install numactl-devel -y
+```
 
 ## 源码下载
 
@@ -39,5 +44,5 @@ source ./scripts/env.sh
 
 ### 编译
 ``` shell
-make
+make -j
 ```
diff --git a/install/community_edition/service/#etc#bcs#api.json b/install/community_edition/service/#etc#bcs#api.json
@@ -16,7 +16,7 @@
   "local_ip": "__LAN_IP__",
   "bkiam_auth": {
     "auth": false,
-    "bkiam_auth_host": "__IAM_SERVER_HOST__",
+    "bkiam_auth_host": "http://__IAM_HOST__",
     "bkiam_auth_app_code": "__APP_CODE__",
     "bkiam_auth_app_secret": "__APP_TOKEN__"
   },