Skip to content

K
k3s
Commit 58c89925 authored by Jerzy Szczepkowski's avatar Jerzy Szczepkowski
Browse files
Options

Implemented KUBE_DELETE_NODES flag in kube-down.

Implemented KUBE_DELETE_NODES flag in kube-down script. It prevents removal of nodes when shutting down a HA master replica.
parent 8f4c0bbc
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
cluster/gce/config-default.sh
View file @ 58c89925
...@@ -34,6 +34,7 @@ NODE_DISK_SIZE=${NODE_DISK_SIZE:-100GB} ...@@ -34,6 +34,7 @@ NODE_DISK_SIZE=${NODE_DISK_SIZE:-100GB}
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true} REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false} PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false} PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true}
MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
......
cluster/gce/config-test.sh
View file @ 58c89925
...@@ -35,6 +35,7 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true} ...@@ -35,6 +35,7 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
KUBE_APISERVER_REQUEST_TIMEOUT=300 KUBE_APISERVER_REQUEST_TIMEOUT=300
PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false} PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false} PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true}
MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
......
cluster/gce/util.sh
View file @ 58c89925
...@@ -1127,6 +1127,7 @@ function kube-down() { ...@@ -1127,6 +1127,7 @@ function kube-down() {
echo "Bringing down cluster" echo "Bringing down cluster"
set +e # Do not stop on error set +e # Do not stop on error
if [[ "${KUBE_DELETE_NODES:-}" != "false" ]]; then
# 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.)
...@@ -1155,6 +1156,7 @@ function kube-down() { ...@@ -1155,6 +1156,7 @@ function kube-down() {
"${template}" "${template}"
fi fi
done done
fi
local -r REPLICA_NAME="$(get-replica-name)" local -r REPLICA_NAME="$(get-replica-name)"
...@@ -1254,6 +1256,7 @@ function kube-down() { ...@@ -1254,6 +1256,7 @@ function kube-down() {
fi fi
fi fi
if [[ "${KUBE_DELETE_NODES:-}" != "false" ]]; then
# Find out what minions are running. # Find out what minions are running.
local -a minions local -a minions
minions=( $(gcloud compute instances list \ minions=( $(gcloud compute instances list \
...@@ -1271,6 +1274,7 @@ function kube-down() { ...@@ -1271,6 +1274,7 @@ function kube-down() {
"${minions[@]::${batch}}" "${minions[@]::${batch}}"
minions=( "${minions[@]:${batch}}" ) minions=( "${minions[@]:${batch}}" )
done done
fi
# Delete routes. # Delete routes.
local -a routes local -a routes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment