mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-12-09 19:29:26 +00:00
Automatic merge from submit-queue AWS/GCE: Rework use of master name * Add a pillar for `hostname` (because even if there's a good Salt function for it, I don't trust it to return the short hostname) * Move `INITIAL_ETCD_CLUSTER` to just the GCE turn-up * Remove `master_name`, which isn't needed