Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

embed: use new "credentials" package

Browse Source 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
This commit is contained in:
Gyuho Lee 2019-07-13 10:42:32 -07:00
parent 7cbe2f5dd6
commit a6b105a907
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embed/serve.go
View File

@ -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) bundle := credentials.NewBundle(credentials.Config{TLSConfig: dtls})
opts := []grpc.DialOption{grpc.WithTransportCredentials(creds)} 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