Update HV-VES image, update blueprints to use comma as SANs delimiter

HV-VES 1.5.1 was fixed to allow it to recover after exception in CBS
communication.

Issue-ID: DCAEGEN2-2508
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: Iedb0cf7da9d7139943ac1eeb4ae5dbcac7f7fa83

diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml
index a11e696..4efd7d0 100644 (file)
--- a/blueprints/k8s-hv-ves.yaml
+++ b/blueprints/k8s-hv-ves.yaml
@@ -27,7 +27,7 @@ imports:
 inputs:
   tag_version:
     type: string
-    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.5.0'
+    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.5.1'
   service_component_type:
     type: string
     default: 'dcae-hv-ves-collector'
@@ -103,9 +103,9 @@ inputs:
   external_cert_sans:
     type: string
     description: "List of Subject Alternative Names (SANs) which should be present
-      in certificate. Delimiter - : Should contain common_name value and other FQDNs
+      in certificate. Delimiter - , Should contain common_name value and other FQDNs
       under which given component is accessible."
-    default: "dcae-hv-ves-collector:hv-ves-collector:hv-ves"
+    default: "dcae-hv-ves-collector,hv-ves-collector,hv-ves"
   external_cert_use_external_tls:
     type: boolean
     description: Flag to indicate external tls enable/disable.

diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml
index c21093a..d6cf08f 100644 (file)
--- a/blueprints/k8s-ves.yaml
+++ b/blueprints/k8s-ves.yaml
@@ -104,9 +104,9 @@ inputs:
   external_cert_sans:
     type: string
     description: "List of Subject Alternative Names (SANs) which should be present
-      in certificate. Delimiter - : Should contain common_name value and other FQDNs
+      in certificate. Delimiter - , Should contain common_name value and other FQDNs
       under which given component is accessible."
-    default: "dcae-ves-collector:ves-collector:ves"
+    default: "dcae-ves-collector,ves-collector,ves"
   external_cert_use_external_tls:
     type: boolean
     description: Flag to indicate external tls enable/disable.

diff --git a/pom.xml b/pom.xml
index 2c37187..60273f0 100644 (file)
--- 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.2.0-SNAPSHOT</version>
+  <version>2.2.1-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <packaging>pom</packaging>
 

diff --git a/version.properties b/version.properties
index 5791c10..a234eb1 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=2\r
 minor=2\r
-patch=0\r
+patch=1\r
 base_version=${major}.${minor}.${patch}\r
 release_version=${base_version}\r
 snapshot_version=${base_version}-SNAPSHOT\r