diff --git a/cluster/log-dump.sh b/cluster/log-dump.sh index 95c8760f443..160651d60ce 100755 --- a/cluster/log-dump.sh +++ b/cluster/log-dump.sh @@ -38,6 +38,7 @@ readonly node_ssh_supported_providers="gce gke aws" readonly master_logfiles="kube-apiserver kube-scheduler rescheduler kube-controller-manager etcd etcd-events glbc cluster-autoscaler kube-addon-manager fluentd" readonly node_logfiles="kube-proxy fluentd" +readonly hollow_node_logfiles="kubelet-hollow-node-* kubeproxy-hollow-node-* npd-*" readonly aws_logfiles="cloud-init-output" readonly gce_logfiles="startupscript" readonly kern_logfile="kern" @@ -128,6 +129,9 @@ function save-logs() { case "${KUBERNETES_PROVIDER}" in gce|gke|kubemark) files="${files} ${gce_logfiles}" + if [[ "${KUBERNETES_PROVIDER}" -eq "kubemark" && "${ENABLE_HOLLOW_NODE_LOGS:-}" -eq "true" ]]; then + files="${files} ${hollow_node_logfiles}" + fi ;; aws) files="${files} ${aws_logfiles}" diff --git a/test/kubemark/resources/hollow-node_template.json b/test/kubemark/resources/hollow-node_template.json index f64432ead86..97fe2e88e97 100644 --- a/test/kubemark/resources/hollow-node_template.json +++ b/test/kubemark/resources/hollow-node_template.json @@ -34,12 +34,6 @@ }, { "name": "logs-volume", - "hostPath": { - "path": "/var/logs" - } - }, - { - "name": "kernellog-volume", "hostPath": { "path": "/var/log" } @@ -80,7 +74,7 @@ "command": [ "/bin/sh", "-c", - "./kubemark.sh --morph=kubelet --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubelet.kubeconfig $(CONTENT_TYPE) --v=2 1>>/var/logs/kubelet_$(NODE_NAME).log 2>&1" + "./kubemark.sh --morph=kubelet --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubelet.kubeconfig $(CONTENT_TYPE) --v=2 1>>/var/log/kubelet-$(NODE_NAME).log 2>&1" ], "volumeMounts": [ { @@ -90,7 +84,7 @@ }, { "name": "logs-volume", - "mountPath": "/var/logs" + "mountPath": "/var/log" } ], "resources": { @@ -129,7 +123,7 @@ "command": [ "/bin/sh", "-c", - "./kubemark.sh --morph=proxy --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubeproxy.kubeconfig $(CONTENT_TYPE) --v=2 1>>/var/logs/kubeproxy_$(NODE_NAME).log 2>&1" + "./kubemark.sh --morph=proxy --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubeproxy.kubeconfig $(CONTENT_TYPE) --v=2 1>>/var/log/kubeproxy-$(NODE_NAME).log 2>&1" ], "volumeMounts": [ { @@ -139,7 +133,7 @@ }, { "name": "logs-volume", - "mountPath": "/var/logs" + "mountPath": "/var/log" } ], "resources": { @@ -167,7 +161,7 @@ "--kernel-monitor=/config/kernel.monitor", "--apiserver-override=https://{{master_ip}}:443?inClusterConfig=false&auth=/kubeconfig/npd.kubeconfig", "--alsologtostderr", - "1>>/var/logs/npd_$(NODE_NAME).log 2>&1" + "1>>/var/log/npd-$(NODE_NAME).log 2>&1" ], "volumeMounts": [ { @@ -180,11 +174,6 @@ "mountPath": "/config", "readOnly": true }, - { - "name": "kernellog-volume", - "mountPath": "/log", - "readOnly": true - }, { "name": "no-serviceaccount-access-to-real-master", "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount", @@ -192,7 +181,7 @@ }, { "name": "logs-volume", - "mountPath": "/var/logs" + "mountPath": "/var/log" } ], "resources": { diff --git a/test/kubemark/resources/kernel-monitor.json b/test/kubemark/resources/kernel-monitor.json index 8aa12450c9c..9959b737be3 100644 --- a/test/kubemark/resources/kernel-monitor.json +++ b/test/kubemark/resources/kernel-monitor.json @@ -1,5 +1,5 @@ { - "logPath": "/log/faillog", + "logPath": "/var/log/faillog", "lookback": "10m", "startPattern": "Initializing cgroup subsys cpuset", "bufferSize": 10,