mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-11-28 03:47:34 +00:00
7228ac1984
Automatic merge from submit-queue Fixes #31056 This PR fixes the issue described in https://github.com/kubernetes/kubernetes/issues/31056 - In https://github.com/kubernetes/kubernetes/blob/master/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest#L82 there is a missing `+` after `" "` result: ``` ==> master: Summary ==> master: ------------- ==> master: Succeeded: 52 (changed=43) ==> master: Failed: 0 ==> master: ------------- ==> master: Total states run: 52 ```
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 | Azure |
|---|---|---|---|---|
| debian-auto-upgrades | M n | M n | M n | M n |
| docker | M n | M n | M n | M n |
| etcd | M | M | M | M |
| fluentd-es (pillar conditional) | M n | M n | M n | M n |
| fluentd-gcp (pillar conditional) | M n | M n | M n | M n |
| generate-cert | M | M | M | M |
| kube-addons | M | M | M | M |
| kube-apiserver | M | M | M | M |
| kube-controller-manager | M | M | M | M |
| kube-proxy | n | n | n | n |
| kube-scheduler | M | M | M | M |
| kubelet | M n | M n | M n | M n |
| logrotate | M n | n | M n | M n |
| supervisord | M n | M n | M n | M n |
| nginx | M | |||
| openvpn-client | n | |||
| openvpn | M | |||
| base | M n | M n | M n | M n |
| kube-client-tools | M | M | M | M |