github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31692 from jszczepkowski/master

Browse Source 
Automatic merge from submit-queue

Marked HA master feature experimental.

Marked HA master feature experimental.
This commit is contained in:
Kubernetes Submit Queue 2016-08-30 07:09:49 -07:00 committed by GitHub
commit 3ccb99d87d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/util.sh
View File

@ -610,7 +610,7 @@ function kube-up() {
if [[ ${KUBE_USE_EXISTING_MASTER:-} == "true" ]]; then if [[ ${KUBE_USE_EXISTING_MASTER:-} == "true" ]]; then
parse-master-env parse-master-env
create-nodes create-nodes
elif [[ ${KUBE_REPLICATE_EXISTING_MASTER:-} == "true" ]]; then elif [[ ${KUBE_EXPERIMENTAL_REPLICATE_EXISTING_MASTER:-} == "true" ]]; then
# TODO(jsz): implement adding replica for other distributions. # TODO(jsz): implement adding replica for other distributions.
if [[ "${MASTER_OS_DISTRIBUTION}" != "gci" ]]; then if [[ "${MASTER_OS_DISTRIBUTION}" != "gci" ]]; then
echo "Master replication supported only for gci" echo "Master replication supported only for gci"
@ -782,7 +782,7 @@ function replicate-master() {
set-replica-name set-replica-name
set-existing-master set-existing-master
echo "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 4001 2380; then