Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #16736 upstream release 1.1 (Enable supervisord on all cloud providers and removed monit.) #16739

Merged
merged 2 commits into from
Nov 3, 2015
Merged

Automated cherry pick of #16736 upstream release 1.1 (Enable supervisord on all cloud providers and removed monit.) #16739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e568da9
Enable supervisord for other cloud providers.
dchen1107 Nov 3, 2015
06733bd
Remove monit related salt files.
dchen1107 Nov 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 0 additions & 9 deletions cluster/saltbase/salt/monit/docker
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions cluster/saltbase/salt/monit/init.sls
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions cluster/saltbase/salt/monit/kube-addons
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions cluster/saltbase/salt/monit/kube-proxy
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions cluster/saltbase/salt/monit/kubelet
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions cluster/saltbase/salt/monit/monit_watcher.sh
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions cluster/saltbase/salt/top.sls
View file
Open in desktop
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