Skip to content

Commit 65697ed

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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
2 parents afa6a25 + ec99f16 commit 65697ed

File tree

3 files changed

+59
-4
lines changed

3 files changed

+59
-4
lines changed

‎vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go

+14-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_test.go

+43-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_container.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)