mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-11-03 07:11:01 +00:00
5788d4de1f
Automatic merge from submit-queue (batch tested with PRs 63792, 63495, 63742, 63332, 63779). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubeadm - fix upgrades with external etcd **What this PR does / why we need it**: - Allow for upgrade plan and upgrade apply to work with external etcd - https://github.com/kubernetes/kubeadm/issues/727 - https://github.com/kubernetes/kubernetes/pull/62141 - Update upgrade plan output when configured for external etcd - Move etcd to a separate section and show available upgrades **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes https://github.com/kubernetes/kubeadm/issues/727 **Release note**: ```release-note kubeadm upgrade now supports external etcd setups again ``` I created a gist documenting the manual testing I've been doing for this PR here: https://gist.github.com/detiber/e18d907c41901fbb5e12ffa1af5750f8