Commit 1b74e7bf authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #23994 from mml/docker-supervisor-logs

Automatic merge from submit-queue Also collect docker supervisor logs.
parents 3924c9a6 61ca21c4
...@@ -83,7 +83,7 @@ readonly aws_logfiles="cloud-init-output" ...@@ -83,7 +83,7 @@ readonly aws_logfiles="cloud-init-output"
readonly gce_logfiles="startupscript" readonly gce_logfiles="startupscript"
readonly common_logfiles="kern" readonly common_logfiles="kern"
readonly initd_logfiles="docker" readonly initd_logfiles="docker"
readonly supervisord_logfiles="kubelet supervisor/supervisord supervisor/kubelet-stdout supervisor/kubelet-stderr" readonly supervisord_logfiles="kubelet supervisor/supervisord supervisor/kubelet-stdout supervisor/kubelet-stderr supervisor/docker-stdout supervisor/docker-stderr"
# Limit the number of concurrent node connections so that we don't run out of # Limit the number of concurrent node connections so that we don't run out of
# file descriptors for large clusters. # file descriptors for large clusters.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment