From 62927a13cd4b1457d1ebfbd838a4cba145aa9c98 Mon Sep 17 00:00:00 2001 From: Mukul Date: Tue, 11 Sep 2018 11:42:00 +0000 Subject: Resource Limits for multicloud Issue-ID: OOM-1155 Change-Id: Ie727d224eb0ffbd619b46cf66d765b0b0afd454e Signed-off-by: Mukul --- kubernetes/multicloud/templates/deployment.yaml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'kubernetes/multicloud/templates/deployment.yaml') diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml index 84a8cc208b..5c524fb936 100644 --- a/kubernetes/multicloud/templates/deployment.yaml +++ b/kubernetes/multicloud/templates/deployment.yaml @@ -53,6 +53,8 @@ spec: value: "{{ .Values.config.aai.username }}" - name: AAI_PASSWORD value: "{{ .Values.config.aai.password }}" + resources: +{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }} @@ -94,17 +96,6 @@ spec: name: framework-log - mountPath: /usr/share/filebeat/data name: framework-data-filebeat - 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: framework-log emptyDir: {} -- cgit 1.2.3-korg