github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/images/etcd/migrate/migrate_client.go
View File

@ -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"
)

2
cmd/kubeadm/app/phases/upgrade/staticpods_test.go
View File

@ -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"

4
cmd/kubeadm/app/util/etcd/etcd.go
View File

@ -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"

4
staging/src/k8s.io/apiextensions-apiserver/test/integration/objectmeta_test.go
View File

@ -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"

4
staging/src/k8s.io/apiextensions-apiserver/test/integration/pruning_test.go
View File

@ -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"

2
staging/src/k8s.io/apiextensions-apiserver/test/integration/registration_test.go
View File

@ -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"

4
staging/src/k8s.io/apiextensions-apiserver/test/integration/storage/objectreader.go
View File

@ -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"

2
staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact.go
View File

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

6
staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact_test.go
View File

@ -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) {

2
staging/src/k8s.io/apiserver/pkg/storage/etcd3/errors.go
View File

@ -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"
)

4
staging/src/k8s.io/apiserver/pkg/storage/etcd3/event.go
View File

@ -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 {

4
staging/src/k8s.io/apiserver/pkg/storage/etcd3/event_test.go
View File

@ -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"

2
staging/src/k8s.io/apiserver/pkg/storage/etcd3/lease_manager.go
View File

@ -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

2
staging/src/k8s.io/apiserver/pkg/storage/etcd3/logger.go
View File

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

2
staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
View File

@ -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"

4
staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go
View File

@ -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"

18
staging/src/k8s.io/apiserver/pkg/storage/etcd3/testing/test_server.go
View File

@ -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"
)

2
staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go
View File

@ -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"
)

4
staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go
View File

@ -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"

4
staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go
View File

@ -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"

4
staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go
View File

@ -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"

2
test/integration/etcd/etcd_storage_path_test.go
View File

@ -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"

4
test/integration/etcd/server.go
View File

@ -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"

2
test/integration/framework/etcd.go
View File

@ -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"

2
test/integration/master/transformation_testcase.go
View File

@ -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"

4
test/integration/scale/scale_test.go
View File

@ -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)
}

4
test/integration/utils.go
View File

@ -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.