Merge pull request kubernetes#16736 from dchen1107/docker

Enable supervisord on all cloud providers and removed monit.
hSATAC · Nov 3, 2015 · a78b2e0 · a78b2e0
2 parents ca6fe97 + 9565618
commit a78b2e0
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 144 deletions.
diff --git a/cluster/saltbase/salt/monit/docker b/cluster/saltbase/salt/monit/docker
diff --git a/cluster/saltbase/salt/monit/init.sls b/cluster/saltbase/salt/monit/init.sls
diff --git a/cluster/saltbase/salt/monit/kube-addons b/cluster/saltbase/salt/monit/kube-addons
diff --git a/cluster/saltbase/salt/monit/kube-proxy b/cluster/saltbase/salt/monit/kube-proxy
diff --git a/cluster/saltbase/salt/monit/kubelet b/cluster/saltbase/salt/monit/kubelet
diff --git a/cluster/saltbase/salt/monit/monit_watcher.sh b/cluster/saltbase/salt/monit/monit_watcher.sh
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
@@ -33,11 +33,7 @@ base:
     - kube-registry-proxy
 {% endif %}
     - logrotate
-{% if grains['cloud'] is defined and grains.cloud == 'gce' %}
     - supervisor
-{% else %}
-    - monit
-{% endif %}
 
   'roles:kubernetes-master':
     - match: grain
@@ -46,11 +42,7 @@ base:
     - kube-apiserver
     - kube-controller-manager
     - kube-scheduler
-{% if grains['cloud'] is defined and grains.cloud == 'gce' %}
     - supervisor
-{% else %}
-    - monit
-{% endif %}
 {% if grains['cloud'] is defined and not grains.cloud in [ 'aws', 'gce', 'vagrant' ] %}
     - nginx
 {% endif %}