Update etcd to v3.5

brandond · brandond · commit 98f69539f4a0 · 2021-07-13T13:44:57.000-07:00
Signed-off-by: Brad Davidson &lt;brad.davidson@rancher.com&gt;
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine3.12 AS dapper
+FROM golang:1.16-alpine3.12 AS dapper
 
 ARG ARCH=amd64
 
diff --git a/Dockerfile.test.dapper b/Dockerfile.test.dapper
@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine3.12 AS dapper
+FROM golang:1.16-alpine3.12 AS dapper
 
 ARG ARCH=amd64
 
diff --git a/go.mod b/go.mod
@@ -1,17 +1,20 @@
 module github.com/k3s-io/kine
 
-go 1.15
+go 1.16
 
 require (
 	github.com/Rican7/retry v0.1.0
 	github.com/canonical/go-dqlite v1.5.1
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/lib/pq v1.8.0
 	github.com/mattn/go-sqlite3 v1.14.4
-	github.com/pkg/errors v0.8.1
+	github.com/pkg/errors v0.9.1
 	github.com/rancher/wrangler v0.4.0
-	github.com/sirupsen/logrus v1.4.2
+	github.com/sirupsen/logrus v1.6.0
 	github.com/urfave/cli v1.21.0
 	go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
-	google.golang.org/grpc v1.23.1
+	go.etcd.io/etcd/api/v3 v3.5.0
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0
+	go.etcd.io/etcd/client/v3 v3.5.0
+	google.golang.org/grpc v1.38.0
 )
diff --git a/go.sum b/go.sum
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/k3s-io/kine/pkg/endpoint"
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 type Value struct {
diff --git a/pkg/server/compact.go b/pkg/server/compact.go
@@ -3,8 +3,8 @@ package server
 import (
 	"context"
 
-	"go.etcd.io/etcd/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/mvccpb"
 )
 
 func isCompact(txn *etcdserverpb.TxnRequest) bool {
diff --git a/pkg/server/create.go b/pkg/server/create.go
@@ -3,7 +3,7 @@ package server
 import (
 	"context"
 
-	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/etcdserverpb"
 )
 
 func isCreate(txn *etcdserverpb.TxnRequest) *etcdserverpb.PutRequest {
diff --git a/pkg/server/delete.go b/pkg/server/delete.go
@@ -3,7 +3,7 @@ package server
 import (
 	"context"
 
-	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/etcdserverpb"
 )
 
 func isDelete(txn *etcdserverpb.TxnRequest) (int64, string, bool) {
diff --git a/pkg/server/get.go b/pkg/server/get.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/etcdserverpb"
 )
 
 func (l *LimitedServer) get(ctx context.Context, r *etcdserverpb.RangeRequest) (*RangeResponse, error) {
diff --git a/pkg/server/lease.go b/pkg/server/lease.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/etcdserverpb"
 )
 
 func (s *KVServerBridge) LeaseGrant(ctx context.Context, req *etcdserverpb.LeaseGrantRequest) (*etcdserverpb.LeaseGrantResponse, error) {
diff --git a/pkg/server/limited.go b/pkg/server/limited.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/etcdserverpb"
 )
 
 type LimitedServer struct {
diff --git a/pkg/server/list.go b/pkg/server/list.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/etcdserverpb"
 )
 
 func (l *LimitedServer) list(ctx context.Context, r *etcdserverpb.RangeRequest) (*RangeResponse, error) {
diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/sirupsen/logrus"
-	"go.etcd.io/etcd/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/mvccpb"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health"
 	healthpb "google.golang.org/grpc/health/grpc_health_v1"
diff --git a/pkg/server/update.go b/pkg/server/update.go
@@ -3,7 +3,7 @@ package server
 import (
 	"context"
 
-	"go.etcd.io/etcd/etcdserver/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/etcdserverpb"
 )
 
 func isUpdate(txn *etcdserverpb.TxnRequest) (int64, string, []byte, int64, bool) {
diff --git a/pkg/server/watch.go b/pkg/server/watch.go
@@ -6,8 +6,8 @@ import (
 	"sync/atomic"
 
 	"github.com/sirupsen/logrus"
-	"go.etcd.io/etcd/etcdserver/etcdserverpb"
-	"go.etcd.io/etcd/mvcc/mvccpb"
+	"go.etcd.io/etcd/api/v3/etcdserverpb"
+	"go.etcd.io/etcd/api/v3/mvccpb"
 )
 
 var (
diff --git a/pkg/tls/config.go b/pkg/tls/config.go
@@ -3,7 +3,7 @@ package tls
 import (
 	"crypto/tls"
 
-	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/client/pkg/v3/transport"
 )
 
 type Config struct {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.15-alpine3.12 AS dapper`
	`1`	`+FROM golang:1.16-alpine3.12 AS dapper`
`2`	`2`
`3`	`3`	`ARG ARCH=amd64`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"time"`
`8`	`8`
`9`	`9`	`"github.com/k3s-io/kine/pkg/endpoint"`
`10`		`- "go.etcd.io/etcd/clientv3"`
	`10`	`+ clientv3 "go.etcd.io/etcd/client/v3"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type Value struct {`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package server`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- "go.etcd.io/etcd/etcdserver/etcdserverpb"`
`7`		`- "go.etcd.io/etcd/mvcc/mvccpb"`
	`6`	`+ "go.etcd.io/etcd/api/v3/etcdserverpb"`
	`7`	`+ "go.etcd.io/etcd/api/v3/mvccpb"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func isCompact(txn *etcdserverpb.TxnRequest) bool {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package server`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- "go.etcd.io/etcd/etcdserver/etcdserverpb"`
	`6`	`+ "go.etcd.io/etcd/api/v3/etcdserverpb"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func isCreate(txn etcdserverpb.TxnRequest) etcdserverpb.PutRequest {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`	`6`
`7`		`- "go.etcd.io/etcd/etcdserver/etcdserverpb"`
	`7`	`+ "go.etcd.io/etcd/api/v3/etcdserverpb"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func (l LimitedServer) get(ctx context.Context, r etcdserverpb.RangeRequest) (*RangeResponse, error) {`