From db582fafe8c9f975a0e43e9835c5f7e273eb699d Mon Sep 17 00:00:00 2001 From: vaibhav_16dec Date: Thu, 20 Sep 2018 12:32:47 +0000 Subject: Resource limit:DCAE config resolving merge conflict by implementing common resource template Issue-ID: OOM-1151 Change-Id: I3e2eac98ec1298d366a9a6b83f2a2d3a9846bd1f Signed-off-by: vaibhav_16dec Signed-off-by: Mandeep Khinda --- .../dcae-cloudify-manager/templates/deployment.yaml | 2 ++ .../dcaegen2/charts/dcae-cloudify-manager/values.yaml | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) (limited to 'kubernetes/dcaegen2/charts/dcae-cloudify-manager') diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml index 5fb84709c8..79bd8962da 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml @@ -38,6 +38,8 @@ spec: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + resources: +{{ include "common.resources" . | indent 12 }} ports: - containerPort: {{ .Values.service.internalPort }} # disable liveness probe when breakpoints set in debugger diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml index 1d1f729b0a..cd1b833087 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml @@ -64,6 +64,25 @@ service: externalPort: 80 internalPort: 80 +# Resource Limit flavor -By Default using small +flavor: small +# Segregation for Different environment (Small and Large) +resources: + small: + limits: + cpu: 2 + memory: 2Gi + requests: + cpu: 1 + memory: 1Gi + large: + limits: + cpu: 4 + memory: 4Gi + requests: + cpu: 2 + memory: 2Gi + unlimited: {} # Kubernetes namespace for components deployed via Cloudify manager # If empty, use the common namespace # dcae_ns: "dcae" -- cgit 1.2.3-korg