From 52b629efbc8be30901192880b8005e7362f9a69f Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 19 May 2021 09:10:05 -0400 Subject: [PATCH] Drop use of deprecated clientv3.SetLogger --- staging/src/k8s.io/apiserver/pkg/storage/etcd3/logger.go | 4 ++-- staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go | 2 +- test/integration/framework/etcd.go | 2 +- test/integration/scale/scale_test.go | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) 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 951c1266366..0eb24070e3c 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/logger.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/logger.go @@ -19,12 +19,12 @@ package etcd3 import ( "fmt" - clientv3 "go.etcd.io/etcd/client/v3" + "google.golang.org/grpc/grpclog" "k8s.io/klog/v2" ) func init() { - clientv3.SetLogger(klogWrapper{}) + grpclog.SetLoggerV2(klogWrapper{}) } type klogWrapper struct{} 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 81530c3afe2..fded608e74a 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 @@ -67,7 +67,7 @@ func init() { utilruntime.Must(example.AddToScheme(scheme)) utilruntime.Must(examplev1.AddToScheme(scheme)) - clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, os.Stderr)) + grpclog.SetLoggerV2(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. diff --git a/test/integration/framework/etcd.go b/test/integration/framework/etcd.go index bc09c9ec472..aa1d36a86ab 100644 --- a/test/integration/framework/etcd.go +++ b/test/integration/framework/etcd.go @@ -138,7 +138,7 @@ func RunCustomEtcd(dataDir string, customFlags []string) (url string, stopFn fun // Quiet etcd logs for integration tests // Comment out to get verbose logs if desired - clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, os.Stderr)) + grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, os.Stderr)) if err := cmd.Start(); err != nil { return "", nil, fmt.Errorf("failed to run etcd: %v", err) diff --git a/test/integration/scale/scale_test.go b/test/integration/scale/scale_test.go index 1cbd5316f87..cb01d831c90 100644 --- a/test/integration/scale/scale_test.go +++ b/test/integration/scale/scale_test.go @@ -24,7 +24,6 @@ import ( "strings" "testing" - clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc/grpclog" appsv1 "k8s.io/api/apps/v1" @@ -204,7 +203,7 @@ 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)) + grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard)) result := apitesting.StartTestServerOrDie(t, instanceOptions, flags, framework.SharedEtcd()) result.ClientConfig.AcceptContentTypes = ""