Skip to content

Commit 12fe638

Browse files
committed
log to logger from context during drain
Signed-off-by: Stefan Büringer [email protected]
1 parent d13b5eb commit 12fe638

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

internal/controllers/machine/machine_controller.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
"k8s.io/apimachinery/pkg/util/wait"
3232
"k8s.io/client-go/kubernetes"
3333
"k8s.io/client-go/tools/record"
34-
"k8s.io/klog/v2"
3534
kubedrain "k8s.io/kubectl/pkg/drain"
3635
ctrl "sigs.k8s.io/controller-runtime"
3736
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -530,8 +529,10 @@ func (r *Reconciler) drainNode(ctx context.Context, cluster *clusterv1.Cluster,
530529
log.Info(fmt.Sprintf("%s pod from Node", verbStr),
531530
"pod", fmt.Sprintf("%s/%s", pod.Name, pod.Namespace))
532531
},
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+
}},
535536
}
536537

537538
if noderefutil.IsNodeUnreachable(node) {
@@ -743,7 +744,7 @@ func (r *Reconciler) nodeToMachine(o client.Object) []reconcile.Request {
743744

744745
// writer implements io.Writer interface as a pass-through for klog.
745746
type writer struct {
746-
logFunc func(args ...interface{})
747+
logFunc func(msg string, keysAndValues ...interface{})
747748
}
748749

749750
// Write passes string(p) into writer's logFunc and always returns len(p).

0 commit comments

Comments
 (0)