Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade etcd to 3.5 #1067

Closed
wants to merge 3 commits into from
Closed

Upgrade etcd to 3.5 #1067

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b79a9b
upgrade etcd libraries
sagikazarmark Mar 6, 2021
56b79f1
upgrade etcd to 3.5-beta.4
sagikazarmark May 28, 2021
ff0f483
Merge branch 'master' into etcd-client-upgrade
peterbourgon May 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 10 additions & 7 deletions go.mod
View file
Open in desktop
Expand Up @@ -21,7 +21,8 @@ require (
github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 // indirect
github.com/go-logfmt/logfmt v0.5.0
github.com/go-stack/stack v1.8.0
github.com/golang/protobuf v1.3.2
github.com/golang/protobuf v1.5.2
github.com/google/btree v1.0.0 // indirect
github.com/gorilla/mux v1.7.3
github.com/hashicorp/consul/api v1.3.0
github.com/hashicorp/go-version v1.2.0 // indirect
Expand All @@ -42,20 +43,22 @@ require (
github.com/pborman/uuid v1.2.0
github.com/performancecopilot/speed v3.0.0+incompatible
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v1.3.0
github.com/prometheus/client_golang v1.5.1
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da
github.com/sirupsen/logrus v1.4.2
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/sony/gobreaker v0.4.1
github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271
github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
go.etcd.io/etcd/client/pkg/v3 v3.5.0-beta.4
go.etcd.io/etcd/client/v2 v2.305.0-beta.4
go.etcd.io/etcd/client/v3 v3.5.0-beta.4
Comment on lines -52 to +55
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't say I understand why all of these are here. Maybe a quick summary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go.etcd.io/etcd/client/v2: used by sd/etcd (v2 client became a separate module)
go.etcd.io/etcd/client/v3: used by sd/etcdv3
go.etcd.io/etcd/client/pkg/v3: some common client code has been extracted to separate a pkg module (go-kit uses the transport package from there)

etcd decided to slice up the project into smaller modules.

Does that help?

go.opencensus.io v0.22.3
go.uber.org/zap v1.13.0
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
go.uber.org/zap v1.16.1-0.20210329175301-c23abee72d19
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
golang.org/x/tools v0.0.0-20200103221440-774c71fcf114
google.golang.org/grpc v1.26.0
golang.org/x/tools v0.0.0-20210106214847-113979e3529a
google.golang.org/grpc v1.37.0
gopkg.in/gcfg.v1 v1.2.3 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0
Expand Down
224 changes: 117 additions & 107 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sd/etcd/client.go
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ import (
"net/http"
"time"

etcd "go.etcd.io/etcd/client"
etcd "go.etcd.io/etcd/client/v2"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions sd/etcd/client_test.go
View file
Open in desktop
@@ -1,13 +1,13 @@
package etcd

import (
"context"
"errors"
"reflect"
"testing"
"time"
"context"

etcd "go.etcd.io/etcd/client"
etcd "go.etcd.io/etcd/client/v2"
)

func TestNewClient(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion sd/etcd/instancer_test.go
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"testing"

stdetcd "go.etcd.io/etcd/client"
stdetcd "go.etcd.io/etcd/client/v2"

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/sd"
Expand Down
2 changes: 1 addition & 1 deletion sd/etcd/registrar.go
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ import (
"sync"
"time"

etcd "go.etcd.io/etcd/client"
etcd "go.etcd.io/etcd/client/v2"

"github.com/go-kit/kit/log"
)
Expand Down
4 changes: 2 additions & 2 deletions sd/etcdv3/client.go
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@ import (
"errors"
"time"

"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/pkg/transport"
"go.etcd.io/etcd/client/pkg/v3/transport"
clientv3 "go.etcd.io/etcd/client/v3"
"google.golang.org/grpc"
)

Expand Down