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

Merge pull request #21673 from gmarek/kube-down

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
Justin Santa Barbara 2016-02-27 19:21:18 -05:00
commit ee58dc22d7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cluster/gce/util.sh
View File

@ -829,7 +829,7 @@ function kube-down {
# Get the name of the managed instance group template before we delete the # Get the name of the managed instance group template before we delete the
# managed instance group. (The name of the managed instance group template may # managed instance group. (The name of the managed instance group template may
# change during a cluster upgrade.) # change during a cluster upgrade.)
local template=$(get-template "${PROJECT}" "${ZONE}" "${NODE_INSTANCE_PREFIX}-group") local template=$(get-template "${PROJECT}")
# The gcloud APIs don't return machine parseable error codes/retry information. Therefore the best we can # The gcloud APIs don't return machine parseable error codes/retry information. Therefore the best we can
# do is parse the output and special case particular responses we are interested in. # do is parse the output and special case particular responses we are interested in.
@ -961,18 +961,18 @@ function kube-down {
set -e set -e
} }
# Gets the instance template for the managed instance group with the provided # Gets the instance template for given NODE_INSTANCE_PREFIX. It echos the template name so that the function
# project, zone, and group name. It echos the template name so that the function
# output can be used. # output can be used.
# Assumed vars:
# NODE_INSTANCE_PREFIX
# #
# $1: project # $1: project
# $2: zone # $2: zone
# $3: managed instance group name
function get-template { function get-template {
# url is set to https://www.googleapis.com/compute/v1/projects/$1/global/instanceTemplates/<template> local template=""
local url=$(gcloud compute instance-groups managed describe --project="${1}" --zone="${2}" "${3}" | grep instanceTemplate) if [[ -n $(gcloud compute instance-templates list "${NODE_INSTANCE_PREFIX}"-template --project="${1}" | grep template) ]]; then
# template is set to <template> (the pattern strips off all but last slash) template="${NODE_INSTANCE_PREFIX}"-template
local template="${url##*/}" fi
echo "${template}" echo "${template}"
} }