commit 84baeb0a1ea75e182a4d26ba48e8eca6c0099521
author Vijay Venkatesh Kumar <vv770d@att.com> Wed Sep 23 18:57:20 2020 +0000
committer Gerrit Code Review <gerrit@onap.org> Wed Sep 23 18:57:20 2020 +0000
tree 6deaf826441b55f217c43959155c37258a831c1f
parent c6b8abc5e1fd00447ee57266d26e9a1306208f97
parent 56e139ceedc9c31ad21f52f537fdf692703b5652

Merge "Release k8s-bootstrap-container 2.1.6"

blueprints/k8s-holmes-engine.yaml

diff --git a/blueprints/k8s-holmes-engine.yaml b/blueprints/k8s-holmes-engine.yaml
index db87ba3..1684851 100644
--- a/blueprints/k8s-holmes-engine.yaml
+++ b/blueprints/k8s-holmes-engine.yaml
@@ -54,7 +54,18 @@
   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 @@
       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

blueprints/k8s-holmes-rules.yaml

diff --git a/blueprints/k8s-holmes-rules.yaml b/blueprints/k8s-holmes-rules.yaml
index 830db47..fd89fc2 100644
--- a/blueprints/k8s-holmes-rules.yaml
+++ b/blueprints/k8s-holmes-rules.yaml
@@ -47,6 +47,18 @@
   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 @@
         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

blueprints/k8s-sonhms.yaml

diff --git a/blueprints/k8s-sonhms.yaml b/blueprints/k8s-sonhms.yaml
index bbf9cc7..795000e 100644
--- a/blueprints/k8s-sonhms.yaml
+++ b/blueprints/k8s-sonhms.yaml
@@ -30,7 +30,7 @@
   tag_version:
     type: string
     description: docker image name and version
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:2.0.2"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:2.1.1"
   pgaas_cluster_name:
     type: string
     description: pg cluster