commit 4136f5d8e1bfe9b967266ff7f57787871748ddcc
author vaibhavjayas <vaibhav.jayas@amdocs.com> Fri Aug 17 07:01:05 2018 +0000
committer vaibhavjayas <vaibhav.jayas@amdocs.com> Wed Sep 19 11:13:26 2018 +0000
tree 42d1e19c467264ca5b7a3752fddfe0649aaf02ae
parent 908fc8cb12a093a7b81fc4f8a938fafbdd9356d8

Resource Limits for policy

Issue-ID: OOM-1158

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

kubernetes/policy/templates/deployment.yaml

diff --git a/kubernetes/policy/templates/deployment.yaml b/kubernetes/policy/templates/deployment.yaml
index cc7728f..bcd2551 100644
--- a/kubernetes/policy/templates/deployment.yaml
+++ b/kubernetes/policy/templates/deployment.yaml
@@ -54,6 +54,8 @@
           name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          resources:
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
           ports:
           - containerPort: {{ .Values.service.externalPort }}
           - containerPort: {{ .Values.service.externalPort2 }}
@@ -126,16 +128,6 @@
             name: policy-logs
           - mountPath: /usr/share/filebeat/data
             name: policy-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: localtime
           hostPath: