From cfcd0e4d458aab6ca217cc666fa3621385b3d5e5 Mon Sep 17 00:00:00 2001
From: xuzhonghu <xuzhonghu@huawei.com>
Date: Sat, 9 Jun 2018 12:38:46 +0800
Subject: [PATCH] stop using deprecated --etcd-quorum-read

---
 cluster/gce/config-default.sh                    | 1 -
 cluster/gce/config-test.sh                       | 1 -
 cluster/gce/gci/configure-helper.sh              | 3 ---
 cluster/gce/util.sh                              | 5 -----
 cluster/kubemark/gce/config-default.sh           | 1 -
 test/kubemark/resources/start-kubemark-master.sh | 3 ---
 test/kubemark/start-kubemark.sh                  | 1 -
 7 files changed, 15 deletions(-)

diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
index 7306f934dbf..c7600253031 100755
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -106,7 +106,6 @@ CLUSTER_NAME="${CLUSTER_NAME:-${INSTANCE_PREFIX}}"
 MASTER_NAME="${INSTANCE_PREFIX}-master"
 AGGREGATOR_MASTER_NAME="${INSTANCE_PREFIX}-aggregator"
 INITIAL_ETCD_CLUSTER="${MASTER_NAME}"
-ETCD_QUORUM_READ="${ENABLE_ETCD_QUORUM_READ:-false}"
 MASTER_TAG="${INSTANCE_PREFIX}-master"
 NODE_TAG="${INSTANCE_PREFIX}-minion"
 
diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index 98c712d4f0f..0c30fefa202 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -101,7 +101,6 @@ CLUSTER_NAME="${CLUSTER_NAME:-${INSTANCE_PREFIX}}"
 MASTER_NAME="${INSTANCE_PREFIX}-master"
 AGGREGATOR_MASTER_NAME="${INSTANCE_PREFIX}-aggregator"
 INITIAL_ETCD_CLUSTER="${MASTER_NAME}"
-ETCD_QUORUM_READ="${ENABLE_ETCD_QUORUM_READ:-false}"
 MASTER_TAG="${INSTANCE_PREFIX}-master"
 NODE_TAG="${INSTANCE_PREFIX}-minion"
 
diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index 092b4becd84..4dd9534caa3 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1489,9 +1489,6 @@ function start-kube-apiserver {
   if [[ -n "${SERVICE_CLUSTER_IP_RANGE:-}" ]]; then
     params+=" --service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}"
   fi
-  if [[ -n "${ETCD_QUORUM_READ:-}" ]]; then
-    params+=" --etcd-quorum-read=${ETCD_QUORUM_READ}"
-  fi
   if [[ -n "${SERVICEACCOUNT_ISSUER:-}" ]]; then
     params+=" --service-account-issuer=${SERVICEACCOUNT_ISSUER}"
     params+=" --service-account-signing-key-file=${SERVICEACCOUNT_KEY_PATH}"
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index cf38be11728..eb9d21471b9 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -1091,11 +1091,6 @@ EOF
     if [ -n "${INITIAL_ETCD_CLUSTER_STATE:-}" ]; then
       cat >>$file <<EOF
 INITIAL_ETCD_CLUSTER_STATE: $(yaml-quote ${INITIAL_ETCD_CLUSTER_STATE})
-EOF
-    fi
-    if [ -n "${ETCD_QUORUM_READ:-}" ]; then
-      cat >>$file <<EOF
-ETCD_QUORUM_READ: $(yaml-quote ${ETCD_QUORUM_READ})
 EOF
     fi
     if [ -n "${CLUSTER_SIGNING_DURATION:-}" ]; then
diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh
index b042ac431e7..c58350e70bb 100644
--- a/cluster/kubemark/gce/config-default.sh
+++ b/cluster/kubemark/gce/config-default.sh
@@ -53,7 +53,6 @@ INSTANCE_PREFIX="${INSTANCE_PREFIX:-"default"}"
 MASTER_NAME="${INSTANCE_PREFIX}-kubemark-master"
 AGGREGATOR_MASTER_NAME="${INSTANCE_PREFIX}-kubemark-aggregator"
 MASTER_TAG="kubemark-master"
-ETCD_QUORUM_READ="${ENABLE_ETCD_QUORUM_READ:-false}"
 EVENT_STORE_NAME="${INSTANCE_PREFIX}-event-store"
 MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
 CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-$(get-cluster-ip-range)}"
diff --git a/test/kubemark/resources/start-kubemark-master.sh b/test/kubemark/resources/start-kubemark-master.sh
index a9465d6d5a2..724da3c399f 100755
--- a/test/kubemark/resources/start-kubemark-master.sh
+++ b/test/kubemark/resources/start-kubemark-master.sh
@@ -520,9 +520,6 @@ function compute-kube-apiserver-params {
 	if [[ -n "${STORAGE_MEDIA_TYPE:-}" ]]; then
 		params+=" --storage-media-type=${STORAGE_MEDIA_TYPE}"
 	fi
-	if [[ -n "${ETCD_QUORUM_READ:-}" ]]; then
-		params+=" --etcd-quorum-read=${ETCD_QUORUM_READ}"
-	fi
   if [[ -n "${ETCD_COMPACTION_INTERVAL_SEC:-}" ]]; then
     params+=" --etcd-compaction-interval=${ETCD_COMPACTION_INTERVAL_SEC}s"
   fi
diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index b8236bc133f..2062eb4d694 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -75,7 +75,6 @@ SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS:-}"
 APISERVER_TEST_ARGS="${APISERVER_TEST_ARGS:-}"
 STORAGE_MEDIA_TYPE="${STORAGE_MEDIA_TYPE:-}"
 STORAGE_BACKEND="${STORAGE_BACKEND:-etcd3}"
-ETCD_QUORUM_READ="${ETCD_QUORUM_READ:-}"
 ETCD_COMPACTION_INTERVAL_SEC="${ETCD_COMPACTION_INTERVAL_SEC:-}"
 RUNTIME_CONFIG="${RUNTIME_CONFIG:-}"
 NUM_NODES="${NUM_NODES:-}"