Skip to content

Commit

Permalink
Merge pull request kubernetes#16739 from dchen1107/automated-cherry-p…
Browse files Browse the repository at this point in the history
…ick-of-#16736-upstream-release-1.1

Automated cherry pick of kubernetes#16736 upstream release 1.1 (Enable supervisord on all cloud providers and removed monit.)
  • Loading branch information
brendandburns committed Nov 3, 2015
2 parents 2cb0870 + 06733bd commit b59eb94
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 144 deletions.
9 changes: 0 additions & 9 deletions cluster/saltbase/salt/monit/docker

This file was deleted.

62 changes: 0 additions & 62 deletions cluster/saltbase/salt/monit/init.sls

This file was deleted.

5 changes: 0 additions & 5 deletions cluster/saltbase/salt/monit/kube-addons

This file was deleted.

11 changes: 0 additions & 11 deletions cluster/saltbase/salt/monit/kube-proxy

This file was deleted.

11 changes: 0 additions & 11 deletions cluster/saltbase/salt/monit/kubelet

This file was deleted.

38 changes: 0 additions & 38 deletions cluster/saltbase/salt/monit/monit_watcher.sh

This file was deleted.

8 changes: 0 additions & 8 deletions cluster/saltbase/salt/top.sls
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,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
Expand All @@ -39,11 +35,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 %}
Expand Down

0 comments on commit b59eb94

Please sign in to comment.