merge branch from master

ringtail · ringtail · commit 15ca7f5b580d · 2019-12-16T17:11:29.000+08:00
diff --git a/config/fd-problem-monitor.json b/config/fd-problem-monitor.json
@@ -24,4 +24,4 @@
       "message": "too many fds have been used"
     }
   ]
-}
+}
diff --git a/deployment/node-problem-detector.yaml b/deployment/node-problem-detector.yaml
@@ -20,7 +20,8 @@ spec:
         - /node-problem-detector
         - --logtostderr
         - --system-log-monitors=/config/kernel-monitor.json,/config/docker-monitor.json
-        image: k8s.gcr.io/node-problem-detector:v0.6.3
+        - --custom-plugin-monitors=/config/fd-problem-monitor.json
+        image: registry.cn-beijing.aliyuncs.com/acs/node-problem-detector:v0.8.0-5c2f8c9
         resources:
           limits:
             cpu: 10m

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,4 @@`
`24`	`24`	`"message": "too many fds have been used"`
`25`	`25`	`}`
`26`	`26`	`]`
`27`		`-}`
	`27`	`+}`