From 659fbae6b585913e892e077312d418f3cb954e64 Mon Sep 17 00:00:00 2001 From: vaibhavjayas Date: Wed, 19 Sep 2018 08:58:10 +0000 Subject: Resource Limit for LOG Issue-ID: OOM-1153 Change-Id: Icd62d392b2e2a275a273b7f6260ad39d68987f50 Signed-off-by: vaibhavjayas --- .../log/charts/log-elasticsearch/templates/deployment.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to '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 06e1b6b57d..5ff01b8274 100644 --- a/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml +++ b/kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml @@ -59,6 +59,8 @@ spec: - 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 @@ spec: 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: -- cgit 1.2.3-korg