963aebd3e5
Automatic merge from submit-queue Add an entry to the salt config to allow Debian jessie on GCE. ```release-note Add an entry to the salt config to allow Debian jessie on GCE. As with the existing Wheezy image on GCE, docker is expected to already be installed in the image. ``` []()
This directory forms the base of the main SaltStack configuration. The
place to start with any SaltStack configuration is
top.sls. However, unless you are particularly keen on
reading Jinja templates, the following tables break down what
configurations run on what providers. (NB: The _states
directory is a special directory included by Salt for ensure blocks,
and is only used for the docker config.)
Key: M = Config applies to master, n = config applies to nodes
| Config | GCE | Vagrant | AWS |
|---|---|---|---|
| debian-auto-upgrades | M n | M n | M n |
| docker | M n | M n | M n |
| etcd | M | M | M |
| fluentd-es (pillar conditional) | M n | M n | M n |
| fluentd-gcp (pillar conditional) | M n | M n | M n |
| generate-cert | M | M | M |
| kube-addons | M | M | M |
| kube-apiserver | M | M | M |
| kube-controller-manager | M | M | M |
| kube-proxy | n | n | n |
| kube-scheduler | M | M | M |
| kubelet | M n | M n | M n |
| logrotate | M n | n | M n |
| supervisord | M n | M n | M n |
| base | M n | M n | M n |
| kube-client-tools | M | M | M |