From 5ba3bf1bcaf9753ccb20e7684cf329df8717b20b Mon Sep 17 00:00:00 2001 From: Sladyn Nunes Date: Thu, 11 Feb 2021 18:59:09 +0530 Subject: [PATCH 1/2] kubelet: migrate pkg/kubelet/cloudresource to structured logging --- pkg/kubelet/cloudresource/cloud_request_manager.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/cloudresource/cloud_request_manager.go b/pkg/kubelet/cloudresource/cloud_request_manager.go index 889c29b1907..bbadd2c0371 100644 --- a/pkg/kubelet/cloudresource/cloud_request_manager.go +++ b/pkg/kubelet/cloudresource/cloud_request_manager.go @@ -82,7 +82,7 @@ func (m *cloudResourceSyncManager) NodeAddresses() ([]v1.NodeAddress, error) { if addrs, err := m.nodeAddresses, m.nodeAddressesErr; len(addrs) > 0 || err != nil { return addrs, err } - klog.V(5).Infof("Waiting for cloud provider to provide node addresses") + klog.V(5).InfoS("Waiting for cloud provider to provide node addresses") m.nodeAddressesMonitor.Wait() } } @@ -103,7 +103,7 @@ func (m *cloudResourceSyncManager) getNodeAddresses() ([]v1.NodeAddress, error) } func (m *cloudResourceSyncManager) syncNodeAddresses() { - klog.V(5).Infof("Requesting node addresses from cloud provider for node %q", m.nodeName) + klog.V(5).InfoS("Requesting node addresses from cloud provider for node","nodeName", m.nodeName) addrs, err := m.getNodeAddresses() @@ -112,7 +112,7 @@ func (m *cloudResourceSyncManager) syncNodeAddresses() { defer m.nodeAddressesMonitor.Broadcast() if err != nil { - klog.V(2).Infof("Node addresses from cloud provider for node %q not collected: %v", m.nodeName, err) + klog.V(2).InfoS("Node addresses from cloud provider for node not collected","nodeName", m.nodeName, "err", err) if len(m.nodeAddresses) > 0 { // in the event that a sync loop fails when a previous sync had @@ -124,7 +124,7 @@ func (m *cloudResourceSyncManager) syncNodeAddresses() { return } - klog.V(5).Infof("Node addresses from cloud provider for node %q collected", m.nodeName) + klog.V(5).InfoS("Node addresses from cloud provider for node collected","nodeName", m.nodeName) m.nodeAddressesErr = nil m.nodeAddresses = addrs } From cee2c42a5467be48c55cea4ca1a470a5f2a5d38d Mon Sep 17 00:00:00 2001 From: Sladyn Date: Fri, 12 Feb 2021 16:12:45 +0530 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Marek Siarkowicz --- pkg/kubelet/cloudresource/cloud_request_manager.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/cloudresource/cloud_request_manager.go b/pkg/kubelet/cloudresource/cloud_request_manager.go index bbadd2c0371..fafec971f9c 100644 --- a/pkg/kubelet/cloudresource/cloud_request_manager.go +++ b/pkg/kubelet/cloudresource/cloud_request_manager.go @@ -103,7 +103,7 @@ func (m *cloudResourceSyncManager) getNodeAddresses() ([]v1.NodeAddress, error) } func (m *cloudResourceSyncManager) syncNodeAddresses() { - klog.V(5).InfoS("Requesting node addresses from cloud provider for node","nodeName", m.nodeName) + klog.V(5).InfoS("Requesting node addresses from cloud provider for node", "nodeName", m.nodeName) addrs, err := m.getNodeAddresses() @@ -112,7 +112,7 @@ func (m *cloudResourceSyncManager) syncNodeAddresses() { defer m.nodeAddressesMonitor.Broadcast() if err != nil { - klog.V(2).InfoS("Node addresses from cloud provider for node not collected","nodeName", m.nodeName, "err", err) + klog.V(2).InfoS("Node addresses from cloud provider for node not collected", "nodeName", m.nodeName, "err", err) if len(m.nodeAddresses) > 0 { // in the event that a sync loop fails when a previous sync had @@ -124,7 +124,7 @@ func (m *cloudResourceSyncManager) syncNodeAddresses() { return } - klog.V(5).InfoS("Node addresses from cloud provider for node collected","nodeName", m.nodeName) + klog.V(5).InfoS("Node addresses from cloud provider for node collected", "nodeName", m.nodeName) m.nodeAddressesErr = nil m.nodeAddresses = addrs }