mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-10-22 23:21:18 +00:00
Automatic merge from submit-queue (batch tested with PRs 42365, 42429, 41770, 42018, 35055)
Remove kube-dns ConfigMap modification code from federation-{up,down}.sh scripts
PR #39338 has merged now. This shouldn't be necessary. This unbreaks federation tests.
```release-note
NONE
```