github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18889 from gmarek/fix-kube-down

Browse Source 
Don't fail kube-down if no MIGs are present
This commit is contained in:
Wojciech Tyczynski 2015-12-18 13:16:52 +01:00
commit f842b53078
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/gce/util.sh
View File

@ -234,7 +234,7 @@ function upload-server-tars() {
function detect-node-names { function detect-node-names {
detect-project detect-project
INSTANCE_GROUPS=() INSTANCE_GROUPS=()
INSTANCE_GROUPS+=($(gcloud compute instance-groups managed list --zone "${ZONE}" --project "${PROJECT}" | grep ${NODE_INSTANCE_PREFIX} | cut -f1 -d" ")) INSTANCE_GROUPS+=($(gcloud compute instance-groups managed list --zone "${ZONE}" --project "${PROJECT}" | grep ${NODE_INSTANCE_PREFIX} | cut -f1 -d" " || true))
NODE_NAMES=() NODE_NAMES=()
if [[ -n "${INSTANCE_GROUPS[@]:-}" ]]; then if [[ -n "${INSTANCE_GROUPS[@]:-}" ]]; then
for group in "${INSTANCE_GROUPS[@]}"; do for group in "${INSTANCE_GROUPS[@]}"; do
@ -851,7 +851,7 @@ function kube-down {
| grep "${NODE_INSTANCE_PREFIX}-group" \ | grep "${NODE_INSTANCE_PREFIX}-group" \
| awk '{print $7}') ) | awk '{print $7}') )
if [[ "${autoscaler:-}" == "yes" ]]; then if [[ "${autoscaler:-}" == "yes" ]]; then
for group in ${INSTANCE_GROUPS[@]}; do for group in ${INSTANCE_GROUPS[@]:-}; do
gcloud compute instance-groups managed stop-autoscaling "${group}" --zone "${ZONE}" --project "${PROJECT}" gcloud compute instance-groups managed stop-autoscaling "${group}" --zone "${ZONE}" --project "${PROJECT}"
done done
fi fi
@ -863,7 +863,7 @@ function kube-down {
# 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.
for group in ${INSTANCE_GROUPS[@]}; do for group in ${INSTANCE_GROUPS[@]:-}; do
if gcloud compute instance-groups managed describe "${group}" --project "${PROJECT}" --zone "${ZONE}" &>/dev/null; then if gcloud compute instance-groups managed describe "${group}" --project "${PROJECT}" --zone "${ZONE}" &>/dev/null; then
deleteCmdOutput=$(gcloud compute instance-groups managed delete --zone "${ZONE}" \ deleteCmdOutput=$(gcloud compute instance-groups managed delete --zone "${ZONE}" \
--project "${PROJECT}" \ --project "${PROJECT}" \
@ -1126,7 +1126,7 @@ function prepare-push() {
create-node-instance-template $tmp_template_name create-node-instance-template $tmp_template_name
local template_name="${NODE_INSTANCE_PREFIX}-template" local template_name="${NODE_INSTANCE_PREFIX}-template"
for group in ${INSTANCE_GROUPS[@]}; do for group in ${INSTANCE_GROUPS[@]:-}; do
gcloud compute instance-groups managed \ gcloud compute instance-groups managed \
set-instance-template "${group}" \ set-instance-template "${group}" \
--template "$tmp_template_name" \ --template "$tmp_template_name" \
@ -1141,7 +1141,7 @@ function prepare-push() {
create-node-instance-template "$template_name" create-node-instance-template "$template_name"
for group in ${INSTANCE_GROUPS[@]}; do for group in ${INSTANCE_GROUPS[@]:-}; do
gcloud compute instance-groups managed \ gcloud compute instance-groups managed \
set-instance-template "${group}" \ set-instance-template "${group}" \
--template "$template_name" \ --template "$template_name" \