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

GKE: Fix unbound variable when pd.sh fails

Browse Source 
In the other providers, MINION_NAMES is bound early and detect_minions
is actually only used to detect the IPs of the minions, which is why I
didn't expect to need to call it. Move the initialization to
config-common.sh in GKE as well.

This follows the pattern of cluster/gce/config-{default,test}.sh
This commit is contained in:
Zach Loafman
2015-01-14 12:17:12 -08:00
parent 21e81de190
commit 8cf93288fa
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/gke/config-common.sh
View File

@@ -21,6 +21,7 @@
MASTER_NAME="k8s-${CLUSTER_NAME}-master" MASTER_NAME="k8s-${CLUSTER_NAME}-master"
ZONE="${ZONE:-us-central1-f}" ZONE="${ZONE:-us-central1-f}"
NUM_MINIONS="${NUM_MINIONS:-2}" NUM_MINIONS="${NUM_MINIONS:-2}"
MINION_NAMES=($(eval echo "k8s-${CLUSTER_NAME}-node-{1..${NUM_MINIONS}}"))
CLUSTER_API_VERSION="${CLUSTER_API_VERSION:-}" CLUSTER_API_VERSION="${CLUSTER_API_VERSION:-}"
# TODO(mbforbes): Actually plumb this through; this currently only works # TODO(mbforbes): Actually plumb this through; this currently only works
# because we use the 'default' network by default. # because we use the 'default' network by default.

7
cluster/gke/util.sh
View File

@@ -188,14 +188,9 @@ function detect-master() {
# NUM_MINIONS # NUM_MINIONS
# CLUSTER_NAME # CLUSTER_NAME
# Vars set: # Vars set:
# MINION_NAMES (array) # (none)
function detect-minions() { function detect-minions() {
echo "... in detect-minions()" >&2 echo "... in detect-minions()" >&2
# Just get the minion names.
MINION_NAMES=()
for (( i=1; i<=${NUM_MINIONS}; i++)); do
MINION_NAMES+=("k8s-${CLUSTER_NAME}-node-${i}")
done
} }
# SSH to a node by name ($1) and run a command ($2). # SSH to a node by name ($1) and run a command ($2).