Skip to content

Commit 58d0853

Browse files
authored
Merge pull request kubernetes#121875 from mborsz/gcloud
Use value(name) in gcloud compute instance-groups managed list-instances
2 parents 1bb2773 + 27dfe93 commit 58d0853

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cluster/gce/upgrade.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ function do-node-upgrade() {
406406
fi
407407
instances=()
408408
while IFS='' read -r line; do instances+=("$line"); done < <(gcloud compute instance-groups managed list-instances "${group}" \
409-
--format='value(instance)' \
409+
--format='value(name)' \
410410
--project="${PROJECT}" \
411411
--zone="${ZONE}" 2>&1) && list_instances_rc=$? || list_instances_rc=$?
412412
if [[ "${list_instances_rc}" != 0 ]]; then

cluster/gce/util.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ function detect-node-names() {
412412
for group in "${INSTANCE_GROUPS[@]}"; do
413413
kube::util::read-array NODE_NAMES < <(gcloud compute instance-groups managed list-instances \
414414
"${group}" --zone "${ZONE}" --project "${PROJECT}" \
415-
--format='value(instance)')
415+
--format='value(name)')
416416
done
417417
fi
418418
# Add heapster node name to the list too (if it exists).
@@ -425,7 +425,7 @@ function detect-node-names() {
425425
for group in "${WINDOWS_INSTANCE_GROUPS[@]}"; do
426426
kube::util::read-array WINDOWS_NODE_NAMES < <(gcloud compute instance-groups managed \
427427
list-instances "${group}" --zone "${ZONE}" --project "${PROJECT}" \
428-
--format='value(instance)')
428+
--format='value(name)')
429429
done
430430
fi
431431
export WINDOWS_NODE_NAMES

0 commit comments

Comments
 (0)