Skip to content

Commit bff5529

Browse files
committed
Add logr to zapcore log level converter
# Conflicts: # controlplane/kubeadm/internal/controllers/controller.go
1 parent 535d956 commit bff5529

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

controlplane/kubeadm/internal/controllers/controller.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import (
2525

2626
"github.com/blang/semver/v4"
2727
"github.com/pkg/errors"
28+
"go.etcd.io/etcd/client/pkg/v3/logutil"
29+
"go.uber.org/zap/zapcore"
2830
corev1 "k8s.io/api/core/v1"
2931
apierrors "k8s.io/apimachinery/pkg/api/errors"
3032
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -45,6 +47,8 @@ import (
4547
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
4648
"sigs.k8s.io/cluster-api/controllers/clustercache"
4749
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
50+
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/etcd"
51+
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta2"
4852
"sigs.k8s.io/cluster-api/feature"
4953
"sigs.k8s.io/cluster-api/internal/contract"
5054
"sigs.k8s.io/cluster-api/internal/util/ssa"
@@ -109,6 +113,12 @@ func (r *KubeadmControlPlaneReconciler) SetupWithManager(ctx context.Context, mg
109113
}
110114

111115
predicateLog := ctrl.LoggerFrom(ctx).WithValues("controller", "kubeadmcontrolplane")
116+
etcdLogger, err := logutil.CreateDefaultZapLogger(0 - zapcore.Level(predicateLog.GetV()))
117+
if err != nil {
118+
return errors.Wrap(err, "failed to create ETCD client zap logger")
119+
}
120+
etcd.SetLogger(etcdLogger)
121+
112122
c, err := ctrl.NewControllerManagedBy(mgr).
113123
For(&controlplanev1.KubeadmControlPlane{}).
114124
Owns(&clusterv1.Machine{}, builder.WithPredicates(predicates.ResourceIsChanged(mgr.GetScheme(), predicateLog))).

0 commit comments

Comments
 (0)