Replace github.com/coreos/etcd by go.etcd.io/etcd

This commit is contained in:
Wenjia Zhang 2019-10-15 22:38:43 -07:00
parent 05fa6f9e88
commit 3b274fad2a
27 changed files with 51 additions and 51 deletions

View File

@ -26,8 +26,8 @@ import (
"strings" "strings"
"time" "time"
clientv2 "github.com/coreos/etcd/client" clientv2 "go.etcd.io/etcd/client"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"google.golang.org/grpc" "google.golang.org/grpc"
"k8s.io/klog" "k8s.io/klog"
) )

View File

@ -28,7 +28,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/pkg/transport" "go.etcd.io/etcd/pkg/transport"
"github.com/pkg/errors" "github.com/pkg/errors"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"

View File

@ -26,8 +26,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/pkg/transport" "go.etcd.io/etcd/pkg/transport"
"github.com/pkg/errors" "github.com/pkg/errors"
"google.golang.org/grpc" "google.golang.org/grpc"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"

View File

@ -23,8 +23,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/pkg/transport" "go.etcd.io/etcd/pkg/transport"
"google.golang.org/grpc" "google.golang.org/grpc"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"

View File

@ -23,8 +23,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/pkg/transport" "go.etcd.io/etcd/pkg/transport"
"google.golang.org/grpc" "google.golang.org/grpc"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"

View File

@ -26,7 +26,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"

View File

@ -23,8 +23,8 @@ import (
"path" "path"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/pkg/transport" "go.etcd.io/etcd/pkg/transport"
"google.golang.org/grpc" "google.golang.org/grpc"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

View File

@ -22,7 +22,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"k8s.io/klog" "k8s.io/klog"
) )

View File

@ -20,9 +20,9 @@ import (
"context" "context"
"testing" "testing"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
etcdrpc "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" etcdrpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
"github.com/coreos/etcd/integration" "go.etcd.io/etcd/integration"
) )
func TestCompact(t *testing.T) { func TestCompact(t *testing.T) {

View File

@ -19,7 +19,7 @@ package etcd3
import ( import (
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
etcdrpc "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" etcdrpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
) )

View File

@ -18,8 +18,8 @@ package etcd3
import ( import (
"fmt" "fmt"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/mvcc/mvccpb" "go.etcd.io/etcd/mvcc/mvccpb"
) )
type event struct { type event struct {

View File

@ -17,8 +17,8 @@ limitations under the License.
package etcd3 package etcd3
import ( import (
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/mvcc/mvccpb" "go.etcd.io/etcd/mvcc/mvccpb"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"testing" "testing"

View File

@ -21,7 +21,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
) )
// leaseManager is used to manage leases requested from etcd. If a new write // leaseManager is used to manage leases requested from etcd. If a new write

View File

@ -19,7 +19,7 @@ package etcd3
import ( import (
"fmt" "fmt"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"k8s.io/klog" "k8s.io/klog"
) )

View File

@ -28,7 +28,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"

View File

@ -29,8 +29,8 @@ import (
"sync" "sync"
"testing" "testing"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/integration" "go.etcd.io/etcd/integration"
"github.com/coreos/pkg/capnslog" "github.com/coreos/pkg/capnslog"
apitesting "k8s.io/apimachinery/pkg/api/apitesting" apitesting "k8s.io/apimachinery/pkg/api/apitesting"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"

View File

@ -33,15 +33,15 @@ import (
"context" "context"
etcd "github.com/coreos/etcd/client" etcd "go.etcd.io/etcd/client"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/etcdserver" "go.etcd.io/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/etcdhttp" "go.etcd.io/etcd/etcdserver/api/etcdhttp"
"github.com/coreos/etcd/etcdserver/api/v2http" "go.etcd.io/etcd/etcdserver/api/v2http"
"github.com/coreos/etcd/integration" "go.etcd.io/etcd/integration"
"github.com/coreos/etcd/pkg/testutil" "go.etcd.io/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/transport" "go.etcd.io/etcd/pkg/transport"
"github.com/coreos/etcd/pkg/types" "go.etcd.io/etcd/pkg/types"
"k8s.io/klog" "k8s.io/klog"
) )

View File

@ -31,7 +31,7 @@ import (
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
"k8s.io/apiserver/pkg/storage/value" "k8s.io/apiserver/pkg/storage/value"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"k8s.io/klog" "k8s.io/klog"
) )

View File

@ -24,8 +24,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/integration" "go.etcd.io/etcd/integration"
apitesting "k8s.io/apimachinery/pkg/api/apitesting" apitesting "k8s.io/apimachinery/pkg/api/apitesting"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

View File

@ -26,8 +26,8 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/pkg/transport" "go.etcd.io/etcd/pkg/transport"
grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus"
"google.golang.org/grpc" "google.golang.org/grpc"

View File

@ -24,8 +24,8 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/coreos/etcd/integration" "go.etcd.io/etcd/integration"
"github.com/coreos/etcd/pkg/transport" "go.etcd.io/etcd/pkg/transport"
apitesting "k8s.io/apimachinery/pkg/api/apitesting" apitesting "k8s.io/apimachinery/pkg/api/apitesting"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

View File

@ -24,7 +24,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality" apiequality "k8s.io/apimachinery/pkg/api/equality"

View File

@ -27,8 +27,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/clientv3/concurrency" "go.etcd.io/etcd/clientv3/concurrency"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"

View File

@ -28,7 +28,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
"k8s.io/klog" "k8s.io/klog"

View File

@ -29,8 +29,8 @@ import (
"k8s.io/klog" "k8s.io/klog"
"github.com/coreos/etcd/clientv3"
"k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/legacyregistry"
"go.etcd.io/etcd/clientv3"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"

View File

@ -22,7 +22,7 @@ import (
"strings" "strings"
"testing" "testing"
_ "github.com/coreos/etcd/etcdserver/api/v3rpc" // Force package logger init. _ "go.etcd.io/etcd/etcdserver/api/v3rpc" // Force package logger init.
"github.com/coreos/pkg/capnslog" "github.com/coreos/pkg/capnslog"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
@ -231,7 +231,7 @@ func setupWithOptions(t *testing.T, instanceOptions *apitesting.TestServerInstan
// StartTestServerOrDie to work with the etcd instance already started by the // StartTestServerOrDie to work with the etcd instance already started by the
// integration test scripts. // integration test scripts.
// See https://github.com/kubernetes/kubernetes/issues/49489. // See https://github.com/kubernetes/kubernetes/issues/49489.
repo, err := capnslog.GetRepoLogger("github.com/coreos/etcd") repo, err := capnslog.GetRepoLogger("go.etcd.io/etcd")
if err != nil { if err != nil {
t.Fatalf("couldn't configure logging: %v", err) t.Fatalf("couldn't configure logging: %v", err)
} }

View File

@ -28,8 +28,8 @@ import (
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
coreclient "k8s.io/client-go/kubernetes/typed/core/v1" coreclient "k8s.io/client-go/kubernetes/typed/core/v1"
"github.com/coreos/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"github.com/coreos/etcd/pkg/transport" "go.etcd.io/etcd/pkg/transport"
) )
// DeletePodOrErrorf deletes a pod or fails with a call to t.Errorf. // DeletePodOrErrorf deletes a pod or fails with a call to t.Errorf.