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

Merge pull request #18678 from freehan/esmaster

Browse Source 
enforce node quorum to prevent es split brain problem
This commit is contained in:
Minhan Xia 2015-12-15 13:25:00 -08:00
commit ea34f453b8
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/es-controller.yaml
View File

@ -20,7 +20,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/elasticsearch:1.7 - image: gcr.io/google_containers/elasticsearch:1.8
name: elasticsearch-logging name: elasticsearch-logging
resources: resources:
limits: limits:

2
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View File

@ -2,7 +2,7 @@
# The current value of the tag to be used for building and # The current value of the tag to be used for building and
# pushing an image to gcr.io # pushing an image to gcr.io
TAG = 1.7 TAG = 1.8
build: elasticsearch_logging_discovery build: elasticsearch_logging_discovery
docker build -t gcr.io/google_containers/elasticsearch:$(TAG) . docker build -t gcr.io/google_containers/elasticsearch:$(TAG) .

1
cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml
View File

@ -4,4 +4,5 @@ node.data: ${NODE_DATA}
transport.tcp.port: ${TRANSPORT_PORT} transport.tcp.port: ${TRANSPORT_PORT}
http.port: ${HTTP_PORT} http.port: ${HTTP_PORT}
discovery.zen.ping.multicast.enabled: false discovery.zen.ping.multicast.enabled: false
discovery.zen.minimum_master_nodes: 2
path.data: /data path.data: /data