github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41739 from shyamjvs/hollow-node-logs

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41706, 39063, 41330, 41739, 41576)

[Kubemark] Add option to log hollow-node logs

Ref https://github.com/kubernetes/kubernetes/issues/41613

Added an option to log kubemark hollow-node logs which includes kubelet, kubeproxy and npd logs for each hollow-node.
Setting the env var `ENABLE_HOLLOW_NODE_LOGS=true` should now enable logging for tests.

cc @kubernetes/sig-scalability-misc @wojtek-t @gmarek @yujuhong @Random-Liu
This commit is contained in:
Kubernetes Submit Queue 2017-02-21 02:24:43 -08:00 committed by GitHub
commit 70c9eebd21
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/log-dump.sh
View File

@ -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 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 node_logfiles="kube-proxy fluentd"
readonly hollow_node_logfiles="kubelet-hollow-node-* kubeproxy-hollow-node-* npd-*"
readonly aws_logfiles="cloud-init-output" readonly aws_logfiles="cloud-init-output"
readonly gce_logfiles="startupscript" readonly gce_logfiles="startupscript"
readonly kern_logfile="kern" readonly kern_logfile="kern"
@ -128,6 +129,9 @@ function save-logs() {
case "${KUBERNETES_PROVIDER}" in case "${KUBERNETES_PROVIDER}" in
gce|gke|kubemark) gce|gke|kubemark)
files="${files} ${gce_logfiles}" files="${files} ${gce_logfiles}"
if [[ "${KUBERNETES_PROVIDER}" -eq "kubemark" && "${ENABLE_HOLLOW_NODE_LOGS:-}" -eq "true" ]]; then
files="${files} ${hollow_node_logfiles}"
fi
;; ;;
aws) aws)
files="${files} ${aws_logfiles}" files="${files} ${aws_logfiles}"

23
test/kubemark/resources/hollow-node_template.json
View File

@ -34,12 +34,6 @@
}, },
{ {
"name": "logs-volume", "name": "logs-volume",
"hostPath": {
"path": "/var/logs"
}
},
{
"name": "kernellog-volume",
"hostPath": { "hostPath": {
"path": "/var/log" "path": "/var/log"
} }
@ -80,7 +74,7 @@
"command": [ "command": [
"/bin/sh", "/bin/sh",
"-c", "-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": [ "volumeMounts": [
{ {
@ -90,7 +84,7 @@
}, },
{ {
"name": "logs-volume", "name": "logs-volume",
"mountPath": "/var/logs" "mountPath": "/var/log"
} }
], ],
"resources": { "resources": {
@ -129,7 +123,7 @@
"command": [ "command": [
"/bin/sh", "/bin/sh",
"-c", "-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": [ "volumeMounts": [
{ {
@ -139,7 +133,7 @@
}, },
{ {
"name": "logs-volume", "name": "logs-volume",
"mountPath": "/var/logs" "mountPath": "/var/log"
} }
], ],
"resources": { "resources": {
@ -167,7 +161,7 @@
"--kernel-monitor=/config/kernel.monitor", "--kernel-monitor=/config/kernel.monitor",
"--apiserver-override=https://{{master_ip}}:443?inClusterConfig=false&auth=/kubeconfig/npd.kubeconfig", "--apiserver-override=https://{{master_ip}}:443?inClusterConfig=false&auth=/kubeconfig/npd.kubeconfig",
"--alsologtostderr", "--alsologtostderr",
"1>>/var/logs/npd_$(NODE_NAME).log 2>&1" "1>>/var/log/npd-$(NODE_NAME).log 2>&1"
], ],
"volumeMounts": [ "volumeMounts": [
{ {
@ -180,11 +174,6 @@
"mountPath": "/config", "mountPath": "/config",
"readOnly": true "readOnly": true
}, },
{
"name": "kernellog-volume",
"mountPath": "/log",
"readOnly": true
},
{ {
"name": "no-serviceaccount-access-to-real-master", "name": "no-serviceaccount-access-to-real-master",
"mountPath": "/var/run/secrets/kubernetes.io/serviceaccount", "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount",
@ -192,7 +181,7 @@
}, },
{ {
"name": "logs-volume", "name": "logs-volume",
"mountPath": "/var/logs" "mountPath": "/var/log"
} }
], ],
"resources": { "resources": {

2
test/kubemark/resources/kernel-monitor.json
View File

@ -1,5 +1,5 @@
{ {
"logPath": "/log/faillog", "logPath": "/var/log/faillog",
"lookback": "10m", "lookback": "10m",
"startPattern": "Initializing cgroup subsys cpuset", "startPattern": "Initializing cgroup subsys cpuset",
"bufferSize": 10, "bufferSize": 10,