diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-09-19 14:42:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-19 14:42:13 +0000 |
| commit | 0e8836a0ba8bc0327a2513e8572c0ea351404576 (patch) | |
| tree | 05131c55f5dbcc3c2b6c7d4a88361d8aa1e7af89 /kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml | |
| parent | 7a745ca1374365854a8d69b1bdf2f24c1e472f3e (diff) | |
| parent | 659fbae6b585913e892e077312d418f3cb954e64 (diff) | |
Merge "Resource Limit for LOG"
Diffstat (limited to 'kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml')
| -rw-r--r-- | kubernetes/log/charts/log-elasticsearch/templates/deployment.yaml | 12 |
1 files changed, 2 insertions, 10 deletions
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: |