Merge pull request kubernetes#72135 from tallclair/rc-logs

k8s-ci-robot · web-flow · commit f0390761162d · 2018-12-18T19:10:25.000-08:00
Surface selected pod RuntimeHandler in Kubelet logs
diff --git a/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go b/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go
@@ -57,6 +57,9 @@ func (m *kubeGenericRuntimeManager) createPodSandbox(pod *v1.Pod, attempt uint32
 			message := fmt.Sprintf("CreatePodSandbox for pod %q failed: %v", format.Pod(pod), err)
 			return "", message, err
 		}
+		if runtimeHandler != "" {
+			klog.V(2).Infof("Running pod %s with RuntimeHandler %q", format.Pod(pod), runtimeHandler)
+		}
 	}
 
 	podSandBoxID, err := m.runtimeService.RunPodSandbox(podSandboxConfig, runtimeHandler)

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,9 @@ func (m kubeGenericRuntimeManager) createPodSandbox(pod v1.Pod, attempt uint32`
`57`	`57`	`message := fmt.Sprintf("CreatePodSandbox for pod %q failed: %v", format.Pod(pod), err)`
`58`	`58`	`return "", message, err`
`59`	`59`	`}`
	`60`	`+ if runtimeHandler != "" {`
	`61`	`+ klog.V(2).Infof("Running pod %s with RuntimeHandler %q", format.Pod(pod), runtimeHandler)`
	`62`	`+ }`
`60`	`63`	`}`
`61`	`64`
`62`	`65`	`podSandBoxID, err := m.runtimeService.RunPodSandbox(podSandboxConfig, runtimeHandler)`