Merge pull request #45488 from bboreham/eviction-log-format

Automatic merge from submit-queue (batch tested with PRs 45488, 45335, 45909, 46074, 46615) Fix screwed-up log message format It had two %-verbs and three arguments **What this PR does / why we need it**: Fixes kubelet log lines like this: May 08 11:49:04 brya-1 kubelet[23248]: W0508 11:49:04.248123 23248 eviction_manager.go:128] Failed to admit pod kube-proxy-g3hjs_kube-system(55c1fbbb-33e4-11e7-b83c-42010a800002) - node has conditions: %v%!(EXTRA []v1.NodeConditionType=[MemoryPressure]) to remove the `%v%!(EXTRA` **Release note**: ```release-note NONE ```

Merge pull request #45488 from bboreham/eviction-log-format
d1e22196 · Kubernetes Submit Queue · GitHub · a4e73033 · 2d8c172a · d1e22196
Commit d1e22196 authored May 30, 2017 by Kubernetes Submit Queue Committed by GitHub May 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

eviction_manager.go pkg/kubelet/eviction/eviction_manager.go +1 -1

No files found.
--- a/pkg/kubelet/eviction/eviction_manager.go
+++ b/pkg/kubelet/eviction/eviction_manager.go
@@ -131,7 +131,7 @@ func (m *managerImpl) Admit(attrs *lifecycle.PodAdmitAttributes) lifecycle.PodAd
 	}
 	// reject pods when under memory pressure (if pod is best effort), or if under disk pressure.
-	glog.Warningf("Failed to admit pod %v - %s", format.Pod(attrs.Pod), "node has conditions: %v", m.nodeConditions)
+	glog.Warningf("Failed to admit pod %s - node has conditions: %v", format.Pod(attrs.Pod), m.nodeConditions)
 	return lifecycle.PodAdmitResult{
 		Admit:   false,
 		Reason:  reason,