Skip to content

Commit 0599ca2

Browse files
authored
Merge pull request kubernetes#81594 from jfbai/remove-duplicated-log
Remove duplicated log.
2 parents 8553d50 + aa173c8 commit 0599ca2

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

pkg/kubelet/kubelet_node_status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ func (kl *Kubelet) setNodeStatus(node *v1.Node) {
503503
for i, f := range kl.setNodeStatusFuncs {
504504
klog.V(5).Infof("Setting node status at position %v", i)
505505
if err := f(node); err != nil {
506-
klog.Warningf("Failed to set some node status fields: %s", err)
506+
klog.Errorf("Failed to set some node status fields: %s", err)
507507
}
508508
}
509509
}

pkg/kubelet/nodestatus/setters.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,6 @@ func VersionInfo(versionInfoFunc func() (*cadvisorapiv1.VersionInfo, error), //
376376
return func(node *v1.Node) error {
377377
verinfo, err := versionInfoFunc()
378378
if err != nil {
379-
// TODO(mtaufen): consider removing this log line, since returned error will be logged
380-
klog.Errorf("Error getting version info: %v", err)
381379
return fmt.Errorf("error getting version info: %v", err)
382380
}
383381

@@ -416,8 +414,6 @@ func Images(nodeStatusMaxImages int32,
416414
var imagesOnNode []v1.ContainerImage
417415
containerImages, err := imageListFunc()
418416
if err != nil {
419-
// TODO(mtaufen): consider removing this log line, since returned error will be logged
420-
klog.Errorf("Error getting image list: %v", err)
421417
node.Status.Images = imagesOnNode
422418
return fmt.Errorf("error getting image list: %v", err)
423419
}

0 commit comments

Comments
 (0)