github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81594 from jfbai/remove-duplicated-log

Browse Source 
Remove duplicated log.
This commit is contained in:
Kubernetes Prow Robot
2019-10-11 19:38:38 -07:00
committed by GitHub
parent 8553d50426 aa173c834f
commit 0599ca2bcf
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet_node_status.go
View File

@@ -503,7 +503,7 @@ func (kl *Kubelet) setNodeStatus(node *v1.Node) {
for i, f := range kl.setNodeStatusFuncs { for i, f := range kl.setNodeStatusFuncs {
klog.V(5).Infof("Setting node status at position %v", i) klog.V(5).Infof("Setting node status at position %v", i)
if err := f(node); err != nil { if err := f(node); err != nil {
klog.Warningf("Failed to set some node status fields: %s", err) klog.Errorf("Failed to set some node status fields: %s", err)
} }
} }
} }

4
pkg/kubelet/nodestatus/setters.go
View File

@@ -376,8 +376,6 @@ func VersionInfo(versionInfoFunc func() (*cadvisorapiv1.VersionInfo, error), //
return func(node *v1.Node) error { return func(node *v1.Node) error {
verinfo, err := versionInfoFunc() verinfo, err := versionInfoFunc()
if err != nil { if err != nil {
// TODO(mtaufen): consider removing this log line, since returned error will be logged
klog.Errorf("Error getting version info: %v", err)
return fmt.Errorf("error getting version info: %v", err) return fmt.Errorf("error getting version info: %v", err)
} }
@@ -416,8 +414,6 @@ func Images(nodeStatusMaxImages int32,
var imagesOnNode []v1.ContainerImage var imagesOnNode []v1.ContainerImage
containerImages, err := imageListFunc() containerImages, err := imageListFunc()
if err != nil { if err != nil {
// TODO(mtaufen): consider removing this log line, since returned error will be logged
klog.Errorf("Error getting image list: %v", err)
node.Status.Images = imagesOnNode node.Status.Images = imagesOnNode
return fmt.Errorf("error getting image list: %v", err) return fmt.Errorf("error getting image list: %v", err)
} }