github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 16:06:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16761 from roberthbailey/supervisord

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-04 02:28:38 -08:00
parent ac63290ff5 d5bb12134e
commit 8e5f3a3f9b
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/saltbase/salt/README.md
View File

@@ -10,7 +10,6 @@ Key: M = Config applies to master, n = config applies to nodes
Config | GCE | Vagrant | AWS |
----------------------------------------------------|-------|---------|-----|
[cadvisor](cadvisor/) | M n | M n | M n |
[debian-auto-upgrades](debian-auto-upgrades/) | M n | M n | M n |
[docker](docker/) | M n | M n | M n |
[etcd](etcd/) | M | M | M |
@@ -24,8 +23,7 @@ Config | GCE | Vagrant | AWS |
[kube-scheduler](kube-scheduler/) | M | M | M |
[kubelet](kubelet/) | M n | M n | M n |
[logrotate](logrotate/) | M n | n | M n |
[monit](monit/) | M n | M n | M n |
[nginx](nginx/) | M | M | M |
[supervisord](supervisor/) | M n | M n | M n |
[static-routes](static-routes/) (vsphere only) | | | |
[base](base.sls) | M n | M n | M n |
[kube-client-tools](kube-client-tools.sls) | M | M | M |