github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 14:14:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6103 from zmerlynn/remove_gce_node_names

Browse Source 
Remove the --machines SaltStack configuration on GCE
This commit is contained in:
Daniel Smith
2015-03-27 17:55:16 -07:00
parent 3bc933645b 68ccb97907
commit 525bbfd175
3 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/gce/util.sh
View File

@@ -600,18 +600,7 @@ function kube-up {
# command returns, but currently it returns before the instances come up due
# to gcloud's deficiency.
wait-for-minions-to-run
# Give the master an initial node list (it's waiting in
# startup). This resolves a bit of a chicken-egg issue: The minions
# need to know the master's ip, so we boot the master first. The
# master still needs to know the initial minion list (until all the
# pieces #156 are complete), so we have it wait on the minion
# boot. (The minions further wait until the loop below, where CIDRs
# get filled in.)
detect-minion-names
local kube_node_names
kube_node_names=$(IFS=,; echo "${MINION_NAMES[*]}")
add-instance-metadata "${MASTER_NAME}" "kube-node-names=${kube_node_names}"
# Create the routes and set IP ranges to instance metadata, 5 instances at a time.
for (( i=0; i<${#MINION_NAMES[@]}; i++)); do