commit 659fbae6b585913e892e077312d418f3cb954e64
author vaibhavjayas <vaibhav.jayas@amdocs.com> Wed Sep 19 08:58:10 2018 +0000
committer vaibhavjayas <vaibhav.jayas@amdocs.com> Wed Sep 19 09:03:32 2018 +0000
tree 0cf44b70e498faa7446463b342e6c101ffc75cf8
parent c196546bae5346d162b3fb20de96d9df8fe260ca

Resource Limit for LOG

Issue-ID: OOM-1153

Change-Id: Icd62d392b2e2a275a273b7f6260ad39d68987f50
Signed-off-by: vaibhavjayas <vaibhav.jayas@amdocs.com>

kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml

diff --git a/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml b/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
index 06e1b6b..5ff01b8 100644
--- a/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml
@@ -59,6 +59,8 @@
         - name: {{ include "common.name" . }}
           image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          resources:
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
             name: {{ .Values.service.name }}
@@ -88,16 +90,6 @@
             subPath: elasticsearch.yml
           - mountPath: /usr/share/elasticsearch/data/
             name: {{ include "common.fullname" . }}-data
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-        {{- if .Values.nodeSelector }}
-        nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 10 }}
-        {{- end -}}
-        {{- if .Values.affinity }}
-        affinity:
-{{ toYaml .Values.affinity | indent 10 }}
-        {{- end }}
       volumes:
         - name: localtime
           hostPath: