Skip to content
This repository was archived by the owner on Mar 1, 2019. It is now read-only.

update to elastic search 5.5.0 #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
FROM elasticsearch:2.4.0
FROM elasticsearch:5.5.2

RUN bin/plugin install lmenezes/elasticsearch-kopf/v2.1.2
RUN bin/plugin install io.fabric8/elasticsearch-cloud-kubernetes/2.4.0_01
RUN bin/elasticsearch-plugin install io.fabric8:elasticsearch-cloud-kubernetes:5.5.2

ENV BOOTSTRAP_MLOCKALL=false NODE_DATA=true NODE_MASTER=true JAVA_OPTS=-Djava.net.preferIPv4Stack=true
ENV BOOTSTRAP_MEMORY_LOCK=false NODE_DATA=true NODE_MASTER=true MINIMUM_MASTER_NODES=1 ES_JAVA_OPTS=-Djava.net.preferIPv4Stack=true

# pre-stop-hook.sh and dependencies
RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
IMAGE_NAME=simonswine/elasticsearch-pet
IMAGE_TAG=2.3.4
IMAGE_TAG=5.5.0
REPO=$(IMAGE_NAME):$(IMAGE_TAG)

build:
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ This image is using Fabric8's great work around the [kubernetes plugin](https://
## Changes for PetSet

- Use Pod's hostname as elasticsearch host name
- Add [kopf](https://github.com/lmenezes/elasticsearch-kopf) plugin as elasticsearch UI
- Handle downscales so that no data loss occurs (using lifecycle hooks)
17 changes: 9 additions & 8 deletions elasticsearch.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
node.data: ${NODE_DATA}
node.master: ${NODE_MASTER}
node.name: ${HOSTNAME}
node:
data: ${NODE_DATA}
master: ${NODE_MASTER}
name: ${HOSTNAME}

bootstrap.mlockall: ${BOOTSTRAP_MLOCKALL}
bootstrap:
memory_lock: ${BOOTSTRAP_MEMORY_LOCK}

network.host: 0.0.0.0

Expand All @@ -12,7 +14,6 @@ cloud:
namespace: ${KUBERNETES_NAMESPACE}

discovery:
type: kubernetes

path:
plugins: /usr/share/elasticsearch/plugins
zen:
minimum_master_nodes: ${MINIMUM_MASTER_NODES}
hosts_provider: kubernetes