16 files changed, 181 insertions, 68 deletions

diff --git a/blueprints/k8s-datalake-admin-ui.yaml b/blueprints/k8s-datalake-admin-ui.yaml
index 1428de8..7c663ca 100644
--- a/blueprints/k8s-datalake-admin-ui.yaml
+++ b/blueprints/k8s-datalake-admin-ui.yaml
@@ -26,7 +26,7 @@ inputs:
   image_name:
     description: datalake feeder image URL.
     type: string
-    default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakeadminui:1.0.2
+    default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakeadminui:1.1.0
   container_port:
     type: string
     description: exposed container port
diff --git a/blueprints/k8s-datalake-des.yaml b/blueprints/k8s-datalake-des.yaml
new file mode 100644
index 0000000..debe95d
--- /dev/null
+++ b/blueprints/k8s-datalake-des.yaml
@@ -0,0 +1,127 @@
+# ============LICENSE_START====================================================
+# =============================================================================
+# Copyright (C) 2020 China Mobile
+# =============================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END======================================================
+#author: Kai Lu (lukai@chinamobile.com)
+tosca_definitions_version: cloudify_dsl_1_3
+imports:
+  - "https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml"
+  - plugin:k8splugin?version=3.4.2
+inputs:
+  service_name:
+    type: string
+    default: 'dcae-des'
+  mariadb_address:
+    type: string
+    description: MariaDB URL
+    default: "mariadb-galera"
+  mariadb_port:
+    type: string
+    description: MariaDB port
+    default: "3306"
+  db_username:
+    type: string
+    description: MariaDB Username
+    default: "root"
+  db_password:
+    description: MariaDB password
+    type: string
+    default: "secretpassword"
+  presto_address:
+    type: string
+    description: Presto URL
+    default: "dl-presto"
+  presto_port:
+    type: string
+    description: Presto port
+    default: "9000"
+  presto_username:
+    type: string
+    description: Presto Username
+    default: "user"
+  presto_password:
+    description: Presto password
+    type: string
+    default: "test"
+  image_name:
+    description: des image URL.
+    type: string
+    default: nexus3.onap.org:10003/onap/org.onap.dcaegen2.services.datalake.exposure.service:1.1.0
+  dl_hostname:
+    type: string
+    description: dl default des_hostname
+    default: k8s-des
+  container_port:
+    type: string
+    description: exposed container port
+    default: "1681"
+  host_port:
+    type: string
+    description: external port
+    default: "30409"
+node_templates:
+  datalake:
+    type: dcae.nodes.ContainerizedServiceComponent
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        start:
+          inputs:
+            ports:
+              - '1681:0'
+              - concat: [{get_input: container_port},":",{get_input: host_port}]
+            envs:
+              MYSQL_HOST:
+                get_input: mariadb_address
+              MYSQL_PORT:
+                get_input: mariadb_port
+              MYSQL_ROOT_PASSWORD:
+                get_input: db_password
+              PRESTO_HOST:
+                get_input: presto_address
+              PRESTO_PORT:
+                get_input: presto_port
+              PRESTO_USER:
+                get_input: presto_username
+              PRESTO_PASSWORD:
+                get_input: presto_password
+    properties:
+      application_config:
+        MYSQL_HOST:
+          get_input: mariadb_address
+        MYSQL_PORT:
+          get_input: mariadb_port
+        MYSQL_ROOT_PASSWORD:
+          get_input: db_password
+        PRESTO_HOST:
+          get_input: presto_address
+        PRESTO_PORT:
+          get_input: presto_port
+        PRESTO_USER:
+          get_input: presto_username
+        PRESTO_PASSWORD:
+          get_input: presto_password
+        HOSTNAME:
+          get_input: dl_hostname
+      image:
+          get_input: image_name
+      docker_config:
+        healthcheck:
+          interval: 90s
+          timeout: 10s
+          type: http
+          endpoint: /datalake/v1/exposure
+      service_component_type: 'dcae-des'
+      service_id: 'dcae-des'
+      service_component_name_override: 'dcae-des'
\ No newline at end of file
diff --git a/blueprints/k8s-datalake-feeder.yaml b/blueprints/k8s-datalake-feeder.yaml
index bd67c79..b88892e 100644
--- a/blueprints/k8s-datalake-feeder.yaml
+++ b/blueprints/k8s-datalake-feeder.yaml
@@ -42,7 +42,7 @@ inputs:
   image_name:
     description: datalake feeder image URL.
     type: string
-    default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakefeeder:1.0.2
+    default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakefeeder:1.1.0
   dl_hostname:
     type: string
     description: dl default dl_hostname
diff --git a/blueprints/k8s-heartbeat.yaml b/blueprints/k8s-heartbeat.yaml
index e349df0..2fdee83 100644
--- a/blueprints/k8s-heartbeat.yaml
+++ b/blueprints/k8s-heartbeat.yaml
@@ -1,6 +1,7 @@
 # ============LICENSE_START====================================================
 # =============================================================================
 # Copyright (C) 2019-2020 AT&T
+# Copyright (C) 2020 Wipro Limited
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -65,21 +66,13 @@ inputs:
   namespace:
     type: string
     default: 'onap'
-  pg_dbName:
-    type: string
-    default: 'postgres'
-  pg_ipAddress:
-    type: string
-    default: 'hbpostgres-write'
-  pg_passwd:
-    type: string
-    default: 'postgres'
-  pg_portNum:
+  pgaas_cluster_name:
     type: string
-    default: '5432'
-  pg_userName:
+    description: pg cluster
+    default: "dcae-pg-primary.onap"
+  pg_dbName:
     type: string
-    default: 'postgres'
+    default: 'heartbeat'
   ves_heartbeat_publish_url:
     type: string
     default: 'http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT'
@@ -87,28 +80,13 @@ inputs:
     type: string
     default: 'http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT'
 node_templates:
-  hbpostgres:
-    type: dcae.nodes.ContainerizedApplication
+  hbpgaas:
+    type: dcae.nodes.pgaas.database
     properties:
-        name:
-            "hbpostgres-write"
-        image:
-            "postgres:9.5.2"
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        start:
-          inputs:
-            envs:
-              PGDATA:
-                "/var/lib/postgresql/data/hbpostgres"
-              POSTGRES_PASSWORD:
-                { get_input: pg_passwd }
-              POSTGRES_USER:
-                { get_input: pg_userName }
-              SERVICE_NAME:
-                "hbpostgres-write"
-            ports:
-              - "5432:0"
+      writerfqdn: { get_input: pgaas_cluster_name }
+      name: { get_input: pg_dbName}
+      use_existing: false
+
   heartbeat:
     interfaces:
       cloudify.interfaces.lifecycle:
@@ -122,12 +100,13 @@ node_templates:
               groupID:
                 get_input: groupID
               pg_ipAddress:
-                get_input: pg_ipAddress
+                { get_attribute: [ hbpgaas, admin, host ] }
               pg_passwd:
-                get_input: pg_passwd
-              pg_portNum: "5432"
+                { get_attribute: [ hbpgaas, admin, password ] }
+              pg_portNum:
+                { get_attribute: [ hbpgaas, admin, port ] }
               pg_userName:
-                get_input: pg_userName
+                { get_attribute: [ hbpgaas, admin, user ] }
               pg_dbName:
                 get_input: pg_dbName
             ports:
@@ -144,13 +123,13 @@ node_templates:
         groupID:
           get_input: groupID
         pg_ipAddress:
-          get_input: pg_ipAddress
+          { get_attribute: [ hbpgaas, admin, host ] }
         pg_passwd:
-          get_input: pg_passwd
+           { get_attribute: [ hbpgaas, admin, password ] }
         pg_portNum:
-          get_input: pg_portNum
+           { get_attribute: [ hbpgaas, admin, port ] }
         pg_userName:
-          get_input: pg_userName
+           { get_attribute: [ hbpgaas, admin, user ] }
         pg_dbName:
           get_input: pg_dbName
         heartbeat_config: '{"vnfs": [{"eventName": "Heartbeat_vDNS","heartbeatcountmissed": 3,"heartbeatinterval": 60,"closedLoopControlName": "ControlLoopEvent1",     "policyVersion": "1.0.0.5",     "policyName":"vFireWall","policyScope": "resource=sampleResource,type=sampletype,CLName=sampleCLName","target_type": "VNF",        "target": "genVnfName", "version": "1.0"}, {"eventName": "Heartbeat_vFW","heartbeatcountmissed": 3,     "heartbeatinterval": 60,"closedLoopControlName": "ControlLoopEvent1","policyVersion": "1.0.0.5","policyName": "vFireWall","policyScope": "resource=sampleResource,type=sampletype,CLName=sampleCLName",    "target_type":"VNF",    "target": "genVnfName",    "version": "1.0"}, {"eventName": "Heartbeat_xx","heartbeatcountmissed": 3,      "heartbeatinterval": 60,"closedLoopControlName": "ControlLoopEvent1","policyVersion": "1.0.0.5","policyName": "vFireWall",      "policyScope": "resource=sampleResource,type=sampletype,CLName=sampleCLName","target_type": "VNF","target": "genVnfName","version": "1.0"}]}'
@@ -181,6 +160,5 @@ node_templates:
     type: dcae.nodes.ContainerizedServiceComponent
     relationships:
     - type: cloudify.relationships.depends_on
-      target: hbpostgres
-
+      target: hbpgaas
 
diff --git a/blueprints/k8s-holmes-engine.yaml b/blueprints/k8s-holmes-engine.yaml
index 1684851..6557535 100644
--- a/blueprints/k8s-holmes-engine.yaml
+++ b/blueprints/k8s-holmes-engine.yaml
@@ -44,7 +44,7 @@ inputs:
     default: "holmes"
   he_image:
     type: string
-    default: "nexus3.onap.org:10001/onap/holmes/engine-management:1.2.6"
+    default: "nexus3.onap.org:10001/onap/holmes/engine-management:1.2.9"
   service_component_type:
     type: string
     default: "holmes-engine-mgmt"
diff --git a/blueprints/k8s-holmes-rules.yaml b/blueprints/k8s-holmes-rules.yaml
index fd89fc2..62376ad 100644
--- a/blueprints/k8s-holmes-rules.yaml
+++ b/blueprints/k8s-holmes-rules.yaml
@@ -37,7 +37,7 @@ inputs:
     default: "holmes"
   hr_image:
     type: string
-    default: "nexus3.onap.org:10001/onap/holmes/rule-management:1.2.7"
+    default: "nexus3.onap.org:10001/onap/holmes/rule-management:1.2.9"
   service_component_type:
     type: string
     default: "holmes-rule-mgmt"
@@ -89,7 +89,7 @@ node_templates:
       service_id: { get_input: service_id }
       service_component_name_override: { get_input: service_component_name_override }
       application_config:
-        holmes.default.rule.volte.scenario1: "ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b$$$package org.onap.holmes.droolsRule;\n\nimport org.onap.holmes.common.dmaap.DmaapService;\nimport org.onap.holmes.common.api.stat.VesAlarm;\nimport org.onap.holmes.common.aai.CorrelationUtil;\nimport org.onap.holmes.common.dmaap.entity.PolicyMsg;\nimport org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;\nimport org.onap.holmes.common.utils.DroolsLog;\n \n\nrule \"Relation_analysis_Rule\"\nsalience 200\nno-loop true\n    when\n        $root : VesAlarm(alarmIsCleared == 0,\n            $sourceId: sourceId, sourceId != null && !sourceId.equals(\"\"),\n\t\t\t$sourceName: sourceName, sourceName != null && !sourceName.equals(\"\"),\n\t\t\t$startEpochMicrosec: startEpochMicrosec,\n            eventName in (\"Fault_MultiCloud_VMFailure\"),\n            $eventId: eventId)\n        $child : VesAlarm( eventId != $eventId, parentId == null,\n            CorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId, $sourceName),\n            eventName in (\"Fault_MME_eNodeB out of service alarm\"),\n            startEpochMicrosec < $startEpochMicrosec + 60000 && startEpochMicrosec > $startEpochMicrosec - 60000 )\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"Relation_analysis_Rule: rootId=\" + $root.getEventId() + \", childId=\" + $child.getEventId());\n\t\t$child.setParentId($root.getEventId());\n\t\tupdate($child);\n\t\t\nend\n\nrule \"root_has_child_handle_Rule\"\nsalience 150\nno-loop true\n\twhen\n\t\t$root : VesAlarm(alarmIsCleared == 0, rootFlag == 0, $eventId: eventId)\n\t\t$child : VesAlarm(eventId != $eventId, parentId == $eventId)\n\tthen\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"root_has_child_handle_Rule: rootId=\" + $root.getEventId() + \", childId=\" + $child.getEventId());\n\t\tDmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\n\t\tPolicyMsg policyMsg = dmaapService.getPolicyMsg($root, $child, \"org.onap.holmes.droolsRule\");\n        dmaapService.publishPolicyMsg(policyMsg, \"unauthenticated.DCAE_CL_OUTPUT\");\n\t\t$root.setRootFlag(1);\n\t\tupdate($root);\nend\n\nrule \"root_no_child_handle_Rule\"\nsalience 100\nno-loop true\n    when\n        $root : VesAlarm(alarmIsCleared == 0, rootFlag == 0,\n            sourceId != null && !sourceId.equals(\"\"),\n\t\t\tsourceName != null && !sourceName.equals(\"\"),\n            eventName in (\"Fault_MultiCloud_VMFailure\"))\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"root_no_child_handle_Rule: rootId=\" + $root.getEventId());\n\t\tDmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\n\t\tPolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, \"org.onap.holmes.droolsRule\");\n        dmaapService.publishPolicyMsg(policyMsg, \"unauthenticated.DCAE_CL_OUTPUT\");\n\t\t$root.setRootFlag(1);\n\t\tupdate($root);\nend\n\nrule \"root_cleared_handle_Rule\"\nsalience 100\nno-loop true\n    when\n        $root : VesAlarm(alarmIsCleared == 1, rootFlag == 1)\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"root_cleared_handle_Rule: rootId=\" + $root.getEventId());\n\t\tDmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\n\t\tPolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, \"org.onap.holmes.droolsRule\");\n        dmaapService.publishPolicyMsg(policyMsg, \"unauthenticated.DCAE_CL_OUTPUT\");\n\t\tretract($root);\nend\n\nrule \"child_handle_Rule\"\nsalience 100\nno-loop true\n    when\n        $child : VesAlarm(alarmIsCleared == 1, rootFlag == 0)\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"child_handle_Rule: childId=\" + $child.getEventId());\n\t\tretract($child);\nend"
+        holmes.default.rule.volte.scenario1: "ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b$$$package org.onap.holmes.droolsRule;\n\nimport org.onap.holmes.common.dmaap.DmaapService;\nimport org.onap.holmes.common.api.stat.VesAlarm;\nimport org.onap.holmes.common.aai.CorrelationUtil;\nimport org.onap.holmes.common.dmaap.entity.PolicyMsg;\nimport org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;\nimport org.onap.holmes.common.utils.DroolsLog;\n \n\nrule \"Relation_analysis_Rule\"\nsalience 200\nno-loop true\n    when\n        $root : VesAlarm(alarmIsCleared == 0,\n            $sourceId: sourceId, sourceId != null && !sourceId.equals(\"\"),\n\t\t\t$sourceName: sourceName, sourceName != null && !sourceName.equals(\"\"),\n\t\t\t$startEpochMicrosec: startEpochMicrosec,\n            eventName in (\"Fault_MultiCloud_VMFailure\"),\n            $eventId: eventId)\n        $child : VesAlarm( eventId != $eventId, parentId == null,\n            CorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId, $sourceName),\n            eventName in (\"Fault_MME_eNodeB out of service alarm\"),\n            startEpochMicrosec < $startEpochMicrosec + 60000 && startEpochMicrosec > $startEpochMicrosec - 60000 )\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"Relation_analysis_Rule: rootId=\" + $root.getEventId() + \", childId=\" + $child.getEventId());\n\t\t$child.setParentId($root.getEventId());\n\t\tupdate($child);\n\t\t\nend\n\nrule \"root_has_child_handle_Rule\"\nsalience 150\nno-loop true\n\twhen\n\t\t$root : VesAlarm(alarmIsCleared == 0, rootFlag == 0, $eventId: eventId)\n\t\t$child : VesAlarm(eventId != $eventId, parentId == $eventId)\n\tthen\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"root_has_child_handle_Rule: rootId=\" + $root.getEventId() + \", childId=\" + $child.getEventId());\n\t\tDmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\n\t\tPolicyMsg policyMsg = dmaapService.getPolicyMsg($root, $child, \"org.onap.holmes.droolsRule\");\n        dmaapService.publishPolicyMsg(policyMsg, \"dcae_cl_out\");\n\t\t$root.setRootFlag(1);\n\t\tupdate($root);\nend\n\nrule \"root_no_child_handle_Rule\"\nsalience 100\nno-loop true\n    when\n        $root : VesAlarm(alarmIsCleared == 0, rootFlag == 0,\n            sourceId != null && !sourceId.equals(\"\"),\n\t\t\tsourceName != null && !sourceName.equals(\"\"),\n            eventName in (\"Fault_MultiCloud_VMFailure\"))\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"root_no_child_handle_Rule: rootId=\" + $root.getEventId());\n\t\tDmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\n\t\tPolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, \"org.onap.holmes.droolsRule\");\n        dmaapService.publishPolicyMsg(policyMsg, \"dcae_cl_out\");\n\t\t$root.setRootFlag(1);\n\t\tupdate($root);\nend\n\nrule \"root_cleared_handle_Rule\"\nsalience 100\nno-loop true\n    when\n        $root : VesAlarm(alarmIsCleared == 1, rootFlag == 1)\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"root_cleared_handle_Rule: rootId=\" + $root.getEventId());\n\t\tDmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);\n\t\tPolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, \"org.onap.holmes.droolsRule\");\n        dmaapService.publishPolicyMsg(policyMsg, \"dcae_cl_out\");\n\t\tretract($root);\nend\n\nrule \"child_handle_Rule\"\nsalience 100\nno-loop true\n    when\n        $child : VesAlarm(alarmIsCleared == 1, rootFlag == 0)\n    then\n\t\tDroolsLog.printInfo(\"===========================================================\");\n\t\tDroolsLog.printInfo(\"child_handle_Rule: childId=\" + $child.getEventId());\n\t\tretract($child);\nend"
         msb.hostname:
          get_input: msb_hostname
         msb.uri: /api/microservices/v1/services
diff --git a/blueprints/k8s-pmsh.yaml b/blueprints/k8s-pmsh.yaml
index 51b018d..92405b6 100644
--- a/blueprints/k8s-pmsh.yaml
+++ b/blueprints/k8s-pmsh.yaml
@@ -28,7 +28,7 @@ inputs:
   tag_version:
     type: string
     description: Docker image to be used
-    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.1.1'
+    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.1.2'
   replicas:
     type: integer
     description: Number of instances
diff --git a/blueprints/k8s-slice-analysis-ms.yaml b/blueprints/k8s-slice-analysis-ms.yaml
index 1348f15..41523a2 100644
--- a/blueprints/k8s-slice-analysis-ms.yaml
+++ b/blueprints/k8s-slice-analysis-ms.yaml
@@ -28,7 +28,7 @@ inputs:
   tag_version:
     type: string
     description: docker image name and version
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.components.slice-analysis-ms:1.0.0"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.components.slice-analysis-ms:1.0.1"
   pgaas_cluster_name:
     type: string
     description: pg cluster
@@ -40,11 +40,11 @@ inputs:
   aaf_username:
     type: string
     description: aaf username
-    default:
+    default: "dcae@dcae.onap.org"
   aaf_password:
     type: string
     description: aaf password
-    default:
+    default: "demo123456!"
   dmaap_polling_interval:
     type: integer
     description: dmaap polling interval
@@ -80,7 +80,7 @@ inputs:
   config_db:
     type: string
     description: config db location
-    default: "http://sdnc.onap:8181"
+    default: "http://config-db:8080"
   log_path:
     type: string
     description: log location in host
@@ -113,7 +113,6 @@ inputs:
     type: integer
     description: delay for the consumer thread
     default: 120000
-
 node_templates:
   pgaasvm:
     type: dcae.nodes.pgaas.database
@@ -151,7 +150,14 @@ node_templates:
           interval: 15s
           timeout: 1s
           type: http
+      tls_info:
+        cert_directory: '/opt/app/sliceanalysisms/etc/cert/'
+        use_tls: true
       application_config:
+        aafUsername: { get_input: aaf_username }
+        aafPassword: { get_input: aaf_password }
+        trust_store_path: '/opt/app/sliceanalysisms/etc/cert/trust.jks'
+        trust_store_pass_path: '/opt/app/sliceanalysisms/etc/cert/trust.pass'
         streams_subscribes:
           performance_management_topic:
             aaf_username: { get_input: aaf_username }
diff --git a/blueprints/k8s-sonhms.yaml b/blueprints/k8s-sonhms.yaml
index 795000e..c707ac1 100644
--- a/blueprints/k8s-sonhms.yaml
+++ b/blueprints/k8s-sonhms.yaml
@@ -30,7 +30,7 @@ inputs:
   tag_version:
     type: string
     description: docker image name and version
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:2.1.1"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:2.1.2"
   pgaas_cluster_name:
     type: string
     description: pg cluster
diff --git a/blueprints/k8s-tcagen2-clampnode.yaml b/blueprints/k8s-tcagen2-clampnode.yaml
index f5bdbf6..e7d967a 100644
--- a/blueprints/k8s-tcagen2-clampnode.yaml
+++ b/blueprints/k8s-tcagen2-clampnode.yaml
@@ -37,7 +37,7 @@ inputs:
     default: "mongodb://dcae-mongohost/dcae-tcagen2"
   tag_version:
     type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.0"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.1"
   tca.aai.password:
     type: string
     default: "DCAE"
diff --git a/blueprints/k8s-tcagen2.yaml b/blueprints/k8s-tcagen2.yaml
index 5fe2efb..046d65c 100644
--- a/blueprints/k8s-tcagen2.yaml
+++ b/blueprints/k8s-tcagen2.yaml
@@ -41,7 +41,7 @@ inputs:
     default: "mongodb://dcae-mongohost/dcae-tcagen2"
   tag_version:
     type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.0"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.1"
   tca.aai.password:
     type: string
     default: "DCAE"
diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml
index 7a6cd48..56e9e9c 100644
--- a/blueprints/k8s-ves.yaml
+++ b/blueprints/k8s-ves.yaml
@@ -57,7 +57,7 @@ inputs:
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT"
   tag_version:
     type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.7.6"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.7.8"
   internal_port:
     type: string
     description: Kubernetes node port on which collector is exposed
@@ -77,12 +77,6 @@ inputs:
   auth_method:
     type: string
     default: "noAuth"
-  component_name:
-    type: string
-    default: "dcae-ves-collector"
-  dns_component_name:
-    type: string
-    default: "dcae-ves-collector"
   service_component_type:
     type: string
     default: "dcae-ves-collector"
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index 1db498e..c43ea09 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -85,7 +85,7 @@ echo "MVN_DOCKERREGISTRY_PUBLIC is       [$MVN_DOCKERREGISTRY_PUBLIC]"
 echo "HOME is                            [$HOME]"
 echo "PROJECT_ROOT is                    [$PROJECT_ROOT]"
 
-MVN_RELEASE_TAG="${MVN_RELEASE_TAG:-R7}"
+MVN_RELEASE_TAG="${MVN_RELEASE_TAG:-R8}"
 
 
 if ! wget -O ${PROJECT_ROOT}/mvn-phase-lib.sh \
diff --git a/pom.xml b/pom.xml
index 5460f55..c66a745 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>k8s-bootstrap-container</artifactId>
   <name>dcaegen2-deployments-k8s-bootstrap-container</name>
-  <version>2.1.7-SNAPSHOT</version>
+  <version>2.1.8-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <packaging>pom</packaging>
 
diff --git a/releases/2.1.7-k8s-bootstrap-container.yaml b/releases/2.1.7-k8s-bootstrap-container.yaml
new file mode 100644
index 0000000..53fdb69
--- /dev/null
+++ b/releases/2.1.7-k8s-bootstrap-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '2.1.7'
+project: 'dcaegen2/blueprints'
+log_dir: 'dcaegen2-platform-blueprints-master-merge-java/311'
+ref: 2feaeca5b8c7fe10ac6562fcba266fe0510bfcd4
+containers:
+  - name: 'org.onap.dcaegen2.deployments.k8s-bootstrap-container'
+    version: '2.1.7-SNAPSHOT-20201019T223811Z'
diff --git a/version.properties b/version.properties
index d1ba756..8ac80b7 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=2

 minor=1

-patch=7

+patch=8

 base_version=${major}.${minor}.${patch}

 release_version=${base_version}

 snapshot_version=${base_version}-SNAPSHOT