From 0d4b4b58b2e6d980bd659d512ea23bd79fc7e7eb Mon Sep 17 00:00:00 2001
From: Edwin Lawrance <Edwin.Lawrance@amdocs.com>
Date: Thu, 2 Aug 2018 15:57:13 +0100
Subject: Updating ElasticSearch version to 6.1.2

Setting the correct image path
Adding config files
Updating elasticsearch yml config for 6.1.2

Change-Id: I1795d2c4201657377cc06f5fb6914ed5b93f3c24
Issue-ID: AAI-1440
Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>
---
 .../aai/charts/aai-elasticsearch/templates/configmap.yaml |  2 +-
 .../charts/aai-elasticsearch/templates/deployment.yaml    | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'kubernetes/aai/charts/aai-elasticsearch/templates')

diff --git a/kubernetes/aai/charts/aai-elasticsearch/templates/configmap.yaml b/kubernetes/aai/charts/aai-elasticsearch/templates/configmap.yaml
index 4fe634c838..c60b8f2da8 100644
--- a/kubernetes/aai/charts/aai-elasticsearch/templates/configmap.yaml
+++ b/kubernetes/aai/charts/aai-elasticsearch/templates/configmap.yaml
@@ -25,5 +25,5 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-{{ tpl (.Files.Glob "resources/config/elasticsearch.yml").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
 #{{ end }}
diff --git a/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml b/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
index a6c93b8ea0..24cdb921b2 100644
--- a/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
@@ -39,9 +39,10 @@ spec:
         - /bin/sh
         - -c
         - |
-          mkdir -p /logroot/elasticsearch/es-data
-          chmod -R 777 /logroot/elasticsearch/es-data
-          chown -R root:root /logroot
+          mkdir -p /logroot/elasticsearch/logs
+          mkdir -p /logroot/elasticsearch/data
+          chmod -R 777 /logroot/elasticsearch
+          chown -R 1000:1000 /logroot
         env:
         - name: NAMESPACE
           valueFrom:
@@ -59,7 +60,7 @@ spec:
       hostname: {{ include "common.name" . }}
       containers:
       - name: {{ include "common.name" . }}
-        image: {{ .Values.global.dockerhubRepository | default .Values.dockerhubRepository }}/{{ .Values.image }}
+        image: {{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         ports:
         - containerPort: {{ .Values.service.internalPort }}
@@ -84,6 +85,12 @@ spec:
           - name: elasticsearch-config
             subPath: elasticsearch.yml
             mountPath: /usr/share/elasticsearch/config/elasticsearch.yml
+          - name: elasticsearch-config
+            subPath: jvm.options
+            mountPath: /usr/share/elasticsearch/config/jvm.options
+          - name: elasticsearch-config
+            subPath: log4j2.properties
+            mountPath: /usr/share/elasticsearch/config/log4j2.properties
           - name: elasticsearch-data
             mountPath: /usr/share/elasticsearch/data
         resources:
-- 
cgit 1.2.3-korg