Run all components in one namespace

[oom.git] / kubernetes / aai / templates / elasticsearch-deployment.yaml

diff --git a/kubernetes/aai/templates/elasticsearch-deployment.yaml b/kubernetes/aai/templates/elasticsearch-deployment.yaml
index 1fc92ad..1babb05 100644 (file)
--- a/kubernetes/aai/templates/elasticsearch-deployment.yaml
+++ b/kubernetes/aai/templates/elasticsearch-deployment.yaml
@@ -1,21 +1,45 @@
+#{{ if not .Values.disableAaiElasticsearch }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: elasticsearch
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-elasticsearch
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.elasticsearchReplicas }}
   selector:
     matchLabels:
-      app: elasticsearch
+      app: aai-elasticsearch
   template:
     metadata:
       labels:
-        app: elasticsearch
-      name: elasticsearch
+        app: aai-elasticsearch
+      name: aai-elasticsearch
     spec:
-      hostname: elasticsearch
+      initContainers:
+      - command:
+        - /bin/sh
+        - -c
+        - |
+          mkdir -p /logroot/elasticsearch/es-data
+          chmod -R 777 /logroot/elasticsearch/es-data
+          chown -R root:root /logroot
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        securityContext:
+          privileged: true
+        image: {{ .Values.image.es_bb }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: init-sysctl
+        volumeMounts:
+        - name: elasticsearch-data
+          mountPath: /logroot/
+      hostname: aai-elasticsearch
       containers:
-      - name: elasticsearch
+      - name: aai-elasticsearch
         image: "{{ .Values.image.elasticsearchImage }}:{{ .Values.image.elasticsearchVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         ports:
@@ -30,6 +54,7 @@ spec:
           mountPath: /etc/localtime
           readOnly: true
         - name: elasticsearch-config
+          subPath: elasticsearch.yml
           mountPath: /usr/share/elasticsearch/config/elasticsearch.yml
         - name: elasticsearch-data
           mountPath: /usr/share/elasticsearch/data
@@ -38,10 +63,11 @@ spec:
         hostPath:
           path: /etc/localtime
       - name: elasticsearch-config
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/config/elasticsearch.yml"
+        configMap:
+          name: aai-elasticsearch-configmap
       - name: elasticsearch-data
         hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/es-data"
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/data"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}