Skip to content

Commit

Permalink
Use external elasticsearch cluster
Browse files Browse the repository at this point in the history
  • Loading branch information
singhpratyush committed Jul 27, 2017
1 parent fcfdd9b commit 4b6a158
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 40 deletions.
8 changes: 5 additions & 3 deletions kubernetes/images/development/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@ ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8

WORKDIR /loklak_server

# Packages
RUN apk update && apk add openjdk8 git bash && \
git clone https://github.com/loklak/loklak_server.git /loklak_server && \
git checkout development && \
./gradlew build -x test -x checkstyleTest -x checkstyleMain -x jacocoTestReport && \
sed -i.bak 's/^\(port.http=\).*/\180/' conf/config.properties && \
sed -i.bak 's/^\(port.https=\).*/\1443/' conf/config.properties && \
sed -i.bak 's/^\(port.http=\).*/\180/' conf/config.properties && \
sed -i.bak 's/^\(port.https=\).*/\1443/' conf/config.properties && \
sed -i.bak 's/^\(upgradeInterval=\).*/\186400000000/' conf/config.properties && \
sed -i.bak 's/^\(elasticsearch_transport.enabled\).*/\1=true/' conf/config.properties && \
sed -i.bak 's/^\(elasticsearch_transport.addresses\).*/\1=elasticsearch.elasticsearch:9300/' conf/config.properties && \
echo "while true; do sleep 10;done" >> bin/start.sh && \
cat conf/config.properties && \
rm -rf .[^.] .??*

# Start
Expand Down
12 changes: 0 additions & 12 deletions kubernetes/yamls/development/api-server/api-claim.yml

This file was deleted.

9 changes: 1 addition & 8 deletions kubernetes/yamls/development/api-server/api-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ spec:
server: primary
containers:
- name: server
image: singhpratyush/loklak_server:latest-kubernetes-dev
volumeMounts:
- mountPath: /loklak_server/data
name: data-index
image: singhpratyush/loklak_server:latest-ext-es-kubernetes-dev
livenessProbe:
httpGet:
path: /api/status.json
Expand All @@ -28,7 +25,3 @@ spec:
ports:
- containerPort: 80
protocol: TCP
volumes:
- name: data-index
persistentVolumeClaim:
claimName: server-data-claim
17 changes: 0 additions & 17 deletions kubernetes/yamls/development/api-server/api-persistence.yml

This file was deleted.

4 changes: 4 additions & 0 deletions kubernetes/yamls/development/elasticsearch/00-namespace.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: elasticsearch
54 changes: 54 additions & 0 deletions kubernetes/yamls/development/elasticsearch/es-rc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: es
namespace: elasticsearch
labels:
component: elasticsearch
spec:
replicas: 1
template:
metadata:
labels:
component: elasticsearch
spec:
serviceAccount: elasticsearch
containers:
- name: es
securityContext:
capabilities:
add:
- IPC_LOCK
image: quay.io/pires/docker-elasticsearch-kubernetes:2.0.0
env:
- name: KUBERNETES_CA_CERTIFICATE_FILE
value: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: "CLUSTER_NAME"
value: "loklakcluster"
- name: "DISCOVERY_SERVICE"
value: "elasticsearch"
- name: NODE_MASTER
value: "true"
- name: NODE_DATA
value: "true"
- name: HTTP_ENABLE
value: "true"
ports:
- containerPort: 9200
name: http
protocol: TCP
- containerPort: 9300
name: transport
protocol: TCP
volumeMounts:
- mountPath: /data
name: storage
volumes:
- name: storage
gcePersistentDisk:
pdName: data-index-disk
fsType: ext4
17 changes: 17 additions & 0 deletions kubernetes/yamls/development/elasticsearch/es-svc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: v1
kind: Service
metadata:
name: elasticsearch
namespace: elasticsearch
labels:
component: elasticsearch
spec:
selector:
component: elasticsearch
ports:
- name: http
port: 9200
protocol: TCP
- name: transport
port: 9300
protocol: TCP
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: elasticsearch
namespace: elasticsearch

0 comments on commit 4b6a158

Please sign in to comment.