Skip to content

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

Merge pull request #32204 from jszczepkowski/ha-port-fix

Automatic merge from submit-queue Updated port for HA master etcd.
parents 27c5e5dc 8541ea6c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cluster/gce/util.sh
View file @ 8f350198
...@@ -603,7 +603,7 @@ function kube-up() { ...@@ -603,7 +603,7 @@ function kube-up() {
create-loadbalancer create-loadbalancer
# If replication of master fails, we need to ensure that the replica is removed from etcd clusters. # If replication of master fails, we need to ensure that the replica is removed from etcd clusters.
if ! replicate-master; then if ! replicate-master; then
remove-replica-from-etcd 4001 || true remove-replica-from-etcd 2379 || true
remove-replica-from-etcd 4002 || true remove-replica-from-etcd 4002 || true
fi fi
else else
...@@ -769,7 +769,7 @@ function replicate-master() { ...@@ -769,7 +769,7 @@ function replicate-master() {
echo "Experimental: replicating existing master ${EXISTING_MASTER_ZONE}/${EXISTING_MASTER_NAME} as ${ZONE}/${REPLICA_NAME}" echo "Experimental: replicating existing master ${EXISTING_MASTER_ZONE}/${EXISTING_MASTER_NAME} as ${ZONE}/${REPLICA_NAME}"
# Before we do anything else, we should configure etcd to expect more replicas. # Before we do anything else, we should configure etcd to expect more replicas.
if ! add-replica-to-etcd 4001 2380; then if ! add-replica-to-etcd 2379 2380; then
echo "Failed to add master replica to etcd cluster." echo "Failed to add master replica to etcd cluster."
return 1 return 1
fi fi
...@@ -1161,7 +1161,7 @@ function kube-down() { ...@@ -1161,7 +1161,7 @@ function kube-down() {
set-existing-master set-existing-master
# Un-register the master replica from etcd and events etcd. # Un-register the master replica from etcd and events etcd.
remove-replica-from-etcd 4001 remove-replica-from-etcd 2379
remove-replica-from-etcd 4002 remove-replica-from-etcd 4002
# Delete the master replica (if it exists). # Delete the master replica (if it exists).
......
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