From febfa263ab477a7f0941a11a3fd7ad6a80ec432f Mon Sep 17 00:00:00 2001 From: Paul Fisher Date: Fri, 30 Aug 2019 09:51:30 -0700 Subject: [PATCH] pkg/kubelet: fix 1.14 compat for container restore error text Datadog: **NOT FROM UPSTREAM K8S**. From Lyft: https://github.com/lyft/kubernetes/commit/7d64f03cf8ee0551c589ad2152bc9abcf12fcb98 --- pkg/kubelet/kuberuntime/kuberuntime_container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index f4f87327689fb..6d6b9e30571fc 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -677,7 +677,7 @@ func (m *kubeGenericRuntimeManager) killContainer(pod *v1.Pod, containerID kubec restoredPod, restoredContainer, err := m.restoreSpecsFromContainerLabels(containerID) if err != nil { return fmt.Errorf("failed to get containerSpec %q(id=%q) in pod %q when killing container for reason %q. error: %v", - containerName, containerID.String(), format.Pod(pod), reason, err) + containerName, containerID.String(), format.Pod(pod), message, err) } pod, containerSpec = restoredPod, restoredContainer }