This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-mesher.git
The following commit(s) were added to refs/heads/master by this push:
new ecba6d7 remove dubbo protocol (#92)
ecba6d7 is described below
commit ecba6d70d762e5d3c846ff3485b515bb8afa5d36
Author: Shawn <[email protected]>
AuthorDate: Sun Dec 15 09:07:27 2019 +0800
remove dubbo protocol (#92)
---
cmd/mesher/mesher.go | 3 ---
go.mod | 8 ++++----
proxy/pkg/infras/k8s/k8s.go | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/cmd/mesher/mesher.go b/cmd/mesher/mesher.go
index d8c3369..2f7dd9a 100644
--- a/cmd/mesher/mesher.go
+++ b/cmd/mesher/mesher.go
@@ -23,9 +23,6 @@ import (
_ "github.com/apache/servicecomb-mesher/proxy/resolver/authority"
_ "github.com/apache/servicecomb-mesher/proxy/handler"
- _
"github.com/apache/servicecomb-mesher/proxy/protocol/dubbo/client/chassis"
- _ "github.com/apache/servicecomb-mesher/proxy/protocol/dubbo/server"
- _
"github.com/apache/servicecomb-mesher/proxy/protocol/dubbo/simpleRegistry"
// config server
_ "github.com/apache/servicecomb-kie/client/adaptor"
//protocols
diff --git a/go.mod b/go.mod
index a78b47e..bf3ce08 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
github.com/ghodss/yaml v1.0.0
github.com/go-chassis/foundation v0.1.1-0.20191113114104-2b05871e9ec4
github.com/go-chassis/go-archaius v1.0.0
- github.com/go-chassis/go-chassis v1.8.1-0.20191213091237-f7ba7d0c8fe5
+ github.com/go-chassis/go-chassis v1.8.1-0.20191214091125-dfa5db7d4d1c
github.com/go-chassis/gohessian v0.0.0-20180702061429-e5130c25af55
github.com/go-mesh/openlogging v1.0.1
github.com/gogo/googleapis v1.3.0 // indirect
@@ -21,11 +21,11 @@ require (
github.com/tetratelabs/go2sky v0.1.1-0.20190703154722-1eaab8035277
github.com/urfave/cli v1.20.1-0.20181029213200-b67dcf995b6a
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
- golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be
+ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
google.golang.org/grpc v1.19.1
gopkg.in/yaml.v2 v2.2.4
- k8s.io/apimachinery v0.0.0-20191213205550-43dfa306b0f3
- k8s.io/client-go v11.0.0+incompatible
+ k8s.io/apimachinery v0.17.0
+ k8s.io/client-go v0.17.0
)
replace (
diff --git a/proxy/pkg/infras/k8s/k8s.go b/proxy/pkg/infras/k8s/k8s.go
index 14f5172..7d93b07 100644
--- a/proxy/pkg/infras/k8s/k8s.go
+++ b/proxy/pkg/infras/k8s/k8s.go
@@ -67,7 +67,7 @@ func CreateK8SRestClient(kubeconfig, apiPath, group, version
string) (*rest.REST
Group: group,
Version: version,
}
- config.NegotiatedSerializer =
serializer.DirectCodecFactory{CodecFactory:
serializer.NewCodecFactory(runtime.NewScheme())}
+ config.NegotiatedSerializer =
serializer.NewCodecFactory(runtime.NewScheme())
k8sRestClient, err := rest.RESTClientFor(config)
if err != nil {
