diff options
| author |   vaibhav_16dec <vaibhav.chopra@amdocs.com> | 2018-09-20 12:32:47 +0000 |
|---|---|---|
| committer |   Mandeep Khinda <mandeep.khinda@amdocs.com> | 2018-09-25 19:24:15 +0000 |
| commit | db582fafe8c9f975a0e43e9835c5f7e273eb699d (patch) | |
| tree | b1cf593eae658de1f81ef60e71107e5d3875b148 /kubernetes/dcaegen2/charts/dcae-bootstrap | |
| parent | c7dcda78fcc810dad55633d977cbabc3b56daf22 (diff) | |
Resource limit:DCAE config
resolving merge conflict by implementing common resource
template
Issue-ID: OOM-1151
Change-Id: I3e2eac98ec1298d366a9a6b83f2a2d3a9846bd1f
Signed-off-by: vaibhav_16dec <vaibhav.chopra@amdocs.com>
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/dcaegen2/charts/dcae-bootstrap')
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml | 19 |
2 files changed, 22 insertions, 1 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml index 801c132c79..a26307d64b 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml @@ -61,6 +61,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 }}
volumeMounts:
- mountPath: /inputs
name: {{ include "common.fullname" . }}-dcae-inputs
@@ -94,4 +96,4 @@ spec: hostPath:
path: /etc/localtime
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file + - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml index 36c8ba168d..9c45b9f62c 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml @@ -82,6 +82,25 @@ componentImages: prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.0.0 hv_ves: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.0.0-SNAPSHOT +# 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: "onap" |