summaryrefslogtreecommitdiffstats
path: root/kubernetes/multicloud/charts/multicloud-ocata/templates
diff options
context:
space:
mode:
authorMukul <mukul.joshi@amdocs.com>2018-09-11 11:42:00 +0000
committerMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-09-12 14:29:06 +0000
commit62927a13cd4b1457d1ebfbd838a4cba145aa9c98 (patch)
tree74e48b8e2a98ac466efdc421953458c091ce5b6b /kubernetes/multicloud/charts/multicloud-ocata/templates
parent908fc8cb12a093a7b81fc4f8a938fafbdd9356d8 (diff)
Resource Limits for multicloud
Issue-ID: OOM-1155 Change-Id: Ie727d224eb0ffbd619b46cf66d765b0b0afd454e Signed-off-by: Mukul <mukul.joshi@amdocs.com>
Diffstat (limited to 'kubernetes/multicloud/charts/multicloud-ocata/templates')
-rw-r--r--kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml13
1 files changed, 2 insertions, 11 deletions
diff --git a/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
index ba249be6c9..1c91e8af3f 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
@@ -62,6 +62,8 @@ spec:
- 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 @@ spec:
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 }}