@@ -25,6 +25,8 @@ import (
25
25
26
26
"github.com/blang/semver/v4"
27
27
"github.com/pkg/errors"
28
+ "go.etcd.io/etcd/client/pkg/v3/logutil"
29
+ "go.uber.org/zap/zapcore"
28
30
corev1 "k8s.io/api/core/v1"
29
31
apierrors "k8s.io/apimachinery/pkg/api/errors"
30
32
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -45,6 +47,8 @@ import (
45
47
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
46
48
"sigs.k8s.io/cluster-api/controllers/clustercache"
47
49
"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"
48
52
"sigs.k8s.io/cluster-api/feature"
49
53
"sigs.k8s.io/cluster-api/internal/contract"
50
54
"sigs.k8s.io/cluster-api/internal/util/ssa"
@@ -109,6 +113,12 @@ func (r *KubeadmControlPlaneReconciler) SetupWithManager(ctx context.Context, mg
109
113
}
110
114
111
115
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
+
112
122
c , err := ctrl .NewControllerManagedBy (mgr ).
113
123
For (& controlplanev1.KubeadmControlPlane {}).
114
124
Owns (& clusterv1.Machine {}, builder .WithPredicates (predicates .ResourceIsChanged (mgr .GetScheme (), predicateLog ))).
0 commit comments