Skip to content

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

Merge pull request #37285 from jszczepkowski/ha-lbfix

Automatic merge from submit-queue HA master, fixed replica name when creating load balancer. HA master, fixed replica name when creating load balancer. Was broken when replica w/o suffix was no longer in the cluster.
parents acb8a3f7 ef91e2bb
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
cluster/gce/util.sh
View file @ 1a377f1b
...@@ -1008,17 +1008,20 @@ function create-loadbalancer() { ...@@ -1008,17 +1008,20 @@ function create-loadbalancer() {
echo "Load balancer already exists" echo "Load balancer already exists"
return return
fi fi
local EXISTING_MASTER_ZONE=$(gcloud compute instances list "${MASTER_NAME}" \
local EXISTING_MASTER_NAME="$(get-all-replica-names)"
local EXISTING_MASTER_ZONE=$(gcloud compute instances list "${EXISTING_MASTER_NAME}" \
--project "${PROJECT}" --format="value(zone)") --project "${PROJECT}" --format="value(zone)")
echo "Creating load balancer in front of an already existing master in ${EXISTING_MASTER_ZONE}" echo "Creating load balancer in front of an already existing master in ${EXISTING_MASTER_ZONE}"
# Step 1: Detach master IP address and attach ephemeral address to the existing master # Step 1: Detach master IP address and attach ephemeral address to the existing master
attach-external-ip ${MASTER_NAME} ${EXISTING_MASTER_ZONE} attach-external-ip "${EXISTING_MASTER_NAME}" "${EXISTING_MASTER_ZONE}"
# Step 2: Create target pool. # Step 2: Create target pool.
gcloud compute target-pools create "${MASTER_NAME}" --region "${REGION}" gcloud compute target-pools create "${MASTER_NAME}" --region "${REGION}"
# TODO: We should also add master instances with suffixes # TODO: We should also add master instances with suffixes
gcloud compute target-pools add-instances ${MASTER_NAME} --instances ${MASTER_NAME} --zone ${EXISTING_MASTER_ZONE} gcloud compute target-pools add-instances "${MASTER_NAME}" --instances "${EXISTING_MASTER_NAME}" --zone "${EXISTING_MASTER_ZONE}"
# Step 3: Create forwarding rule. # Step 3: Create forwarding rule.
# TODO: This step can take up to 20 min. We need to speed this up... # TODO: This step can take up to 20 min. We need to speed this up...
......
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