mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-28 01:34:19 +00:00
fe323ae003
Automatic merge from submit-queue (batch tested with PRs 43254, 43255, 43184, 42509) Re-add kube_proxy to the abac file (Match what we had in 1.5). **What this PR does / why we need it**: Make the ABAC file match what it was in 1.5. GKE rewrites the ABAC file every time, so we were clobbering the kube_proxy entry that used to exist. This would have gone unnoticed, but a separate bug in GKE is causing the token file rewrites to fail on GKE (meaning group used in RBAC aren't there). **Which issue this PR fixes** fixes #42746 @liggitt @krousey
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 |
| 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 |