From e6b312f7d6187d4e0b7641acdf9ac4118b077610 Mon Sep 17 00:00:00 2001 From: Jim Minter Date: Fri, 15 Sep 2017 17:07:17 -0500 Subject: [PATCH] UPSTREAM: 51796: Fix pod and node names switched around in error message. --- .../k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go b/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go index e971eb57dcda..185a91676614 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go @@ -748,7 +748,7 @@ func (dsc *DaemonSetsController) manage(ds *extensions.DaemonSet, hash string) e var daemonPodsRunning []*v1.Pod for _, pod := range daemonPods { if pod.Status.Phase == v1.PodFailed { - msg := fmt.Sprintf("Found failed daemon pod %s/%s on node %s, will try to kill it", pod.Namespace, node.Name, pod.Name) + msg := fmt.Sprintf("Found failed daemon pod %s/%s on node %s, will try to kill it", pod.Namespace, pod.Name, node.Name) glog.V(2).Infof(msg) // Emit an event so that it's discoverable to users. dsc.eventRecorder.Eventf(ds, v1.EventTypeWarning, FailedDaemonPodReason, msg)