github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +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
commit 8e5f3a3f9b
3 changed files with 6 additions and 8 deletions
Show Stats 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 | Config | GCE | Vagrant | AWS |
----------------------------------------------------|-------|---------|-----| ----------------------------------------------------|-------|---------|-----|
[cadvisor](cadvisor/) | M n | M n | M n |
[debian-auto-upgrades](debian-auto-upgrades/) | 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 | [docker](docker/) | M n | M n | M n |
[etcd](etcd/) | M | M | M | [etcd](etcd/) | M | M | M |
@ -24,8 +23,7 @@ Config | GCE | Vagrant | AWS |
[kube-scheduler](kube-scheduler/) | M | M | M | [kube-scheduler](kube-scheduler/) | M | M | M |
[kubelet](kubelet/) | M n | M n | M n | [kubelet](kubelet/) | M n | M n | M n |
[logrotate](logrotate/) | M n | n | M n | [logrotate](logrotate/) | M n | n | M n |
[monit](monit/) | M n | M n | M n | [supervisord](supervisor/) | M n | M n | M n |
[nginx](nginx/) | M | M | M |
[static-routes](static-routes/) (vsphere only) | | | | [static-routes](static-routes/) (vsphere only) | | | |
[base](base.sls) | M n | M n | M n | [base](base.sls) | M n | M n | M n |
[kube-client-tools](kube-client-tools.sls) | M | M | M | [kube-client-tools](kube-client-tools.sls) | M | M | M |

6
docs/admin/cluster-components.md
View File

@ -53,7 +53,7 @@ Documentation for other releases can be found at
- [kube-proxy](#kube-proxy) - [kube-proxy](#kube-proxy)
- [docker](#docker) - [docker](#docker)
- [rkt](#rkt) - [rkt](#rkt)
- [monit](#monit) - [supervisord](#supervisord)
- [fluentd](#fluentd) - [fluentd](#fluentd)
<!-- END MUNGE: GENERATED_TOC --> <!-- END MUNGE: GENERATED_TOC -->
@ -190,9 +190,9 @@ network rules on the host and performing connection forwarding.
`rkt` is supported experimentally as an alternative to docker. `rkt` is supported experimentally as an alternative to docker.
### monit ### supervisord
`monit` is a lightweight process babysitting system for keeping kubelet and docker `supervisord` is a lightweight process babysitting system for keeping kubelet and docker
running. running.
### fluentd ### fluentd

4
docs/getting-started-guides/scratch.md
View File

@ -376,7 +376,7 @@ options, you may have a Docker-created bridge and iptables rules. You may want
as follows before proceeding to configure Docker for Kubernetes. as follows before proceeding to configure Docker for Kubernetes.
```sh ```sh
iptables -t nat -F iptables -t nat -F
ifconfig docker0 down ifconfig docker0 down
brctl delbr docker0 brctl delbr docker0
``` ```
@ -500,7 +500,7 @@ traffic to the internet, but have no problem with them inside your GCE Project.
- Enable auto-upgrades for your OS package manager, if desired. - Enable auto-upgrades for your OS package manager, if desired.
- Configure log rotation for all node components (e.g. using [logrotate](http://linux.die.net/man/8/logrotate)). - Configure log rotation for all node components (e.g. using [logrotate](http://linux.die.net/man/8/logrotate)).
- Setup liveness-monitoring (e.g. using [monit](http://linux.die.net/man/1/monit)). - Setup liveness-monitoring (e.g. using [supervisord](http://supervisord.org/)).
- Setup volume plugin support (optional) - Setup volume plugin support (optional)
- Install any client binaries for optional volume types, such as `glusterfs-client` for GlusterFS - Install any client binaries for optional volume types, such as `glusterfs-client` for GlusterFS
volumes. volumes.