From b4c72e56ce0af28bd4edab0bc445a08351af7675 Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Mon, 14 Dec 2015 13:07:23 -0800 Subject: [PATCH] enforce node quorum to prevent es split brain problem --- cluster/addons/fluentd-elasticsearch/es-controller.yaml | 2 +- cluster/addons/fluentd-elasticsearch/es-image/Makefile | 2 +- cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml b/cluster/addons/fluentd-elasticsearch/es-controller.yaml index 6631153a56e..28f22fc39c1 100644 --- a/cluster/addons/fluentd-elasticsearch/es-controller.yaml +++ b/cluster/addons/fluentd-elasticsearch/es-controller.yaml @@ -20,7 +20,7 @@ spec: kubernetes.io/cluster-service: "true" spec: containers: - - image: gcr.io/google_containers/elasticsearch:1.7 + - image: gcr.io/google_containers/elasticsearch:1.8 name: elasticsearch-logging resources: limits: diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Makefile b/cluster/addons/fluentd-elasticsearch/es-image/Makefile index 249d16fc04b..fc10b328acb 100755 --- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile @@ -2,7 +2,7 @@ # The current value of the tag to be used for building and # pushing an image to gcr.io -TAG = 1.7 +TAG = 1.8 build: elasticsearch_logging_discovery docker build -t gcr.io/google_containers/elasticsearch:$(TAG) . diff --git a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml index 8de4f124cc7..35d90b4437d 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml +++ b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml @@ -4,4 +4,5 @@ node.data: ${NODE_DATA} transport.tcp.port: ${TRANSPORT_PORT} http.port: ${HTTP_PORT} discovery.zen.ping.multicast.enabled: false +discovery.zen.minimum_master_nodes: 2 path.data: /data