github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24746 from ixdy/node-names

Browse Source 
Automatic merge from submit-queue

Make detect-node-names less brittle for G{C,K}E

Use the `--format='value()'` option with `gcloud compute instance-groups managed list{,-instances}` instead of `--format=yaml` with a series of `grep`s and `cut`s. This is hopefully a bit more stable.

Fixes #24120.

cc @kubernetes/sig-testing @jlowdermilk @freehan
This commit is contained in:
k8s-merge-robot 2016-04-25 17:32:49 -07:00
commit f1686ef4da
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/gce/util.sh
View File

@ -273,13 +273,16 @@ function upload-server-tars() {
function detect-node-names {
detect-project
INSTANCE_GROUPS=()
INSTANCE_GROUPS+=($(gcloud compute instance-groups managed list --zone "${ZONE}" --project "${PROJECT}" | grep ${NODE_INSTANCE_PREFIX} | cut -f1 -d" " || true))
INSTANCE_GROUPS+=($(gcloud compute instance-groups managed list \
--zone "${ZONE}" --project "${PROJECT}" \
--regexp "${NODE_INSTANCE_PREFIX}-.+" \
--format='value(instanceGroup)' || true))
NODE_NAMES=()
if [[ -n "${INSTANCE_GROUPS[@]:-}" ]]; then
for group in "${INSTANCE_GROUPS[@]}"; do
NODE_NAMES+=($(gcloud compute instance-groups managed list-instances \
"${group}" --zone "${ZONE}" --project "${PROJECT}" \
--format=yaml | grep instance: | cut -d ' ' -f 2))
--format='value(instance)'))
done
echo "INSTANCE_GROUPS=${INSTANCE_GROUPS[*]}" >&2
echo "NODE_NAMES=${NODE_NAMES[*]}" >&2

5
cluster/gke/util.sh
View File

@ -249,10 +249,7 @@ function detect-node-names {
detect-node-instance-group
NODE_NAMES=($(gcloud compute instance-groups managed list-instances \
"${NODE_INSTANCE_GROUP}" --zone "${ZONE}" --project "${PROJECT}" \
--format=yaml | grep instance: | cut -d ' ' -f 2))
# Strip path if return value is selflink
NODE_NAMES=($(for i in ${NODE_NAMES[@]}; do basename "$i"; done))
--format='value(instance)'))
echo "NODE_NAMES=${NODE_NAMES[*]}"
}