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

Upgrade etcd to 3.4.7 #2090

Merged
merged 6 commits into from
Apr 30, 2020
Merged

Upgrade etcd to 3.4.7 #2090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0455cfc
go get go.etcd.io/[email protected]
gdbelvin Apr 24, 2020
88844fe
go mod tidy
gdbelvin Apr 24, 2020
7bb3064
s|github.com/coreos/etcd/clientv3|go.etcd.io/etcd/clientv3|g
gdbelvin Apr 24, 2020
f40b566
Test CT with pinned Trillian version
gdbelvin Apr 24, 2020
50f76f0
go get go.etcd.io/[email protected]
gdbelvin Apr 24, 2020
496963f
Set logger to zap
gdbelvin Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
git clone --depth=1 https://github.com/google/certificate-transparency-go.git "$GOPATH/src/github.com/google/certificate-transparency-go"
(
cd "$GOPATH/src/github.com/google/certificate-transparency-go"
echo "replace github.com/google/trillian => $TRILLIAN_DIR" >> go.mod
# echo "replace github.com/google/trillian => $TRILLIAN_DIR" >> go.mod
chmod +x ./trillian/integration/integration_test.sh
./trillian/integration/integration_test.sh
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/internal/serverutil/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"net/http"
"time"

"github.com/coreos/etcd/clientv3"
"github.com/golang/glog"
"github.com/google/trillian"
"github.com/google/trillian/extension"
Expand All @@ -31,13 +30,14 @@ import (
"github.com/google/trillian/util"
"github.com/google/trillian/util/clock"
"github.com/prometheus/client_golang/prometheus/promhttp"
"go.etcd.io/etcd/clientv3"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/naming"
"google.golang.org/grpc/reflection"

etcdnaming "github.com/coreos/etcd/clientv3/naming"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
etcdnaming "go.etcd.io/etcd/clientv3/naming"
)

const (
Expand Down
17 changes: 9 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ require (
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/aws/aws-sdk-go v1.25.37 // indirect
github.com/coreos/bbolt v1.3.3 // indirect
github.com/coreos/etcd v3.3.18+incompatible
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/emicklei/proto v1.8.0 // indirect
github.com/fatih/color v1.7.0 // indirect
github.com/go-redis/redis v6.15.7+incompatible
github.com/go-sql-driver/mysql v1.5.0
github.com/gogo/protobuf v1.3.1 // indirect
Expand All @@ -26,7 +26,7 @@ require (
github.com/golang/mock v1.4.3
github.com/golang/protobuf v1.3.2
github.com/google/btree v1.0.0
github.com/google/certificate-transparency-go v1.1.0
github.com/google/certificate-transparency-go v1.0.21
github.com/google/go-cmp v0.4.0
github.com/google/uuid v1.1.1 // indirect
github.com/gorilla/websocket v1.4.1 // indirect
Expand All @@ -52,22 +52,23 @@ require (
github.com/prometheus/client_golang v1.5.1
github.com/prometheus/client_model v0.2.0
github.com/pseudomuto/protoc-gen-doc v1.3.1
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
github.com/uber/prototool v1.9.0
github.com/urfave/cli v1.22.1 // indirect
go.etcd.io/bbolt v1.3.3 // indirect
go.etcd.io/etcd v3.3.18+incompatible
go.etcd.io/bbolt v1.3.4 // indirect
go.etcd.io/etcd v0.0.0-20200401174654-e694b7bb0875
go.opencensus.io v0.22.3
go.uber.org/multierr v1.4.0 // indirect
go.uber.org/zap v1.13.0 // indirect
golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f
golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914 // indirect
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/genproto v0.0.0-20191115221424-83cc0476cb11
google.golang.org/grpc v1.25.1
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
gopkg.in/yaml.v2 v2.2.6 // indirect
sigs.k8s.io/yaml v1.1.0 // indirect
)
188 changes: 30 additions & 158 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions monitoring/prometheus/etcdiscover/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
"sync"
"time"

"github.com/coreos/etcd/clientv3"
etcdnaming "github.com/coreos/etcd/clientv3/naming"
"github.com/golang/glog"
"github.com/google/trillian/util"
"go.etcd.io/etcd/clientv3"
etcdnaming "go.etcd.io/etcd/clientv3/naming"
"google.golang.org/grpc/naming"
)

Expand Down
2 changes: 1 addition & 1 deletion quota/etcd/etcdqm/etcdqm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"context"
"fmt"

"github.com/coreos/etcd/clientv3"
"github.com/google/trillian/quota"
"github.com/google/trillian/quota/etcd/storage"
"go.etcd.io/etcd/clientv3"
)

type manager struct {
Expand Down
2 changes: 1 addition & 1 deletion quota/etcd/etcdqm/etcdqm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (
"os"
"testing"

"github.com/coreos/etcd/clientv3"
"github.com/golang/protobuf/proto"
"github.com/google/trillian/quota"
"github.com/google/trillian/quota/etcd/storage"
"github.com/google/trillian/quota/etcd/storagepb"
"github.com/google/trillian/testonly/integration/etcd"
"github.com/kylelemons/godebug/pretty"
"go.etcd.io/etcd/clientv3"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion quota/etcd/quotaapi/quota_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ package quotaapi
import (
"context"

"github.com/coreos/etcd/clientv3"
"github.com/golang/glog"
"github.com/golang/protobuf/ptypes/empty"
"github.com/google/trillian/quota/etcd/quotapb"
"github.com/google/trillian/quota/etcd/storage"
"github.com/google/trillian/quota/etcd/storagepb"
"go.etcd.io/etcd/clientv3"
"google.golang.org/genproto/protobuf/field_mask"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand Down
2 changes: 1 addition & 1 deletion quota/etcd/quotaapi/quota_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"sync"
"testing"

"github.com/coreos/etcd/clientv3"
"github.com/golang/protobuf/proto"
"github.com/google/go-cmp/cmp"
"github.com/google/trillian/quota"
Expand All @@ -34,6 +33,7 @@ import (
"github.com/google/trillian/quota/etcd/storagepb"
"github.com/google/trillian/server/interceptor"
"github.com/google/trillian/testonly/integration/etcd"
"go.etcd.io/etcd/clientv3"
"google.golang.org/genproto/protobuf/field_mask"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down
4 changes: 2 additions & 2 deletions quota/etcd/storage/quota_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import (
"strings"
"time"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/clientv3/concurrency"
"github.com/golang/glog"
"github.com/golang/protobuf/proto"
"github.com/google/trillian/quota"
"github.com/google/trillian/quota/etcd/storagepb"
"github.com/google/trillian/util/clock"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/concurrency"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
Expand Down
2 changes: 1 addition & 1 deletion quota/etcd/storage/quota_storage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import (
"testing"
"time"

"github.com/coreos/etcd/clientv3"
"github.com/golang/protobuf/proto"
"github.com/google/trillian/quota"
"github.com/google/trillian/quota/etcd/storagepb"
"github.com/google/trillian/testonly/integration/etcd"
"github.com/google/trillian/util/clock"
"github.com/kylelemons/godebug/pretty"
"go.etcd.io/etcd/clientv3"
)

const (
Expand Down
5 changes: 3 additions & 2 deletions testonly/integration/etcd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"strings"
"time"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/embed"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/embed"
)

const (
Expand Down Expand Up @@ -119,6 +119,7 @@ func tryStartEtcd(dir string) (*embed.Etcd, error) {
cfg.LPUrls = []url.URL{*peerURL} // listen peer URLS
cfg.APUrls = []url.URL{*peerURL} // advertise peer URLS
cfg.InitialCluster = fmt.Sprintf("default=%v", peerURL)
cfg.Logger = "zap"

return embed.StartEtcd(cfg)
}
4 changes: 2 additions & 2 deletions util/election2/etcd/election.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"fmt"
"strings"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/clientv3/concurrency"
"github.com/golang/glog"
"github.com/google/trillian/util/election2"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/concurrency"
)

const resignID = "<resign>"
Expand Down
2 changes: 1 addition & 1 deletion util/etcd/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"strings"
"time"

"github.com/coreos/etcd/clientv3"
"go.etcd.io/etcd/clientv3"
)

// NewClient returns an etcd Client connecting to the passed in servers'
Expand Down