From 2979c3325e3ac4023dd19c435f3a995074328751 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 23 Mar 2021 11:01:52 -0400 Subject: [PATCH] Switch to go.etcd.io/etcd/client/v3 --- cluster/images/etcd/migrate/migrate_client.go | 2 +- cmd/kube-apiserver/app/testing/testserver.go | 4 ++-- .../app/phases/upgrade/staticpods_test.go | 2 +- cmd/kubeadm/app/util/etcd/etcd.go | 4 ++-- .../test/integration/fixtures/etcd.go | 2 +- .../test/integration/fixtures/server.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 | 8 ++++--- .../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 | 20 ++++++++++++++---- .../pkg/storage/etcd3/testing/test_server.go | 5 +++-- .../apiserver/pkg/storage/etcd3/watcher.go | 2 +- .../pkg/storage/etcd3/watcher_test.go | 6 ++++-- .../storage/storagebackend/factory/etcd3.go | 4 ++-- .../storagebackend/factory/tls_test.go | 5 +++-- .../admissionwebhook/admission_test.go | 2 +- .../apiserver/apply/apply_crd_test.go | 4 ++-- .../etcd/etcd_storage_path_test.go | 2 +- test/integration/etcd/server.go | 4 ++-- test/integration/framework/etcd.go | 1 - .../master/transformation_testcase.go | 2 +- test/integration/scale/scale_test.go | 21 +++++-------------- test/integration/utils.go | 4 ++-- 32 files changed, 73 insertions(+), 67 deletions(-) diff --git a/cluster/images/etcd/migrate/migrate_client.go b/cluster/images/etcd/migrate/migrate_client.go index f3283f4d3eb..229356b2715 100644 --- a/cluster/images/etcd/migrate/migrate_client.go +++ b/cluster/images/etcd/migrate/migrate_client.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "go.etcd.io/etcd/clientv3" + clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" "k8s.io/klog/v2" ) diff --git a/cmd/kube-apiserver/app/testing/testserver.go b/cmd/kube-apiserver/app/testing/testserver.go index 672031f3202..f933fc0c877 100644 --- a/cmd/kube-apiserver/app/testing/testserver.go +++ b/cmd/kube-apiserver/app/testing/testserver.go @@ -28,8 +28,8 @@ import ( "time" "github.com/spf13/pflag" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/client/pkg/v3/transport" + clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" "k8s.io/apimachinery/pkg/api/errors" diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go index 88d8d795a11..e8a595cc4f4 100644 --- a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go +++ b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go @@ -29,7 +29,7 @@ import ( "time" "github.com/pkg/errors" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/client/pkg/v3/transport" "k8s.io/client-go/tools/clientcmd" certutil "k8s.io/client-go/util/cert" diff --git a/cmd/kubeadm/app/util/etcd/etcd.go b/cmd/kubeadm/app/util/etcd/etcd.go index 75bb96bb9de..f052823adc9 100644 --- a/cmd/kubeadm/app/util/etcd/etcd.go +++ b/cmd/kubeadm/app/util/etcd/etcd.go @@ -28,8 +28,8 @@ import ( "time" "github.com/pkg/errors" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/client/pkg/v3/transport" + clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/etcd.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/etcd.go index 9a0ac5138de..b04d2e994e4 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/etcd.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/etcd.go @@ -21,7 +21,7 @@ import ( "encoding/json" "path" - "go.etcd.io/etcd/clientv3" + clientv3 "go.etcd.io/etcd/client/v3" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/server.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/server.go index 93dbea1697a..5d525eb7322 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/server.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/server.go @@ -23,8 +23,8 @@ import ( "time" "github.com/google/uuid" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/client/pkg/v3/transport" + clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" "k8s.io/apiextensions-apiserver/pkg/cmd/server/options" serveroptions "k8s.io/apiextensions-apiserver/pkg/cmd/server/options" 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 34adaad989d..b588c8c2df3 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 @@ -24,8 +24,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/client/pkg/v3/transport" + clientv3 "go.etcd.io/etcd/client/v3" "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 baccc222472..2101e6cb434 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 @@ -26,8 +26,8 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/client/pkg/v3/transport" + clientv3 "go.etcd.io/etcd/client/v3" "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 bd402616ace..def24eda620 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" - "go.etcd.io/etcd/clientv3" + clientv3 "go.etcd.io/etcd/client/v3" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" 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 ca316066182..26006e8e01f 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" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/client/pkg/v3/transport" + clientv3 "go.etcd.io/etcd/client/v3" "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 1f97a5a77b8..63021e69e2f 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" - "go.etcd.io/etcd/clientv3" + clientv3 "go.etcd.io/etcd/client/v3" "k8s.io/klog/v2" ) 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 134ce8878bb..77254b7fd09 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,12 +20,13 @@ import ( "context" "testing" - "go.etcd.io/etcd/clientv3" - etcdrpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" - "go.etcd.io/etcd/integration" + etcdrpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + clientv3 "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/tests/v3/integration" ) func TestCompact(t *testing.T) { + integration.BeforeTestExternal(t) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) defer cluster.Terminate(t) client := cluster.RandClient() @@ -57,6 +58,7 @@ func TestCompact(t *testing.T) { // - C1 compacts first. It will succeed. // - C2 compacts after. It will fail. But it will get latest logical time, which should be larger by one. func TestCompactConflict(t *testing.T) { + integration.BeforeTestExternal(t) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) defer cluster.Terminate(t) client := cluster.RandClient() 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 b33751480a1..652bd7ca6dc 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 "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" + etcdrpc "go.etcd.io/etcd/api/v3/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 83e52c0646c..3e5bfb1c633 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" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/api/v3/mvccpb" + clientv3 "go.etcd.io/etcd/client/v3" ) 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 d54a97c2b71..ff8eefd1857 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 @@ -19,8 +19,8 @@ package etcd3 import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/mvcc/mvccpb" + "go.etcd.io/etcd/api/v3/mvccpb" + clientv3 "go.etcd.io/etcd/client/v3" "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 7c8b4a1d86a..12c9d00c768 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" - "go.etcd.io/etcd/clientv3" + clientv3 "go.etcd.io/etcd/client/v3" "k8s.io/apiserver/pkg/storage/etcd3/metrics" ) 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 e8a73082c98..951c1266366 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" - "go.etcd.io/etcd/clientv3" + clientv3 "go.etcd.io/etcd/client/v3" "k8s.io/klog/v2" ) 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 01008b7d03a..5f36b7108d7 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" - "go.etcd.io/etcd/clientv3" + clientv3 "go.etcd.io/etcd/client/v3" 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 8a87f6a1583..81530c3afe2 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 @@ -23,6 +23,8 @@ import ( "encoding/json" "errors" "fmt" + "io/ioutil" + "os" "reflect" "strconv" "strings" @@ -30,9 +32,10 @@ import ( "sync/atomic" "testing" - "github.com/coreos/pkg/capnslog" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/integration" + clientv3 "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/tests/v3/integration" + "google.golang.org/grpc/grpclog" + apitesting "k8s.io/apimachinery/pkg/api/apitesting" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -64,7 +67,7 @@ func init() { utilruntime.Must(example.AddToScheme(scheme)) utilruntime.Must(examplev1.AddToScheme(scheme)) - capnslog.SetGlobalLogLevel(capnslog.CRITICAL) + clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, os.Stderr)) } // prefixTransformer adds and verifies that all data has the correct prefix on its way in and out. @@ -980,6 +983,7 @@ func TestGuaranteedUpdateWithSuggestionAndConflict(t *testing.T) { } func TestTransformationFailure(t *testing.T) { + integration.BeforeTestExternal(t) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) defer cluster.Terminate(t) @@ -1056,6 +1060,7 @@ func TestTransformationFailure(t *testing.T) { } func TestList(t *testing.T) { + integration.BeforeTestExternal(t) defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.RemainingItemCount, true)() codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) @@ -1552,6 +1557,7 @@ func TestList(t *testing.T) { } func TestListContinuation(t *testing.T) { + integration.BeforeTestExternal(t) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) defer cluster.Terminate(t) @@ -1714,6 +1720,7 @@ func (r *clientRecorder) resetReads() { } func TestListContinuationWithFilter(t *testing.T) { + integration.BeforeTestExternal(t) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) defer cluster.Terminate(t) @@ -1821,6 +1828,7 @@ func TestListContinuationWithFilter(t *testing.T) { } func TestListInconsistentContinuation(t *testing.T) { + integration.BeforeTestExternal(t) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) defer cluster.Terminate(t) @@ -1967,6 +1975,7 @@ func TestListInconsistentContinuation(t *testing.T) { } func testSetup(t *testing.T) (context.Context, *store, *integration.ClusterV3) { + integration.BeforeTestExternal(t) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) // As 30s is the default timeout for testing in glboal configuration, @@ -2007,6 +2016,7 @@ func testPropogateStoreWithKey(ctx context.Context, t *testing.T, store *store, } func TestPrefix(t *testing.T) { + integration.BeforeTestExternal(t) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) defer cluster.Terminate(t) @@ -2176,6 +2186,7 @@ func (t *fancyTransformer) createObject() error { } func TestConsistentList(t *testing.T) { + integration.BeforeTestExternal(t) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) defer cluster.Terminate(t) @@ -2287,6 +2298,7 @@ func TestCount(t *testing.T) { func TestLeaseMaxObjectCount(t *testing.T) { codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) + integration.BeforeTestExternal(t) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) store := newStore(cluster.RandClient(), codec, newPod, "", &prefixTransformer{prefix: []byte(defaultTestPrefix)}, true, LeaseManagerConfig{ ReuseDurationSeconds: defaultLeaseReuseDurationSeconds, 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 4620f3ad39c..f3fa31a11b9 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 @@ -21,8 +21,8 @@ import ( "k8s.io/apiserver/pkg/storage/storagebackend" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/integration" + clientv3 "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/tests/v3/integration" ) // EtcdTestServer encapsulates the datastructures needed to start local instance for testing @@ -44,6 +44,7 @@ func (m *EtcdTestServer) Terminate(t *testing.T) { // NewUnsecuredEtcd3TestClientServer creates a new client and server for testing func NewUnsecuredEtcd3TestClientServer(t *testing.T) (*EtcdTestServer, *storagebackend.Config) { + integration.BeforeTestExternal(t) server := &EtcdTestServer{ v3Cluster: integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}), } 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 1a15fa229ad..d37991a0523 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go @@ -34,7 +34,7 @@ import ( "k8s.io/apiserver/pkg/storage/value" utilflowcontrol "k8s.io/apiserver/pkg/util/flowcontrol" - "go.etcd.io/etcd/clientv3" + clientv3 "go.etcd.io/etcd/client/v3" "k8s.io/klog/v2" ) 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 89a5e7b3f82..4c072517aba 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" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/integration" + clientv3 "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/tests/v3/integration" apitesting "k8s.io/apimachinery/pkg/api/apitesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -224,6 +224,7 @@ func TestWatchFromNoneZero(t *testing.T) { func TestWatchError(t *testing.T) { codec := &testCodec{apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)} + integration.BeforeTestExternal(t) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) defer cluster.Terminate(t) invalidStore := newStore(cluster.RandClient(), codec, newPod, "", &prefixTransformer{prefix: []byte("test!")}, true, NewDefaultLeaseManagerConfig()) @@ -337,6 +338,7 @@ func TestProgressNotify(t *testing.T) { Size: 1, WatchProgressNotifyInterval: time.Second, } + integration.BeforeTestExternal(t) cluster := integration.NewClusterV3(t, clusterConfig) defer cluster.Terminate(t) store := newStore(cluster.RandClient(), codec, newPod, "", &prefixTransformer{prefix: []byte(defaultTestPrefix)}, false, NewDefaultLeaseManagerConfig()) 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 c0fd8045f3a..de61bfcab23 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 @@ -27,8 +27,8 @@ import ( "time" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/client/pkg/v3/transport" + clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" "k8s.io/apimachinery/pkg/runtime" 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 4bc49172324..981d2c6d6f3 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" - "go.etcd.io/etcd/integration" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/client/pkg/v3/transport" + "go.etcd.io/etcd/tests/v3/integration" apitesting "k8s.io/apimachinery/pkg/api/apitesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -59,6 +59,7 @@ func TestTLSConnection(t *testing.T) { TrustedCAFile: caFile, } + integration.BeforeTestExternal(t) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{ Size: 1, ClientTLS: tlsInfo, diff --git a/test/integration/apiserver/admissionwebhook/admission_test.go b/test/integration/apiserver/admissionwebhook/admission_test.go index eb40bc183d6..2d35d85225f 100644 --- a/test/integration/apiserver/admissionwebhook/admission_test.go +++ b/test/integration/apiserver/admissionwebhook/admission_test.go @@ -32,7 +32,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" + clientv3 "go.etcd.io/etcd/client/v3" admissionreviewv1 "k8s.io/api/admission/v1" "k8s.io/api/admission/v1beta1" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" diff --git a/test/integration/apiserver/apply/apply_crd_test.go b/test/integration/apiserver/apply/apply_crd_test.go index ef313bbd346..5ae861d1365 100644 --- a/test/integration/apiserver/apply/apply_crd_test.go +++ b/test/integration/apiserver/apply/apply_crd_test.go @@ -29,8 +29,8 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/client/pkg/v3/transport" + clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/test/integration/etcd/etcd_storage_path_test.go b/test/integration/etcd/etcd_storage_path_test.go index 5b007224eba..4d677572021 100644 --- a/test/integration/etcd/etcd_storage_path_test.go +++ b/test/integration/etcd/etcd_storage_path_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "go.etcd.io/etcd/clientv3" + clientv3 "go.etcd.io/etcd/client/v3" v1 "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 01fa0723d44..9743a80f0ea 100644 --- a/test/integration/etcd/server.go +++ b/test/integration/etcd/server.go @@ -27,8 +27,8 @@ import ( "testing" "time" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/clientv3/concurrency" + clientv3 "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/client/v3/concurrency" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" diff --git a/test/integration/framework/etcd.go b/test/integration/framework/etcd.go index 6643457ea42..bc09c9ec472 100644 --- a/test/integration/framework/etcd.go +++ b/test/integration/framework/etcd.go @@ -27,7 +27,6 @@ import ( "strings" "time" - "go.etcd.io/etcd/clientv3" "google.golang.org/grpc/grpclog" "k8s.io/klog/v2" diff --git a/test/integration/master/transformation_testcase.go b/test/integration/master/transformation_testcase.go index 22a80e3a947..5ee45409566 100644 --- a/test/integration/master/transformation_testcase.go +++ b/test/integration/master/transformation_testcase.go @@ -29,7 +29,7 @@ import ( "k8s.io/klog/v2" - "go.etcd.io/etcd/clientv3" + clientv3 "go.etcd.io/etcd/client/v3" "k8s.io/component-base/metrics/legacyregistry" "sigs.k8s.io/yaml" diff --git a/test/integration/scale/scale_test.go b/test/integration/scale/scale_test.go index 03722cc273d..1cbd5316f87 100644 --- a/test/integration/scale/scale_test.go +++ b/test/integration/scale/scale_test.go @@ -19,12 +19,13 @@ package scale import ( "context" "encoding/json" + "io/ioutil" "path" "strings" "testing" - "github.com/coreos/pkg/capnslog" - _ "go.etcd.io/etcd/etcdserver/api/v3rpc" // Force package logger init. + clientv3 "go.etcd.io/etcd/client/v3" + "google.golang.org/grpc/grpclog" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -203,21 +204,9 @@ var ( ) func setupWithOptions(t *testing.T, instanceOptions *apitesting.TestServerInstanceOptions, flags []string) (client kubernetes.Interface, tearDown func()) { + clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard)) + result := apitesting.StartTestServerOrDie(t, instanceOptions, flags, framework.SharedEtcd()) - - // TODO: Disable logging here until we resolve teardown issues which result in - // massive log spam. Another path forward would be to refactor - // 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("go.etcd.io/etcd") - if err != nil { - t.Fatalf("couldn't configure logging: %v", err) - } - repo.SetLogLevel(map[string]capnslog.LogLevel{ - "etcdserver/api/v3rpc": capnslog.CRITICAL, - }) - result.ClientConfig.AcceptContentTypes = "" result.ClientConfig.ContentType = "" result.ClientConfig.NegotiatedSerializer = nil diff --git a/test/integration/utils.go b/test/integration/utils.go index aee85c4495c..c08161d9483 100644 --- a/test/integration/utils.go +++ b/test/integration/utils.go @@ -29,8 +29,8 @@ import ( clientset "k8s.io/client-go/kubernetes" coreclient "k8s.io/client-go/kubernetes/typed/core/v1" - "go.etcd.io/etcd/clientv3" - "go.etcd.io/etcd/pkg/transport" + "go.etcd.io/etcd/client/pkg/v3/transport" + clientv3 "go.etcd.io/etcd/client/v3" ) // DeletePodOrErrorf deletes a pod or fails with a call to t.Errorf.