mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #32873 from jszczepkowski/ha-delete-nodes2
Automatic merge from submit-queue 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.
This commit is contained in:
commit
87c2650038
@ -34,6 +34,7 @@ NODE_DISK_SIZE=${NODE_DISK_SIZE:-100GB}
|
||||
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
|
||||
PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
|
||||
PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
|
||||
KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true}
|
||||
|
||||
MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
|
||||
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}}
|
||||
|
@ -35,6 +35,7 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
|
||||
KUBE_APISERVER_REQUEST_TIMEOUT=300
|
||||
PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
|
||||
PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
|
||||
KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true}
|
||||
|
||||
MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
|
||||
NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian}}
|
||||
|
@ -1132,6 +1132,7 @@ function kube-down() {
|
||||
echo "Bringing down cluster"
|
||||
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
|
||||
# managed instance group. (The name of the managed instance group template may
|
||||
# change during a cluster upgrade.)
|
||||
@ -1160,6 +1161,7 @@ function kube-down() {
|
||||
"${template}"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
local -r REPLICA_NAME="$(get-replica-name)"
|
||||
|
||||
@ -1261,6 +1263,7 @@ function kube-down() {
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ "${KUBE_DELETE_NODES:-}" != "false" ]]; then
|
||||
# Find out what minions are running.
|
||||
local -a minions
|
||||
minions=( $(gcloud compute instances list \
|
||||
@ -1278,6 +1281,7 @@ function kube-down() {
|
||||
"${minions[@]::${batch}}"
|
||||
minions=( "${minions[@]:${batch}}" )
|
||||
done
|
||||
fi
|
||||
|
||||
# Delete routes.
|
||||
local -a routes
|
||||
|
Loading…
Reference in New Issue
Block a user