mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-12-03 04:06:14 +00:00
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