commit 62927a13cd4b1457d1ebfbd838a4cba145aa9c98
author Mukul <mukul.joshi@amdocs.com> Tue Sep 11 11:42:00 2018 +0000
committer Mandeep Khinda <Mandeep.Khinda@amdocs.com> Wed Sep 12 14:29:06 2018 +0000
tree 74e48b8e2a98ac466efdc421953458c091ce5b6b
parent 908fc8cb12a093a7b81fc4f8a938fafbdd9356d8

Resource Limits for multicloud

Issue-ID: OOM-1155

Change-Id: Ie727d224eb0ffbd619b46cf66d765b0b0afd454e
Signed-off-by: Mukul <mukul.joshi@amdocs.com>

kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml

diff --git a/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
index ba249be..1c91e8a 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
@@ -62,6 +62,8 @@
        - mountPath: /opt/ocata/ocata/pub/config/log.yml
          name: ocata-logconfig
          subPath: log.yml
+       resources:
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        ports:
@@ -80,17 +82,6 @@
          successThreshold: {{ .Values.liveness.successThreshold }}
          failureThreshold: {{ .Values.liveness.failureThreshold }}
        {{ end }}
-       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 }}
-
      # side car containers
      - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}