Merge pull request #24162 from jlowdermilk/fix-log-dump

Automatic merge from submit-queue Fix log dump for new gcloud `gcloud compute instance-groups managed list-instances` at CI has self-link for instance instead of just name. Fixes #24120

Merge pull request #24162 from jlowdermilk/fix-log-dump
7daa26e5 · k8s-merge-robot · 04df711a · f8c135dc · 7daa26e5
Commit 7daa26e5 authored Apr 14, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

util.sh cluster/gke/util.sh +3 -0

No files found.
--- a/cluster/gke/util.sh
+++ b/cluster/gke/util.sh
@@ -236,6 +236,9 @@ function detect-node-names {
    "${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))
+
  echo "NODE_NAMES=${NODE_NAMES[*]}"
 }