[HOLMES] Correct resources settings for holmes

Add the resources config to rule management
Correct the resources values for proper startup

Issue-ID: OOM-3188

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: Ieadc080bdc438e983fe6e70cb6f0018b8be8d7ef

diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
index 028ca8d..17e51d7 100644 (file)
--- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
@@ -108,17 +108,17 @@ readiness:
 resources:
   small:
     limits:
-      cpu: 500m
-      memory: 1Gi
+      cpu: 1
+      memory: 2Gi
     requests:
-      cpu: 250m
-      memory: 500Mi
+      cpu: 0.5
+      memory: 1Gi
   large:
     limits:
-      cpu: 500m
+      cpu: 1
       memory: 2Gi
     requests:
-      cpu: 250m
+      cpu: 1
       memory: 1Gi
   unlimited: {}
 

diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
index db0eb16..f24d8ea 100644 (file)
--- a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
@@ -68,6 +68,7 @@ spec:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources: {{ include "common.resources" . | nindent 10 }}
         ports: {{ include "common.containerPorts" . | nindent 8  }}
         volumeMounts:
         - name: {{ include "common.fullname" . }}-env-config

diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index d91bb1e..1553d66 100644 (file)
--- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
@@ -120,18 +120,18 @@ readiness:
 resources:
   small:
     limits:
-      cpu: 250m
-      memory: 1024Mi
+      cpu: 1
+      memory: 1Gi
     requests:
-      cpu: 250m
-      memory: 256Mi
+      cpu: 0.5
+      memory: 1Gi
   large:
     limits:
-      cpu: 500m
+      cpu: 1
       memory: 2Gi
     requests:
-      cpu: 500m
-      memory: 512Mi
+      cpu: 0.5
+      memory: 1Gi
   unlimited: {}
 
 readinessCheck: