@@ -31,7 +31,6 @@ import (
31
31
"k8s.io/apimachinery/pkg/util/wait"
32
32
"k8s.io/client-go/kubernetes"
33
33
"k8s.io/client-go/tools/record"
34
- "k8s.io/klog/v2"
35
34
kubedrain "k8s.io/kubectl/pkg/drain"
36
35
ctrl "sigs.k8s.io/controller-runtime"
37
36
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -530,8 +529,10 @@ func (r *Reconciler) drainNode(ctx context.Context, cluster *clusterv1.Cluster,
530
529
log .Info (fmt .Sprintf ("%s pod from Node" , verbStr ),
531
530
"pod" , fmt .Sprintf ("%s/%s" , pod .Name , pod .Namespace ))
532
531
},
533
- Out : writer {klog .Info },
534
- ErrOut : writer {klog .Error },
532
+ Out : writer {log .Info },
533
+ ErrOut : writer {func (msg string , keysAndValues ... interface {}) {
534
+ log .Error (nil , msg , keysAndValues )
535
+ }},
535
536
}
536
537
537
538
if noderefutil .IsNodeUnreachable (node ) {
@@ -743,7 +744,7 @@ func (r *Reconciler) nodeToMachine(o client.Object) []reconcile.Request {
743
744
744
745
// writer implements io.Writer interface as a pass-through for klog.
745
746
type writer struct {
746
- logFunc func (args ... interface {})
747
+ logFunc func (msg string , keysAndValues ... interface {})
747
748
}
748
749
749
750
// Write passes string(p) into writer's logFunc and always returns len(p).
0 commit comments