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 to etcd/client/v3 #12

Open
wants to merge 7 commits into
base: flatcar-master
Choose a base branch
from
Open

upgrade to etcd/client/v3 #12

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eeff4cd
vendor: go mod vendor
Aug 4, 2021
84b96f5
sum: go mod tidy
Aug 4, 2021
0bec1d8
mod: upgrade to etcd/client/v3
Aug 4, 2021
7df0fdc
lock/etcd: port to etcd/v3
Aug 13, 2021
cbcacee
locksmithcl: configure client
Aug 13, 2021
bbd12cd
locksmithcl/locksmithcl: fix `defaultEnpoints`
Aug 16, 2021
a229739
lock/etcd_test: rewrite tests using etcd/v3
Aug 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 6 additions & 13 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@ module github.com/flatcar-linux/locksmith
go 1.14

require (
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
github.com/godbus/dbus v4.1.0+incompatible // indirect
github.com/godbus/dbus/v5 v5.0.3
github.com/gogo/protobuf v1.3.1 // indirect
github.com/godbus/dbus/v5 v5.0.4
Copy link
Member

Choose a reason for hiding this comment

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

Note: dbus lib has also been updated here.

github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/rkt/rkt v1.30.0
go.etcd.io/etcd v0.0.0-00010101000000-000000000000
go.uber.org/zap v1.16.0 // indirect
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102
google.golang.org/grpc v1.33.2 // indirect
go.etcd.io/etcd/api/v3 v3.5.0
go.etcd.io/etcd/client/v3 v3.5.0
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
)

replace (
// Force updating etcd to most recent version.
go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b
// Most recent etcd version is not compatible with grpc v1.31.x.
google.golang.org/grpc => google.golang.org/grpc v1.29.1
)
// Most recent etcd version is not compatible with grpc v1.31.x.
replace google.golang.org/grpc => google.golang.org/grpc v1.29.1
Copy link
Member

Choose a reason for hiding this comment

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

It seems this can be dropped. v3.5.0 use grpc v1.38.0: https://github.com/etcd-io/etcd/blob/946a5a6f25c3b6b89408ab447852731bde6e6289/go.mod#L35

257 changes: 138 additions & 119 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

191 changes: 191 additions & 0 deletions vendor/github.com/coreos/go-systemd/v22/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/go.etcd.io/etcd/NOTICE → ...r/github.com/coreos/go-systemd/v22/NOTICE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions vendor/github.com/coreos/go-systemd/v22/journal/journal.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading