Skip to content

K
k3s
Commit 7419e27e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #32658 from jszczepkowski/ha-kubedown-fix

Automatic merge from submit-queue Fixed #32366: wrong master pd name during kube-down.
parents 4c716023 529818c9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
cluster/gce/util.sh
View file @ 7419e27e
...@@ -1183,12 +1183,14 @@ function kube-down() { ...@@ -1183,12 +1183,14 @@ function kube-down() {
fi fi
# Delete the master replica pd (possibly leaked by kube-up if master create failed). # Delete the master replica pd (possibly leaked by kube-up if master create failed).
if gcloud compute disks describe "${REPLICA_NAME}"-pd --zone "${ZONE}" --project "${PROJECT}" &>/dev/null; then # TODO(jszczepkowski): remove also possibly leaked replicas' pds
local -r replica-pd="${REPLICA_NAME:-${MASTER_NAME}}-pd"
if gcloud compute disks describe "${replica-pd}" --zone "${ZONE}" --project "${PROJECT}" &>/dev/null; then
gcloud compute disks delete \ gcloud compute disks delete \
--project "${PROJECT}" \ --project "${PROJECT}" \
--quiet \ --quiet \
--zone "${ZONE}" \ --zone "${ZONE}" \
"${REPLICA_NAME}"-pd "${replica-pd}"
fi fi
# Delete disk for cluster registry if enabled # Delete disk for cluster registry if enabled
......
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