Skip to content
This repository has been archived by the owner on Jun 21, 2022. It is now read-only.

Commit

Permalink
addresses etcd move to CNCF
Browse files Browse the repository at this point in the history
  • Loading branch information
mhausenblas committed Dec 6, 2018
1 parent 365ab61 commit 1e0113c
Show file tree
Hide file tree
Showing 11 changed files with 277 additions and 93 deletions.
297 changes: 222 additions & 75 deletions Gopkg.lock

Large diffs are not rendered by default.

42 changes: 39 additions & 3 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,47 @@
[[constraint]]
name = "github.com/Sirupsen/logrus"
version = "1.0.0"
version = "1.2.0"

[[constraint]]
name = "github.com/gorilla/mux"
version = "1.4.0"
version = "1.6.2"

[[constraint]]
name = "github.com/minio/minio-go"
version = "2.1.0"
version = "3.0.0"

[[constraint]]
name = "github.com/mitchellh/go-homedir"
version = "1.0.0"

[[constraint]]
branch = "master"
name = "github.com/pierrre/archivefile"

[[constraint]]
name = "github.com/prometheus/client_golang"
version = "0.9.1"

[[constraint]]
name = "github.com/spf13/cobra"
version = "0.0.3"

[[constraint]]
name = "github.com/spf13/viper"
version = "1.3.0"

[[constraint]]
name = "go.etcd.io/etcd"
version = "3.3.10"

[[constraint]]
branch = "master"
name = "golang.org/x/net"

[[constraint]]
name = "google.golang.org/grpc"
version = "1.17.0"

[prune]
go-tests = true
unused-packages = true
4 changes: 2 additions & 2 deletions pkg/backup/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"time"

log "github.com/Sirupsen/logrus"
"github.com/coreos/etcd/client"
"github.com/coreos/etcd/clientv3"
"github.com/mhausenblas/reshifter/pkg/discovery"
"github.com/mhausenblas/reshifter/pkg/remotes"
"github.com/mhausenblas/reshifter/pkg/types"
"github.com/mhausenblas/reshifter/pkg/util"
"go.etcd.io/etcd/client"
"go.etcd.io/etcd/clientv3"
)

// Backup iterates over well-known Kubernetes (distro) keys in an etcd server
Expand Down
6 changes: 3 additions & 3 deletions pkg/backup/backup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import (
"context"
"fmt"
"io/ioutil"
"math/rand"
"os"
"path/filepath"
"strings"
"testing"
"math/rand"
"time"

"github.com/coreos/etcd/client"
"github.com/mhausenblas/reshifter/pkg/types"
"github.com/mhausenblas/reshifter/pkg/util"
"go.etcd.io/etcd/client"
)

var (
Expand Down Expand Up @@ -327,4 +327,4 @@ func generateRandomString(n int) string {
}

return string(b)
}
}
2 changes: 1 addition & 1 deletion pkg/discovery/discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"net/url"

log "github.com/Sirupsen/logrus"
"github.com/coreos/etcd/client"
"github.com/mhausenblas/reshifter/pkg/types"
"github.com/mhausenblas/reshifter/pkg/util"
"go.etcd.io/etcd/client"
)

// ProbeEtcd probes an endpoint at path /version to figure
Expand Down
2 changes: 1 addition & 1 deletion pkg/discovery/discovery_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"testing"
"time"

"github.com/coreos/etcd/client"
"github.com/mhausenblas/reshifter/pkg/types"
"github.com/mhausenblas/reshifter/pkg/util"
"go.etcd.io/etcd/client"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions pkg/discovery/visitors.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"os"

log "github.com/Sirupsen/logrus"
"github.com/coreos/etcd/client"
"github.com/coreos/etcd/clientv3"
"github.com/mhausenblas/reshifter/pkg/types"
"go.etcd.io/etcd/client"
"go.etcd.io/etcd/clientv3"
"golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/restore/restore.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"time"

log "github.com/Sirupsen/logrus"
"github.com/coreos/etcd/client"
"github.com/mhausenblas/reshifter/pkg/discovery"
"github.com/mhausenblas/reshifter/pkg/types"
"github.com/mhausenblas/reshifter/pkg/util"
"github.com/pierrre/archivefile/zip"
"go.etcd.io/etcd/client"
)

// Restore takes a backup ID and unpacks it into the target directory.
Expand Down
2 changes: 1 addition & 1 deletion pkg/restore/restore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"os"
"testing"

"github.com/coreos/etcd/client"
"github.com/mhausenblas/reshifter/pkg/backup"
"github.com/mhausenblas/reshifter/pkg/types"
"github.com/mhausenblas/reshifter/pkg/util"
"go.etcd.io/etcd/client"
)

func TestRestorev2(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/etcd2.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"net/http"
"time"

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

// NewClient2 creates an etcd2 client, optionally using SSL/TLS if secure is true.
Expand Down
7 changes: 4 additions & 3 deletions pkg/util/etcd3.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import (
"fmt"
"time"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/pkg/transport"
"google.golang.org/grpc"
"math"

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

// maxMsgSize use 200MB as the default message size limit.
Expand Down

0 comments on commit 1e0113c

Please sign in to comment.