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.

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

remove unused nginx salt #23311

Merged
merged 1 commit into from
Mar 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 0 additions & 64 deletions cluster/saltbase/salt/nginx/init.sls

This file was deleted.

66 changes: 0 additions & 66 deletions cluster/saltbase/salt/nginx/kubernetes-site

This file was deleted.

61 changes: 0 additions & 61 deletions cluster/saltbase/salt/nginx/nginx.conf

This file was deleted.

60 changes: 0 additions & 60 deletions cluster/saltbase/salt/nginx/nginx.json

This file was deleted.

3 changes: 0 additions & 3 deletions cluster/saltbase/salt/top.sls
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ base:
- kube-controller-manager
- kube-scheduler
- supervisor
{% if grains['cloud'] is defined and not grains.cloud in [ 'aws', 'gce', 'vagrant', 'vsphere'] %}
- nginx
{% endif %}
- cadvisor
- kube-client-tools
- kube-master-addons
Expand Down