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

Revert the npd change in kubemark.

Browse Source
This commit is contained in:
Random-Liu 2017-02-19 04:07:50 -08:00
parent 070ebfe622
commit 47fc1d684d
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,12 @@
"path": "/var/logs" "path": "/var/logs"
} }
}, },
{
"name": "kernellog-volume",
"hostPath": {
"path": "/var/log"
}
},
{ {
"name": "no-serviceaccount-access-to-real-master", "name": "no-serviceaccount-access-to-real-master",
"emptyDir": {} "emptyDir": {}
@ -145,7 +151,7 @@
}, },
{ {
"name": "hollow-node-problem-detector", "name": "hollow-node-problem-detector",
"image": "gcr.io/google_containers/node-problem-detector:v0.3.0-alpha.1", "image": "gcr.io/google_containers/node-problem-detector:v0.3.0-alpha.0",
"env": [ "env": [
{ {
"name": "NODE_NAME", "name": "NODE_NAME",
@ -158,7 +164,7 @@
], ],
"command": [ "command": [
"/node-problem-detector", "/node-problem-detector",
"--system-log-monitors=/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/logs/npd_$(NODE_NAME).log 2>&1"
@ -174,6 +180,11 @@
"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",

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

@ -1,12 +1,7 @@
{ {
"plugin": "filelog", "logPath": "/log/faillog",
"pluginConfig": {
"timestamp": "dummy",
"message": "dummy",
"timestampFormat": "dummy"
},
"logPath": "/dev/null",
"lookback": "10m", "lookback": "10m",
"startPattern": "Initializing cgroup subsys cpuset",
"bufferSize": 10, "bufferSize": 10,
"source": "kernel-monitor", "source": "kernel-monitor",
"conditions": [], "conditions": [],