Merge pull request #8189 from dchen1107/clean

Monit watch kubelet and kube-proxy on master node too.
This commit is contained in:
Zach Loafman 2015-05-13 10:57:41 -07:00
commit abd1f89ba7

View File

@ -12,7 +12,6 @@ monit:
- group: root
- mode: 644
{% if "kubernetes-pool" in grains.get('roles', []) %}
/etc/monit/conf.d/kubelet:
file:
- managed
@ -28,7 +27,6 @@ monit:
- user: root
- group: root
- mode: 644
{% endif %}
monit-service:
service: