Skip to content

Commit

Permalink
Merge pull request #16912 from joelsmith/journal-driver-term
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

UPSTREAM: 52503: Get fallback termination msg from docker when using journald log driver

xref kubernetes/kubernetes#52503

From the commit message:

> When using the legacy docker container runtime and when a container has
> terminationMessagePolicy=FallbackToLogsOnError and when docker is
> configured with a log driver other than json-log (such as journald),
> the kubelet should not try to get the container's log from the
> json log file (since it's not there) but should instead ask docker for
> the logs.

fixes #15878
  • Loading branch information
openshift-merge-robot committed Oct 20, 2017
2 parents 1291187 + fc2c545 commit a0a87ed
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 2 deletions.
2 changes: 2 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/BUILD

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/docker_service.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a0a87ed

Please sign in to comment.