fix: dependency compilation err, issue TencentBlueKing#722

DeveloperJim · Feb 4, 2021 · 9805387 · 9805387
1 parent 51ce5e0
commit 9805387
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 1,273 deletions.
diff --git a/bcs-k8s/bcs-kube-agent/go.mod b/bcs-k8s/bcs-kube-agent/go.mod
@@ -7,6 +7,9 @@ replace (
 	github.com/coreos/bbolt v1.3.4 => go.etcd.io/bbolt v1.3.4
 	go.etcd.io/bbolt v1.3.4 => github.com/coreos/bbolt v1.3.4
 	k8s.io/api => k8s.io/api v0.18.6
+	k8s.io/client-go => k8s.io/client-go v0.18.6
+	k8s.io/apimachinery => k8s.io/apimachinery v0.18.6
+	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0
 )
 
 require (

diff --git a/bcs-services/bcs-api/go.mod b/bcs-services/bcs-api/go.mod
@@ -5,8 +5,11 @@ go 1.14
 replace (
 	github.com/Tencent/bk-bcs/bcs-common => github.com/Tencent/bk-bcs/bcs-common v0.0.0-20210122122633-ada65fa64361
 	github.com/coreos/bbolt v1.3.4 => go.etcd.io/bbolt v1.3.4
+	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0
 	go.etcd.io/bbolt v1.3.4 => github.com/coreos/bbolt v1.3.4
 	k8s.io/api => k8s.io/api v0.0.0-20181126151915-b503174bad59
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20181126155829-0cd23ebeb688
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20181126123746-eddba98df674
 	k8s.io/client-go => k8s.io/client-go v0.0.0-20181126152608-d082d5923d3c
 )
 
@@ -20,13 +23,15 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-playground/universal-translator v0.17.0 // indirect
 	github.com/google/go-cmp v0.5.4
+	github.com/googleapis/gnostic v0.0.0-00010101000000-000000000000 // indirect
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.4.2
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/iancoleman/strcase v0.1.3
 	github.com/jinzhu/gorm v1.9.16
 	github.com/json-iterator/go v1.1.10
 	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/parnurzeal/gorequest v0.2.16
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/prometheus/client_golang v1.9.0

diff --git a/bcs-services/bcs-client/go.mod b/bcs-services/bcs-client/go.mod
@@ -4,13 +4,13 @@ go 1.14
 
 replace (
 	bitbucket.org/ww/goautoneg => github.com/adjust/goautoneg v0.0.0-20150426214442-d788f35a0315
-	github.com/Tencent/bk-bcs => ../../
 	github.com/Tencent/bk-bcs/bcs-common => github.com/Tencent/bk-bcs/bcs-common v0.0.0-20210117140338-aeaed29b1997
 	github.com/Tencent/bk-bcs/bcs-k8s/bcs-gamedeployment-operator => ../../bcs-k8s/bcs-gamedeployment-operator
 	github.com/Tencent/bk-bcs/bcs-k8s/bcs-gamestatefulset-operator => ../../bcs-k8s/bcs-gamestatefulset-operator
 	github.com/Tencent/bk-bcs/bcs-k8s/kubebkbcs => github.com/Tencent/bk-bcs/bcs-k8s/kubebkbcs v0.0.0-20210117140338-aeaed29b1997
 	github.com/Tencent/bk-bcs/bcs-services/bcs-log-manager => ../bcs-log-manager
 	github.com/Tencent/bk-bcs/bcs-services/bcs-mesh-manager => ../bcs-mesh-manager
+	github.com/Tencent/bk-bcs/bcs-services/bcs-user-manager => ../bcs-user-manager
 	github.com/Tencent/bk-bcs/bcs-services/bcs-webhook-server => ../../bcs-services/bcs-webhook-server
 	github.com/coreos/bbolt v1.3.4 => go.etcd.io/bbolt v1.3.4
 	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0 // indirect
@@ -34,10 +34,10 @@ require (
 	github.com/DATA-DOG/go-sqlmock v1.4.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.1.0 // indirect
 	github.com/Masterminds/squirrel v1.2.0 // indirect
-	github.com/Tencent/bk-bcs v0.0.0-00010101000000-000000000000
 	github.com/Tencent/bk-bcs/bcs-common v0.0.0-20210122122633-ada65fa64361
 	github.com/Tencent/bk-bcs/bcs-services/bcs-log-manager v0.0.0-00010101000000-000000000000
 	github.com/Tencent/bk-bcs/bcs-services/bcs-mesh-manager v0.0.0-00010101000000-000000000000
+	github.com/Tencent/bk-bcs/bcs-services/bcs-user-manager v0.0.0-00010101000000-000000000000
 	github.com/bitly/go-simplejson v0.5.0
 	github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
 	github.com/cheggaaa/pb/v3 v3.0.4 // indirect
@@ -73,7 +73,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/tsdb v0.7.1 // indirect
 	github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3 // indirect
-	github.com/sirupsen/logrus v1.6.0
+	github.com/sirupsen/logrus v1.7.0
 	github.com/stretchr/testify v1.6.1 // indirect
 	github.com/uber/jaeger-client-go v2.25.0+incompatible // indirect
 	github.com/uber/jaeger-lib v2.2.0+incompatible // indirect

diff --git a/bcs-services/bcs-cluster-manager/go.mod b/bcs-services/bcs-cluster-manager/go.mod
@@ -5,9 +5,13 @@ go 1.14
 replace (
 	github.com/Tencent/bk-bcs/bcs-common => github.com/Tencent/bk-bcs/bcs-common v0.0.0-20210204122842-0a7ba2fb84ff
 	github.com/coreos/bbolt v1.3.4 => go.etcd.io/bbolt v1.3.4
+	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0
 	go.etcd.io/bbolt v1.3.4 => github.com/coreos/bbolt v1.3.4
 	google.golang.org/grpc => google.golang.org/grpc v1.26.0
 	k8s.io/api => k8s.io/api v0.18.6
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.6
+	k8s.io/apimachinery => k8s.io/apimachinery v0.18.6
+	k8s.io/client-go => k8s.io/client-go v0.18.6
 )
 
 require (
@@ -19,8 +23,11 @@ require (
 	github.com/golang/protobuf v1.4.3
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.4.2
+	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.14.6
 	github.com/micro/go-micro/v2 v2.9.1
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
+	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/prometheus/client_golang v1.9.0
 	github.com/xdg/stringprep v1.0.0 // indirect
 	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect

diff --git a/bcs-services/bcs-cluster-manager/internal/clusterops/clusterclient.go b/bcs-services/bcs-cluster-manager/internal/clusterops/clusterclient.go
@@ -20,7 +20,6 @@ import (
 	"github.com/Tencent/bk-bcs/bcs-common/common/modules"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/options"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/store"
-	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/types"
 
 	k8scorecliset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"

diff --git a/bcs-services/bcs-gateway-discovery/go.mod b/bcs-services/bcs-gateway-discovery/go.mod
@@ -3,11 +3,13 @@ module github.com/Tencent/bk-bcs/bcs-services/bcs-gateway-discovery
 go 1.14
 
 replace (
-	github.com/Tencent/bk-bcs/bcs-common => github.com/Tencent/bk-bcs/bcs-common v0.0.0-20210204122842-0a7ba2fb84ff
+	github.com/Tencent/bk-bcs/bcs-common => github.com/Tencent/bk-bcs/bcs-common v0.0.0-20210204134536-62cbdd86fc35
 	github.com/coreos/bbolt v1.3.4 => go.etcd.io/bbolt v1.3.4
 	github.com/kevholditch/gokong => github.com/DeveloperJim/gokong v1.9.2
 	github.com/micro/go-micro/v2 => github.com/OvertimeDog/go-micro/v2 v2.9.3
 	go.etcd.io/bbolt v1.3.4 => github.com/coreos/bbolt v1.3.4
+	github.com/coreos/etcd => github.com/coreos/etcd v3.3.18+incompatible
+	google.golang.org/grpc => google.golang.org/grpc v1.26.0
 )
 
 require (

diff --git a/bcs-services/bcs-user-manager/app/user-manager/v1http/tke.go b/bcs-services/bcs-user-manager/app/user-manager/v1http/tke.go
@@ -271,7 +271,6 @@ func SyncTkeClusterCredentials(request *restful.Request, response *restful.Respo
 // ListTkeCidr list cidr count group by vpc
 func ListTkeCidr(request *restful.Request, response *restful.Response) {
 	// support prometheus metrics
-	start := time.Now()
 
 	cidrCounts := sqlstore.CountTkeCidr()
 	response.WriteEntity(cidrCounts)