MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-10 05:59:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: move to new etcd imports (#12391)

Browse Source
This commit is contained in:
Harshavardhana
2021-05-28 10:31:42 -07:00
committed by GitHub
parent 62b6615a2a
commit fa8e3151bc
10 changed files with 43 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/config-encrypted.go
View File

@@ -29,7 +29,7 @@ import (
"github.com/minio/minio/cmd/config"
"github.com/minio/minio/cmd/logger"
"github.com/minio/minio/pkg/kms"
etcd "go.etcd.io/etcd/clientv3"
etcd "go.etcd.io/etcd/client/v3"
)
func handleEncryptedConfigBackend(objAPI ObjectLayer) error {

2
cmd/config/dns/etcd_dns.go
View File

@@ -29,7 +29,7 @@ import (
"github.com/coredns/coredns/plugin/etcd/msg"
"github.com/minio/minio-go/v7/pkg/set"
"go.etcd.io/etcd/clientv3"
clientv3 "go.etcd.io/etcd/client/v3"
)
// ErrNoEntriesFound - Indicates no entries were found for the given key (directory)

4
cmd/config/etcd/etcd.go
View File

@@ -26,8 +26,8 @@ import (
"github.com/minio/minio/cmd/config"
"github.com/minio/minio/pkg/env"
xnet "github.com/minio/minio/pkg/net"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/namespace"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/namespace"
"go.uber.org/zap"
)

2
cmd/etcd.go
View File

@@ -22,7 +22,7 @@ import (
"errors"
"fmt"
etcd "go.etcd.io/etcd/clientv3"
etcd "go.etcd.io/etcd/client/v3"
)
var errEtcdUnreachable = errors.New("etcd is unreachable, please check your endpoints")

2
cmd/globals.go
View File

@@ -40,7 +40,7 @@ import (
"github.com/minio/minio/cmd/config/storageclass"
xhttp "github.com/minio/minio/cmd/http"
"github.com/minio/minio/pkg/auth"
etcd "go.etcd.io/etcd/clientv3"
etcd "go.etcd.io/etcd/client/v3"
"github.com/minio/minio/pkg/certs"
"github.com/minio/minio/pkg/event"

4
cmd/iam-etcd-store.go
View File

@@ -35,8 +35,8 @@ import (
"github.com/minio/minio/pkg/auth"
iampolicy "github.com/minio/minio/pkg/iam/policy"
"github.com/minio/minio/pkg/kms"
etcd "go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/mvcc/mvccpb"
"go.etcd.io/etcd/api/v3/mvccpb"
etcd "go.etcd.io/etcd/client/v3"
)
var defaultContextTimeout = 30 * time.Second