From 1f22a173d9538e01c92529d02e4c95f77f5ea823 Mon Sep 17 00:00:00 2001
From: Navid Shaikh <navids@vmware.com>
Date: Fri, 5 Mar 2021 12:15:18 +0530
Subject: [PATCH] Migrate pkg/kubelet/util to structured logging

 Part of https://github.com/kubernetes/kubernetes/issues/98976
---
 pkg/kubelet/util/manager/watch_based_manager.go | 2 +-
 pkg/kubelet/util/nodelease.go                   | 2 +-
 pkg/kubelet/util/util_unix.go                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/kubelet/util/manager/watch_based_manager.go b/pkg/kubelet/util/manager/watch_based_manager.go
index 30f25b405bc..8f71b44048a 100644
--- a/pkg/kubelet/util/manager/watch_based_manager.go
+++ b/pkg/kubelet/util/manager/watch_based_manager.go
@@ -208,7 +208,7 @@ func (c *objectCache) Get(namespace, name string) (runtime.Object, error) {
 		// we limit ourselves to just quickly stop the reflector here.
 		if c.isImmutable(object) {
 			if item.stop() {
-				klog.V(4).Infof("Stopped watching for changes of %q/%q - object is immutable", namespace, name)
+				klog.V(4).InfoS("Stopped watching for changes - object is immutable", "obj", klog.KRef(namespace, name))
 			}
 		}
 		return object, nil
diff --git a/pkg/kubelet/util/nodelease.go b/pkg/kubelet/util/nodelease.go
index ce520396734..9e1b00b7624 100644
--- a/pkg/kubelet/util/nodelease.go
+++ b/pkg/kubelet/util/nodelease.go
@@ -46,7 +46,7 @@ func SetNodeOwnerFunc(c clientset.Interface, nodeName string) func(lease *coordi
 					},
 				}
 			} else {
-				klog.Errorf("failed to get node %q when trying to set owner ref to the node lease: %v", nodeName, err)
+				klog.ErrorS(err, "Failed to get node when trying to set owner ref to the node lease", "node", klog.KRef("", nodeName))
 				return err
 			}
 		}
diff --git a/pkg/kubelet/util/util_unix.go b/pkg/kubelet/util/util_unix.go
index 4aa5e5b5548..dafc22471b7 100644
--- a/pkg/kubelet/util/util_unix.go
+++ b/pkg/kubelet/util/util_unix.go
@@ -100,7 +100,7 @@ func parseEndpointWithFallbackProtocol(endpoint string, fallbackProtocol string)
 		fallbackEndpoint := fallbackProtocol + "://" + endpoint
 		protocol, addr, err = parseEndpoint(fallbackEndpoint)
 		if err == nil {
-			klog.Warningf("Using %q as endpoint is deprecated, please consider using full url format %q.", endpoint, fallbackEndpoint)
+			klog.InfoS("Using this endpoint is deprecated, please consider using full URL format", "endpoint", endpoint, "URL", fallbackEndpoint)
 		}
 	}
 	return