@@ -28,6 +28,7 @@ import (
2828 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929 kerrors "k8s.io/apimachinery/pkg/util/errors"
3030 "k8s.io/client-go/tools/record"
31+ "k8s.io/klog/v2"
3132 "k8s.io/utils/pointer"
3233 ctrl "sigs.k8s.io/controller-runtime"
3334 "sigs.k8s.io/controller-runtime/pkg/client"
@@ -43,6 +44,7 @@ import (
4344 "sigs.k8s.io/cluster-api/controlplane/kubeadm/internal"
4445 expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
4546 "sigs.k8s.io/cluster-api/feature"
47+ tlog "sigs.k8s.io/cluster-api/internal/log"
4648 "sigs.k8s.io/cluster-api/util"
4749 "sigs.k8s.io/cluster-api/util/annotations"
4850 "sigs.k8s.io/cluster-api/util/collections"
@@ -77,12 +79,14 @@ type KubeadmControlPlaneReconciler struct {
7779}
7880
7981func (r * KubeadmControlPlaneReconciler ) SetupWithManager (ctx context.Context , mgr ctrl.Manager , options controller.Options ) error {
82+ tr := tlog .Reconciler (r , "controllers.KubeadmControlPlaneReconciler" , "kubeadmcontrolplane" )
8083 c , err := ctrl .NewControllerManagedBy (mgr ).
8184 For (& controlplanev1.KubeadmControlPlane {}).
8285 Owns (& clusterv1.Machine {}).
8386 WithOptions (options ).
87+ WithLoggerCustomizer (tlog .LoggerCustomizer (mgr .GetLogger (), "kubeadmcontrolplane" , "kubeadmcontrolplane" )).
8488 WithEventFilter (predicates .ResourceNotPausedAndHasFilterLabel (ctrl .LoggerFrom (ctx ), r .WatchFilterValue )).
85- Build (r )
89+ Build (tr )
8690 if err != nil {
8791 return errors .Wrap (err , "failed setting up with a controller manager" )
8892 }
@@ -142,7 +146,8 @@ func (r *KubeadmControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.
142146 log .Info ("Cluster Controller has not yet set OwnerRef" )
143147 return ctrl.Result {}, nil
144148 }
145- log = log .WithValues ("cluster" , cluster .Name )
149+ log = log .WithValues ("cluster" , klog .KObj (cluster ).String ())
150+ ctx = ctrl .LoggerInto (ctx , log )
146151
147152 if annotations .IsPaused (cluster , kcp ) {
148153 log .Info ("Reconciliation is paused for this object" )
@@ -247,8 +252,7 @@ func patchKubeadmControlPlane(ctx context.Context, patchHelper *patch.Helper, kc
247252
248253// reconcile handles KubeadmControlPlane reconciliation.
249254func (r * KubeadmControlPlaneReconciler ) reconcile (ctx context.Context , cluster * clusterv1.Cluster , kcp * controlplanev1.KubeadmControlPlane ) (res ctrl.Result , reterr error ) {
250- log := ctrl .LoggerFrom (ctx , "cluster" , cluster .Name )
251- log .Info ("Reconcile KubeadmControlPlane" )
255+ log := ctrl .LoggerFrom (ctx )
252256
253257 // Make sure to reconcile the external infrastructure reference.
254258 if err := r .reconcileExternalReference (ctx , cluster , & kcp .Spec .MachineTemplate .InfrastructureRef ); err != nil {
@@ -407,7 +411,7 @@ func (r *KubeadmControlPlaneReconciler) reconcile(ctx context.Context, cluster *
407411// The implementation does not take non-control plane workloads into consideration. This may or may not change in the future.
408412// Please see https://github.com/kubernetes-sigs/cluster-api/issues/2064.
409413func (r * KubeadmControlPlaneReconciler ) reconcileDelete (ctx context.Context , cluster * clusterv1.Cluster , kcp * controlplanev1.KubeadmControlPlane ) (ctrl.Result , error ) {
410- log := ctrl .LoggerFrom (ctx , "cluster" , cluster . Name )
414+ log := ctrl .LoggerFrom (ctx )
411415 log .Info ("Reconcile KubeadmControlPlane deletion" )
412416
413417 // Gets all machines, not just control plane machines.
@@ -461,7 +465,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileDelete(ctx context.Context, clu
461465 var errs []error
462466 for i := range machinesToDelete {
463467 m := machinesToDelete [i ]
464- logger := log .WithValues ("machine" , m )
468+ logger := log .WithValues ("machine" , klog . KObj ( m ). String () )
465469 if err := r .Client .Delete (ctx , machinesToDelete [i ]); err != nil && ! apierrors .IsNotFound (err ) {
466470 logger .Error (err , "Failed to cleanup owned machine" )
467471 errs = append (errs , err )
@@ -525,7 +529,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileControlPlaneConditions(ctx cont
525529//
526530// NOTE: this func uses KCP conditions, it is required to call reconcileControlPlaneConditions before this.
527531func (r * KubeadmControlPlaneReconciler ) reconcileEtcdMembers (ctx context.Context , controlPlane * internal.ControlPlane ) (ctrl.Result , error ) {
528- log := ctrl .LoggerFrom (ctx , "cluster" , controlPlane . Cluster . Name )
532+ log := ctrl .LoggerFrom (ctx )
529533
530534 // If etcd is not managed by KCP this is a no-op.
531535 if ! controlPlane .IsEtcdManaged () {
0 commit comments