aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2020-12-01 16:42:42 +0000
committerGerrit Code Review <gerrit@onap.org>2020-12-01 16:42:42 +0000
commit7adb29c45f434cda38f1f73177e33623ccd4dd25 (patch)
treedb012662f3e2ec5f0e3e0223cc8a75f469647a66
parent5c8f379a3f72c2afa446c93b5d1c5e9f2e003726 (diff)
parent2db4d34bdaafdaab8ca5088ee07da1fc0989e1e7 (diff)
Merge "Update HV-VES image, update blueprints to use comma as SANs delimiter"2.2.1
-rw-r--r--blueprints/k8s-hv-ves.yaml6
-rw-r--r--blueprints/k8s-ves.yaml4
-rw-r--r--pom.xml2
-rw-r--r--version.properties2
4 files changed, 7 insertions, 7 deletions
diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml
index a11e696..4efd7d0 100644
--- 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
--- 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
--- 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
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=2
minor=2
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT