|
@@ -23,6 +23,7 @@ import (
|
|
|
"net/http"
|
|
"net/http"
|
|
|
"strings"
|
|
"strings"
|
|
|
|
|
|
|
|
|
|
+ "go.etcd.io/etcd/clientv3/credentials"
|
|
|
"go.etcd.io/etcd/etcdserver"
|
|
"go.etcd.io/etcd/etcdserver"
|
|
|
"go.etcd.io/etcd/etcdserver/api/v3client"
|
|
"go.etcd.io/etcd/etcdserver/api/v3client"
|
|
|
"go.etcd.io/etcd/etcdserver/api/v3election"
|
|
"go.etcd.io/etcd/etcdserver/api/v3election"
|
|
@@ -43,7 +44,6 @@ import (
|
|
|
"go.uber.org/zap"
|
|
"go.uber.org/zap"
|
|
|
"golang.org/x/net/trace"
|
|
"golang.org/x/net/trace"
|
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc"
|
|
|
- "google.golang.org/grpc/credentials"
|
|
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
type serveCtx struct {
|
|
type serveCtx struct {
|
|
@@ -163,8 +163,8 @@ func (sctx *serveCtx) serve(
|
|
|
dtls := tlscfg.Clone()
|
|
dtls := tlscfg.Clone()
|
|
|
// trust local server
|
|
// trust local server
|
|
|
dtls.InsecureSkipVerify = true
|
|
dtls.InsecureSkipVerify = true
|
|
|
- creds := credentials.NewTLS(dtls)
|
|
|
|
|
- opts := []grpc.DialOption{grpc.WithTransportCredentials(creds)}
|
|
|
|
|
|
|
+ bundle := credentials.NewBundle(credentials.Config{TLSConfig: dtls})
|
|
|
|
|
+ opts := []grpc.DialOption{grpc.WithTransportCredentials(bundle.TransportCredentials())}
|
|
|
gwmux, err = sctx.registerGateway(opts)
|
|
gwmux, err = sctx.registerGateway(opts)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return err
|
|
return err
|