Merge pull request #27037 from wojtek-t/push_hollow_nodes_logs_to_kubelets

Automatic merge from submit-queue

Mount hollow-node logs to parent node hostpath
This commit is contained in:
k8s-merge-robot 2016-06-27 22:40:52 -07:00 committed by GitHub
commit d1cc7f9e2c

View File

@ -25,6 +25,12 @@
"secret": {
"secretName": "kubeconfig"
}
},
{
"name": "logs-volume",
"hostPath": {
"path": "/var/logs"
}
}
],
"containers": [
@ -45,20 +51,29 @@
"key": "content.type"
}
}
},
{
"name": "MY_POD_NAME",
"valueFrom": {
"fieldRef": {
"fieldPath": "metadata.name"
}
}
}
],
"command": [
"./kubemark.sh"
],
"args": [
"--v=3",
"--morph=kubelet",
"$(CONTENT_TYPE)"
"/bin/sh",
"-c",
"./kubemark.sh --morph=kubelet $(CONTENT_TYPE) --v=2 1>>/var/logs/kubelet_$(MY_POD_NAME).log 2>&1"
],
"volumeMounts": [
{
"name": "kubeconfig-volume",
"mountPath": "/kubeconfig"
},
{
"name": "logs-volume",
"mountPath": "/var/logs"
}
],
"resources": {
@ -81,20 +96,29 @@
"key": "content.type"
}
}
},
{
"name": "MY_POD_NAME",
"valueFrom": {
"fieldRef": {
"fieldPath": "metadata.name"
}
}
}
],
"command": [
"./kubemark.sh"
],
"args": [
"--v=3",
"--morph=proxy",
"$(CONTENT_TYPE)"
"/bin/sh",
"-c",
"./kubemark.sh --morph=proxy $(CONTENT_TYPE) --v=2 1>>/var/logs/kube_proxy_$(MY_POD_NAME).log 2>&1"
],
"volumeMounts": [
{
"name": "kubeconfig-volume",
"mountPath": "/kubeconfig"
},
{
"name": "logs-volume",
"mountPath": "/var/logs"
}
],
"resources": {