From 3b274fad2a719dc1fd0eaef6c55a0d344db10242 Mon Sep 17 00:00:00 2001 From: Wenjia Zhang Date: Tue, 15 Oct 2019 22:38:43 -0700 Subject: [PATCH] Replace github.com/coreos/etcd by go.etcd.io/etcd --- cluster/images/etcd/migrate/migrate_client.go | 4 ++-- .../app/phases/upgrade/staticpods_test.go | 2 +- cmd/kubeadm/app/util/etcd/etcd.go | 4 ++-- .../test/integration/objectmeta_test.go | 4 ++-- .../test/integration/pruning_test.go | 4 ++-- .../test/integration/registration_test.go | 2 +- .../test/integration/storage/objectreader.go | 4 ++-- .../apiserver/pkg/storage/etcd3/compact.go | 2 +- .../pkg/storage/etcd3/compact_test.go | 6 +++--- .../apiserver/pkg/storage/etcd3/errors.go | 2 +- .../apiserver/pkg/storage/etcd3/event.go | 4 ++-- .../apiserver/pkg/storage/etcd3/event_test.go | 4 ++-- .../pkg/storage/etcd3/lease_manager.go | 2 +- .../apiserver/pkg/storage/etcd3/logger.go | 2 +- .../apiserver/pkg/storage/etcd3/store.go | 2 +- .../apiserver/pkg/storage/etcd3/store_test.go | 4 ++-- .../pkg/storage/etcd3/testing/test_server.go | 18 +++++++++--------- .../apiserver/pkg/storage/etcd3/watcher.go | 2 +- .../pkg/storage/etcd3/watcher_test.go | 4 ++-- .../storage/storagebackend/factory/etcd3.go | 4 ++-- .../storage/storagebackend/factory/tls_test.go | 4 ++-- .../integration/etcd/etcd_storage_path_test.go | 2 +- test/integration/etcd/server.go | 4 ++-- test/integration/framework/etcd.go | 2 +- .../master/transformation_testcase.go | 2 +- test/integration/scale/scale_test.go | 4 ++-- test/integration/utils.go | 4 ++-- 27 files changed, 51 insertions(+), 51 deletions(-) diff --git a/cluster/images/etcd/migrate/migrate_client.go b/cluster/images/etcd/migrate/migrate_client.go index cc903a7bb1e..f90b26dae9e 100644 --- a/cluster/images/etcd/migrate/migrate_client.go +++ b/cluster/images/etcd/migrate/migrate_client.go @@ -26,8 +26,8 @@ import ( "strings" "time" - clientv2 "github.com/coreos/etcd/client" - "github.com/coreos/etcd/clientv3" + clientv2 "go.etcd.io/etcd/client" + "go.etcd.io/etcd/clientv3" "google.golang.org/grpc" "k8s.io/klog" ) diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go index 902413c772c..6955dcb6a8f 100644 --- a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go +++ b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/transport" "github.com/pkg/errors" "k8s.io/client-go/tools/clientcmd" diff --git a/cmd/kubeadm/app/util/etcd/etcd.go b/cmd/kubeadm/app/util/etcd/etcd.go index ed9e0302768..974b453bf4e 100644 --- a/cmd/kubeadm/app/util/etcd/etcd.go +++ b/cmd/kubeadm/app/util/etcd/etcd.go @@ -26,8 +26,8 @@ import ( "strings" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/transport" "github.com/pkg/errors" "google.golang.org/grpc" "k8s.io/apimachinery/pkg/util/wait" diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/objectmeta_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/objectmeta_test.go index a5e0f2a6729..348534b384b 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/objectmeta_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/objectmeta_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/transport" "google.golang.org/grpc" "sigs.k8s.io/yaml" diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/pruning_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/pruning_test.go index a33e2b0a81a..fd6ad92a2a4 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/pruning_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/pruning_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/transport" "google.golang.org/grpc" "sigs.k8s.io/yaml" diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go index 2523210c811..d7ce6cf6713 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/storage/objectreader.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/storage/objectreader.go index e8449c0d904..6024e493b25 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/storage/objectreader.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/storage/objectreader.go @@ -23,8 +23,8 @@ import ( "path" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/transport" "google.golang.org/grpc" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact.go index d4524f49221..bbae59153bf 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "k8s.io/klog" ) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact_test.go index 72f21437d0b..134ce8878bb 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" - "github.com/coreos/etcd/clientv3" - etcdrpc "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" + "go.etcd.io/etcd/clientv3" + etcdrpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + "go.etcd.io/etcd/integration" ) func TestCompact(t *testing.T) { diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/errors.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/errors.go index 136570a6fc3..b33751480a1 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/errors.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/errors.go @@ -19,7 +19,7 @@ package etcd3 import ( "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" ) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event.go index dbaf785b261..c4e1f8032b0 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event.go @@ -18,8 +18,8 @@ package etcd3 import ( "fmt" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" ) type event struct { diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event_test.go index 0bbcac32960..18b41242c8e 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event_test.go @@ -17,8 +17,8 @@ limitations under the License. package etcd3 import ( - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/mvcc/mvccpb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/lease_manager.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/lease_manager.go index e7e554c6270..6b5a5700a9e 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/lease_manager.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/lease_manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" ) // leaseManager is used to manage leases requested from etcd. If a new write diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/logger.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/logger.go index a117db6fe26..f2cf0e1b26c 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/logger.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/logger.go @@ -19,7 +19,7 @@ package etcd3 import ( "fmt" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "k8s.io/klog" ) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go index 7a99c2a5cd2..a90675784a2 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go index d6e5cfe0de1..4c17dc258d9 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go @@ -29,8 +29,8 @@ import ( "sync" "testing" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/integration" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/integration" "github.com/coreos/pkg/capnslog" apitesting "k8s.io/apimachinery/pkg/api/apitesting" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/testing/test_server.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/testing/test_server.go index 7ac487f3dde..7464ff02d78 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/testing/test_server.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/testing/test_server.go @@ -33,15 +33,15 @@ import ( "context" - etcd "github.com/coreos/etcd/client" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/v2http" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" + etcd "go.etcd.io/etcd/client" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/etcdserver" + "go.etcd.io/etcd/etcdserver/api/etcdhttp" + "go.etcd.io/etcd/etcdserver/api/v2http" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/testutil" + "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/pkg/types" "k8s.io/klog" ) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go index f2b16f3bd75..a66c9eb9e4e 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go @@ -31,7 +31,7 @@ import ( "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/value" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "k8s.io/klog" ) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go index 243eebc9b9a..1f2dca8ebf2 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/integration" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/integration" apitesting "k8s.io/apimachinery/pkg/api/apitesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go index 1bf69861e04..b4a3800697c 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/transport" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "google.golang.org/grpc" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go index 32b7b5cab18..40271f07cc4 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/integration" + "go.etcd.io/etcd/pkg/transport" apitesting "k8s.io/apimachinery/pkg/api/apitesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/integration/etcd/etcd_storage_path_test.go b/test/integration/etcd/etcd_storage_path_test.go index 50a5b4ca101..a9f160bdb08 100644 --- a/test/integration/etcd/etcd_storage_path_test.go +++ b/test/integration/etcd/etcd_storage_path_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" diff --git a/test/integration/etcd/server.go b/test/integration/etcd/server.go index 1ab178ae0c7..29f0a1c9ba8 100644 --- a/test/integration/etcd/server.go +++ b/test/integration/etcd/server.go @@ -27,8 +27,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/clientv3/concurrency" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" diff --git a/test/integration/framework/etcd.go b/test/integration/framework/etcd.go index bf09d24b995..e261f88f0f4 100644 --- a/test/integration/framework/etcd.go +++ b/test/integration/framework/etcd.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/clientv3" + "go.etcd.io/etcd/clientv3" "google.golang.org/grpc/grpclog" "k8s.io/klog" diff --git a/test/integration/master/transformation_testcase.go b/test/integration/master/transformation_testcase.go index d43e5651046..52659d554a0 100644 --- a/test/integration/master/transformation_testcase.go +++ b/test/integration/master/transformation_testcase.go @@ -29,8 +29,8 @@ import ( "k8s.io/klog" - "github.com/coreos/etcd/clientv3" "k8s.io/component-base/metrics/legacyregistry" + "go.etcd.io/etcd/clientv3" "sigs.k8s.io/yaml" corev1 "k8s.io/api/core/v1" diff --git a/test/integration/scale/scale_test.go b/test/integration/scale/scale_test.go index a463ca8c539..6955baefc52 100644 --- a/test/integration/scale/scale_test.go +++ b/test/integration/scale/scale_test.go @@ -22,7 +22,7 @@ import ( "strings" "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" 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 // integration test scripts. // 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 { t.Fatalf("couldn't configure logging: %v", err) } diff --git a/test/integration/utils.go b/test/integration/utils.go index 276333d5b7a..c449a77ce4f 100644 --- a/test/integration/utils.go +++ b/test/integration/utils.go @@ -28,8 +28,8 @@ import ( clientset "k8s.io/client-go/kubernetes" coreclient "k8s.io/client-go/kubernetes/typed/core/v1" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/transport" + "go.etcd.io/etcd/clientv3" + "go.etcd.io/etcd/pkg/transport" ) // DeletePodOrErrorf deletes a pod or fails with a call to t.Errorf.