Added Resource Limits to Holmes Containers

Issue-ID: HOLMES-357

Change-Id: I3de21a2e0d33ef0a73878716749c4e72718921ce
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/blueprints/k8s-holmes-engine.yaml b/blueprints/k8s-holmes-engine.yaml
index db87ba3..1684851 100644 (file)
--- a/blueprints/k8s-holmes-engine.yaml
+++ b/blueprints/k8s-holmes-engine.yaml
@@ -54,7 +54,18 @@ inputs:
   service_component_name_override:
     type: string
     default: "holmes-engine-mgmt"
-
+  dcae-analytics-holmes-engine-mgt_cpu_limit:
+    type: string
+    default: "500m"
+  dcae-analytics-holmes-engine-mgt_cpu_request:
+    type: string
+    default: "500m"
+  dcae-analytics-holmes-engine-mgt_memory_limit:
+    type: string
+    default: "1024Mi"
+  dcae-analytics-holmes-engine-mgt_memory_request:
+    type: string
+    default: "256Mi"
 node_templates:
   pgaasvm:
     type: dcae.nodes.pgaas.database
@@ -105,6 +116,17 @@ node_templates:
       image: { get_input: he_image }
       # need to use truncated name!!
       #service_component_type: dcae-analytics-holmes-engin-management
+      resource_config:
+        limits:
+          cpu:
+            get_input: dcae-analytics-holmes-engine-mgt_cpu_limit
+          memory:
+            get_input: dcae-analytics-holmes-engine-mgt_memory_limit
+        requests:
+          cpu:
+            get_input: dcae-analytics-holmes-engine-mgt_cpu_request
+          memory:
+            get_input: dcae-analytics-holmes-engine-mgt_memory_request
     relationships:
     - type: cloudify.relationships.depends_on
       target: pgaasvm

diff --git a/blueprints/k8s-holmes-rules.yaml b/blueprints/k8s-holmes-rules.yaml
index 830db47..fd89fc2 100644 (file)
--- a/blueprints/k8s-holmes-rules.yaml
+++ b/blueprints/k8s-holmes-rules.yaml
@@ -47,6 +47,18 @@ inputs:
   service_component_name_override:
     type: string
     default: "holmes-rule-mgmt"
+  dcae-analytics-holmes-rule-mgt_cpu_limit:
+    type: string
+    default: "250m"
+  dcae-analytics-holmes-rule-mgt_cpu_request:
+    type: string
+    default: "250m"
+  dcae-analytics-holmes-rule-mgt_memory_limit:
+    type: string
+    default: "1024Mi"
+  dcae-analytics-holmes-rule-mgt_memory_request:
+    type: string
+    default: "256Mi"
 node_templates:
   pgaasvm:
     type: dcae.nodes.pgaas.database
@@ -86,6 +98,17 @@ node_templates:
         streams_subscribes: {}
       image: { get_input: hr_image }
       #service_component_type: dcae-analytics-holmes-rule-management
+      resource_config:
+        limits:
+          cpu:
+            get_input: dcae-analytics-holmes-rule-mgt_cpu_limit
+          memory:
+            get_input: dcae-analytics-holmes-rule-mgt_memory_limit
+        requests:
+          cpu:
+            get_input: dcae-analytics-holmes-rule-mgt_cpu_request
+          memory:
+            get_input: dcae-analytics-holmes-rule-mgt_memory_request
     relationships:
     - type: cloudify.relationships.depends_on
       target: pgaasvm