Merge pull request #21444 from dchen1107/test1

cluster/saltbase/salt/supervisor/kubelet-checker.sh

@@ -34,6 +34,7 @@ max_seconds=10
 while true; do
   if ! curl --insecure -m ${max_seconds} -f -s https://127.0.0.1:{{kubelet_port}}/healthz > /dev/null; then
     echo "kubelet failed!"
+    curl --insecure -s http://127.0.0.1:{{kubelet_port}}/healthz
     exit 2
   fi
   sleep 10

test/e2e/core.go

@@ -55,6 +55,7 @@ func CoreDump(dir string) {
 		{"cat /var/log/kube-apiserver.log", "kube-apiserver"},
 		{"cat /var/log/kube-scheduler.log", "kube-scheduler"},
 		{"cat /var/log/kube-controller-manager.log", "kube-controller-manager"},
+		{"cat /var/log/etcd.log", "kube-etcd"},
 	}
 	if isUsingSystemdKubelet(provider, master) {
 		cmds = append(cmds, command{"sudo journalctl --output=cat -u kubelet.service", "kubelet"})
@@ -62,7 +63,10 @@ func CoreDump(dir string) {
 		cmds = append(cmds, []command{
 			{"cat /var/log/kubelet.log", "kubelet"},
 			{"cat /var/log/supervisor/supervisord.log", "supervisord"},
+			{"cat /var/log/supervisor/kubelet-stdout.log", "supervisord-kubelet-stdout"},
+			{"cat /var/log/supervisor/kubelet-stderr.log", "supervisord-kubelet-stderr"},
 			{"cat /var/log/kern.log", "kern.log"},
+			{"cat /var/log/docker.log", "docker.log"},
 		}...)
 	}
 
@@ -88,7 +92,10 @@ func CoreDump(dir string) {
 		cmds = append(cmds, []command{
 			{"cat /var/log/kubelet.log", "kubelet"},
 			{"cat /var/log/supervisor/supervisord.log", "supervisord"},
+			{"cat /var/log/supervisor/kubelet-stdout.log", "supervisord-kubelet-stdout"},
+			{"cat /var/log/supervisor/kubelet-stderr.log", "supervisord-kubelet-stderr"},
 			{"cat /var/log/kern.log", "kern.log"},
+			{"cat /var/log/docker.log", "docker.log"},
 		}...)
 	}