🌱 Allows to redefine ETCD client logger

Author: dmvolod

controlplane/kubeadm/controllers/alias.go

@@ -20,12 +20,14 @@ import (
 	"context"
 	"time"
 
+	"go.uber.org/zap"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 
 	"sigs.k8s.io/cluster-api/controllers/clustercache"
 	kubeadmcontrolplanecontrollers "sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/controllers"
+	"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/etcd"
 )
 
 // KubeadmControlPlaneReconciler reconciles a KubeadmControlPlane object.
@@ -55,3 +57,8 @@ func (r *KubeadmControlPlaneReconciler) SetupWithManager(ctx context.Context, mg
 		RemoteConditionsGracePeriod: r.RemoteConditionsGracePeriod,
 	}).SetupWithManager(ctx, mgr, options)
 }
+
+// SetEtcdLogger allows to redefine ETCD client logger.
+func SetEtcdLogger(logger *zap.Logger) {
+	etcd.SetLogger(logger)
+}

controlplane/kubeadm/internal/etcd/etcd.go

@@ -26,6 +26,7 @@ import (
 	"go.etcd.io/etcd/api/v3/etcdserverpb"
 	"go.etcd.io/etcd/client/pkg/v3/logutil"
 	clientv3 "go.etcd.io/etcd/client/v3"
+	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"google.golang.org/grpc"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
@@ -141,6 +142,11 @@ var (
 	etcdClientLogger, _ = logutil.CreateDefaultZapLogger(zapcore.InfoLevel)
 )
 
+// SetLogger allows to redefine ETCD client logger.
+func SetLogger(logger *zap.Logger) {
+	etcdClientLogger = logger
+}
+
 // NewClient creates a new etcd client with the given configuration.
 func NewClient(ctx context.Context, config ClientConfiguration) (*Client, error) {
 	dialer, err := proxy.NewDialer(config.Proxy)