Merge pull request #31661 from mikedanese/log-fix-ds

Automatic merge from submit-queue fix log message to include ds name The pod name is never set because newPod is created a couple lines up without a name. Instead log the name and namespace of the ds which the pod is created from. also bump the log level because reasons loop get's hit fairly often and does not indicate a bug.

Merge pull request #31661 from mikedanese/log-fix-ds
4260f4ed · Kubernetes Submit Queue · GitHub · afef4b69 · 9d7d77d4 · 4260f4ed
Commit 4260f4ed authored Sep 06, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 06, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

daemoncontroller.go pkg/controller/daemon/daemoncontroller.go +2 -2

No files found.
--- a/pkg/controller/daemon/daemoncontroller.go
+++ b/pkg/controller/daemon/daemoncontroller.go
@@ -708,10 +708,10 @@ func (dsc *DaemonSetsController) nodeShouldRunDaemonPod(node *api.Node, ds *exte
 	nodeInfo.SetNode(node)
 	fit, reasons, err := predicates.GeneralPredicates(newPod, nil, nodeInfo)
 	if err != nil {
-		glog.Warningf("GeneralPredicates failed on pod %s due to unexpected error: %v", newPod.Name, err)
+		glog.Warningf("GeneralPredicates failed on ds '%s/%s' due to unexpected error: %v", ds.ObjectMeta.Namespace, ds.ObjectMeta.Name, err)
 	}
 	for _, r := range reasons {
-		glog.V(2).Infof("GeneralPredicates failed on pod %s for reason: %v", newPod.Name, r.GetReason())
+		glog.V(4).Infof("GeneralPredicates failed on ds '%s/%s' for reason: %v", ds.ObjectMeta.Namespace, ds.ObjectMeta.Name, r.GetReason())
 	}
 	return fit
 }