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 #121875 from mborsz/gcloud

Browse Source 
Use value(name) in gcloud compute instance-groups managed list-instances
This commit is contained in:
Kubernetes Prow Robot 2023-11-14 23:01:57 +01:00 committed by GitHub
commit 58d08534b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/upgrade.sh
View File

@ -406,7 +406,7 @@ function do-node-upgrade() {
fi fi
instances=() instances=()
while IFS='' read -r line; do instances+=("$line"); done < <(gcloud compute instance-groups managed list-instances "${group}" \ while IFS='' read -r line; do instances+=("$line"); done < <(gcloud compute instance-groups managed list-instances "${group}" \
--format='value(instance)' \ --format='value(name)' \
--project="${PROJECT}" \ --project="${PROJECT}" \
--zone="${ZONE}" 2>&1) && list_instances_rc=$? || list_instances_rc=$? --zone="${ZONE}" 2>&1) && list_instances_rc=$? || list_instances_rc=$?
if [[ "${list_instances_rc}" != 0 ]]; then if [[ "${list_instances_rc}" != 0 ]]; then

4
cluster/gce/util.sh
View File

@ -412,7 +412,7 @@ function detect-node-names() {
for group in "${INSTANCE_GROUPS[@]}"; do for group in "${INSTANCE_GROUPS[@]}"; do
kube::util::read-array NODE_NAMES < <(gcloud compute instance-groups managed list-instances \ kube::util::read-array NODE_NAMES < <(gcloud compute instance-groups managed list-instances \
"${group}" --zone "${ZONE}" --project "${PROJECT}" \ "${group}" --zone "${ZONE}" --project "${PROJECT}" \
--format='value(instance)') --format='value(name)')
done done
fi fi
# Add heapster node name to the list too (if it exists). # Add heapster node name to the list too (if it exists).
@ -425,7 +425,7 @@ function detect-node-names() {
for group in "${WINDOWS_INSTANCE_GROUPS[@]}"; do for group in "${WINDOWS_INSTANCE_GROUPS[@]}"; do
kube::util::read-array WINDOWS_NODE_NAMES < <(gcloud compute instance-groups managed \ kube::util::read-array WINDOWS_NODE_NAMES < <(gcloud compute instance-groups managed \
list-instances "${group}" --zone "${ZONE}" --project "${PROJECT}" \ list-instances "${group}" --zone "${ZONE}" --project "${PROJECT}" \
--format='value(instance)') --format='value(name)')
done done
fi fi
export WINDOWS_NODE_NAMES export WINDOWS_NODE_NAMES