Skip to content

Commit

Permalink
pkg/kubelet: fix 1.14 compat for container restore error text
Browse files Browse the repository at this point in the history
Datadog: **NOT FROM UPSTREAM K8S**. From Lyft: lyft@7d64f03
  • Loading branch information
paulnivin authored and amardomingo committed May 30, 2022
1 parent 2958f02 commit febfa26
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/kubelet/kuberuntime/kuberuntime_container.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit febfa26

Please sign in to comment.