Merge pull request #18515 from joelsmith/pick-59297

Automatic merge from submit-queue (batch tested with PRs 18503, 18399, 13701, 18513, 18515). UPSTREAM: 59297: Improve error returned when fetching container logs during pod termination Fixes #18173 xref kubernetes/kubernetes#59297
openshift · Feb 9, 2018 · 65697ed · 65697ed
2 parents afa6a25 + ec99f16
commit 65697ed
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 4 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_container.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_container.go