Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
  •  
  •  
  •  
34 changes: 17 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
module github.com/flatcar/locksmith

go 1.14
go 1.26.0

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/hashicorp/errwrap v1.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2
github.com/coreos/pkg v0.0.0-20240122114842-bbd7aa9bf6fb
github.com/godbus/dbus/v5 v5.2.2
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.33.0
google.golang.org/grpc v1.33.2 // indirect
go.etcd.io/etcd/client/v2 v2.305.33
)

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
require (
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
go.etcd.io/etcd/api/v3 v3.5.33 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.33 // indirect
golang.org/x/sys v0.48.0 // indirect
)
298 changes: 29 additions & 269 deletions go.sum

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions lock/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@
package lock

import (
"context"
"encoding/json"
"errors"
"net/url"
"path"

"go.etcd.io/etcd/client"

"golang.org/x/net/context"
"go.etcd.io/etcd/client/v2"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions lock/etcd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
package lock

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

"go.etcd.io/etcd/client"
"golang.org/x/net/context"
"go.etcd.io/etcd/client/v2"
)

type testEtcdClient struct {
Expand Down
2 changes: 1 addition & 1 deletion locksmithctl/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"syscall"
"time"

"github.com/coreos/go-systemd/login1"
"github.com/coreos/go-systemd/v22/login1"
"github.com/coreos/pkg/capnslog"

"github.com/flatcar/locksmith/lock"
Expand Down
4 changes: 2 additions & 2 deletions locksmithctl/locksmithctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/flatcar/locksmith/lock"
"github.com/flatcar/locksmith/version"

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

const (
Expand Down Expand Up @@ -223,7 +223,7 @@ func getClient() (*lock.EtcdLockClient, error) {
// It has been shown in the CI (cl.locksmith.cluster) that etcd/v2 recent upgrade has broke the resiliency
// of the endpoint.
// It can be safely removed once the `etcd` V3 upgrade done.
// More details https://github.com/flatcar-archive/coreos-overlay/pull/1161#issuecomment-891906580
// More details https://github.com/flatcar-archive/coreos-overlay/pull/1161#issuecomment-891906580
for _, ep := range globalFlags.Endpoints {
cfg := client.Config{
Endpoints: []string{ep},
Expand Down
2 changes: 1 addition & 1 deletion locksmithctl/reboot.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"
"os"

"github.com/coreos/go-systemd/login1"
"github.com/coreos/go-systemd/v22/login1"
"github.com/flatcar/locksmith/lock"
"github.com/flatcar/locksmith/pkg/machineid"
)
Expand Down
191 changes: 191 additions & 0 deletions vendor/github.com/coreos/go-systemd/v22/LICENSE

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

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

Loading
Loading