summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvv770d <vv770d@att.com>2021-08-31 21:39:59 +0000
committervv770d <vv770d@att.com>2021-09-13 19:08:38 +0000
commitabc653a84c1704c6e7be36bd8a075896c34c89aa (patch)
tree73a46fd8fa7653416b494836928884c5bc8ad677
parent383449627256d59dd6e2ac6a1cf54d3bd4ce73fa (diff)
Misc blueprints version revision for Istanbul
Updated version for following services bbs-ep,dfc,dl-admin,hv-ves,kpi-ms,pm-mapper pmsh,slice-analysis, son-handler,tca, vescollectro Change-Id: I8cce3e15a1589320d7fd8c4ed8a096e1b4ff3e0d Signed-off-by: vv770d <vv770d@att.com> Issue-ID: DCAEGEN2-2904 Signed-off-by: vv770d <vv770d@att.com>
-rw-r--r--Changelog.md5
-rw-r--r--blueprints/k8s-bbs-event-processor.yaml4
-rw-r--r--blueprints/k8s-datafile.yaml3
-rw-r--r--blueprints/k8s-datalake-admin-ui.yaml2
-rw-r--r--blueprints/k8s-hv-ves.yaml4
-rw-r--r--blueprints/k8s-kpi-ms.yaml4
-rw-r--r--blueprints/k8s-pm-mapper.yaml3
-rw-r--r--blueprints/k8s-pmsh.yaml3
-rw-r--r--blueprints/k8s-slice-analysis-ms.yaml5
-rw-r--r--blueprints/k8s-sonhms.yaml27
-rw-r--r--blueprints/k8s-tcagen2-clampnode.yaml6
-rw-r--r--blueprints/k8s-tcagen2.yaml4
-rw-r--r--blueprints/k8s-ves.yaml4
-rw-r--r--pom.xml2
-rw-r--r--version.properties2
15 files changed, 43 insertions, 35 deletions
diff --git a/Changelog.md b/Changelog.md
index 51e552f..93586a5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [3.3.5] - 2021-09-10
+ - [DCAEGEN2-2904] DCAE blueprint version updates for Istanbul release BBS-Ep/DFC/HV-VES/KPI-MS/Slice-Analysis/SON-handler/TCAgen2/VESCollector/PMSH/PM-mapper
+
## [3.3.4] - 2021-08-30
- [DCAEGEN2-2873] PM Mapper updated to 1.7.1 - Fix granularityPeriod issue
- [DCAEGEN2-2806/DCAEGEN2-2858/DCAEGEN2-2859] - VES Mapper updated to 1.3.0 - includes Istanbul vulnerability fixes, CBS client SDK to 1.8.7 and switched to integration-java11:9.0.0 base image
@@ -64,7 +67,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [DCAEGEN2-2628](https://jira.onap.org/browse/DCAEGEN2-2628) - Fix docker image build problem
- [DCAEGEN2-2528](https://jira.onap.org/browse/DCAEGEN2-2528) - Add HTTPS as new protocol to collect files from xNFs
-## [3.0.1] - 11/02/2021
+## [3.0.1] - 2021-02-11
### Changed
- [DCAEGEN2-2537](https://jira.onap.org/browse/DCAEGEN2-2537) - Upgrade prh.prh-app-server to 1.5.5
- [DCAEGEN2-2493](https://jira.onap.org/browse/DCAEGEN2-2493) - RCC blueprint updated to use latest k8s plugin & 1.2.3 version (vulnerability fixes)
diff --git a/blueprints/k8s-bbs-event-processor.yaml b/blueprints/k8s-bbs-event-processor.yaml
index 93f3fe4..11bc9ac 100644
--- a/blueprints/k8s-bbs-event-processor.yaml
+++ b/blueprints/k8s-bbs-event-processor.yaml
@@ -1,6 +1,6 @@
# ============LICENSE_START====================================================
# =============================================================================
-# Copyright (c) 2019-2020 AT&T, NOKIA
+# Copyright (c) 2019-2021 AT&T, NOKIA
# =============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ inputs:
default: true
tag_version:
type: string
- default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.components.bbs-event-processor:2.1.0"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.components.bbs-event-processor:2.1.1"
replicas:
type: integer
description: number of instances
diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml
index 7c09c10..b54440d 100644
--- a/blueprints/k8s-datafile.yaml
+++ b/blueprints/k8s-datafile.yaml
@@ -1,6 +1,7 @@
#
# ============LICENSE_START=======================================================
# Copyright (C) 2021 Nokia
+# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
@@ -72,7 +73,7 @@ inputs:
default: 1
tag_version:
type: string
- default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.6.0"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.6.1"
use_tls:
type: boolean
default: true
diff --git a/blueprints/k8s-datalake-admin-ui.yaml b/blueprints/k8s-datalake-admin-ui.yaml
index ebc639a..4a86a0e 100644
--- a/blueprints/k8s-datalake-admin-ui.yaml
+++ b/blueprints/k8s-datalake-admin-ui.yaml
@@ -27,7 +27,7 @@ inputs:
image_name:
description: datalake feeder image URL.
type: string
- default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakeadminui:1.1.0
+ default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakeadminui:1.1.1
container_port:
type: string
description: exposed container port
diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml
index 745e7d2..1b12816 100644
--- a/blueprints/k8s-hv-ves.yaml
+++ b/blueprints/k8s-hv-ves.yaml
@@ -3,7 +3,7 @@
# ============LICENSE_START========================================================
# =================================================================================
# Copyright (C) 2018-2019 NOKIA
-# Modifications copyright (c) 2020 AT&T Intellectual Property. All Rights Reserved
+# Modifications Copyright (c) 2020-2021 AT&T Intellectual Property. All Rights Reserved
# =================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -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.6.0'
+ default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.9.1'
service_component_type:
type: string
default: 'dcae-hv-ves-collector'
diff --git a/blueprints/k8s-kpi-ms.yaml b/blueprints/k8s-kpi-ms.yaml
index d594b26..0997d54 100644
--- a/blueprints/k8s-kpi-ms.yaml
+++ b/blueprints/k8s-kpi-ms.yaml
@@ -1,8 +1,8 @@
-
#
#============LICENSE_START=======================================================
#Copyright (C) 2021 China Mobile.
#Copyright (C) 2021 Nokia
+ # Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
#==============================================================================
#Licensed under the Apache License, Version 2.0 (the "License");
#you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ inputs:
tag_version:
type: string
description: docker image name and version
- default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.components.kpi-ms:1.0.0"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.components.kpi-ms:1.0.1"
aaf_username:
type: string
description: aaf username
diff --git a/blueprints/k8s-pm-mapper.yaml b/blueprints/k8s-pm-mapper.yaml
index fe26823..0cd48f6 100644
--- a/blueprints/k8s-pm-mapper.yaml
+++ b/blueprints/k8s-pm-mapper.yaml
@@ -3,6 +3,7 @@
# Copyright (C) 2019-2020 Nordix Foundation.
# Copyright (C) 2020-2021 Nokia
# Modifications Copyright (C) 2021 by Samsung Electronics Co., Ltd.
+# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
@@ -39,7 +40,7 @@ inputs:
tag_version:
type: string
description: Docker image to be used
- default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:1.7.1'
+ default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:1.7.2'
replicas:
type: integer
description: Number of instances
diff --git a/blueprints/k8s-pmsh.yaml b/blueprints/k8s-pmsh.yaml
index 6d1132b..d99f8c9 100644
--- a/blueprints/k8s-pmsh.yaml
+++ b/blueprints/k8s-pmsh.yaml
@@ -1,6 +1,7 @@
#
# ============LICENSE_START=======================================================
# Copyright (C) 2020-2021 Nordix Foundation.
+# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
@@ -28,7 +29,7 @@ inputs:
tag_version:
type: string
description: Docker image to be used
- default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.3.1'
+ default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.3.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 eb12285..588ccf3 100644
--- a/blueprints/k8s-slice-analysis-ms.yaml
+++ b/blueprints/k8s-slice-analysis-ms.yaml
@@ -1,6 +1,7 @@
#
#============LICENSE_START=======================================================
- #Copyright (C) 2020-2021 Wipro Limited.
+ # Copyright (C) 2020-2021 Wipro Limited.
+ # Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
#==============================================================================
#Licensed under the Apache License, Version 2.0 (the "License");
#you may not use this file except in compliance with the License.
@@ -28,7 +29,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.4"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.components.slice-analysis-ms:1.0.6"
pgaas_cluster_name:
type: string
description: pg cluster
diff --git a/blueprints/k8s-sonhms.yaml b/blueprints/k8s-sonhms.yaml
index aa926b3..ed4df74 100644
--- a/blueprints/k8s-sonhms.yaml
+++ b/blueprints/k8s-sonhms.yaml
@@ -1,20 +1,21 @@
- #============LICENSE_START=======================================================
+ # ============LICENSE_START=======================================================
# son-handler
# ================================================================================
# Copyright (C) 2019-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.
- # You may obtain a copy of the License at
+ # Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+ # ================================================================================
+ # 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
+ # 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=========================================================
+ # 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=========================================================
tosca_definitions_version: cloudify_dsl_1_3
imports:
@@ -30,7 +31,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.3"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:2.1.4"
pgaas_cluster_name:
type: string
description: pg cluster
diff --git a/blueprints/k8s-tcagen2-clampnode.yaml b/blueprints/k8s-tcagen2-clampnode.yaml
index 82335d5..574dd10 100644
--- a/blueprints/k8s-tcagen2-clampnode.yaml
+++ b/blueprints/k8s-tcagen2-clampnode.yaml
@@ -20,7 +20,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:k8splugin?version=>=3.4.3,<4.0.0
- - plugin:clamppolicyplugin?version=1.1.0
+ - plugin:clamppolicyplugin?version=1.1.1
inputs:
service_name:
type: string
@@ -37,13 +37,13 @@ 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.1"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.3.1"
tca.aai.password:
type: string
default: "DCAE"
tca.aai.url:
type: string
- default: "http://aai.onap.svc.cluster.local"
+ default: "https://aai.onap.svc.cluster.local:8443"
tca.aai.username:
type: string
default: "DCAE"
diff --git a/blueprints/k8s-tcagen2.yaml b/blueprints/k8s-tcagen2.yaml
index 55590d2..9510965 100644
--- a/blueprints/k8s-tcagen2.yaml
+++ b/blueprints/k8s-tcagen2.yaml
@@ -41,13 +41,13 @@ 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.3.0"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.3.1"
tca.aai.password:
type: string
default: "DCAE"
tca.aai.url:
type: string
- default: "http://aai.onap.svc.cluster.local"
+ default: "https://aai.onap.svc.cluster.local:8443"
tca.aai.username:
type: string
default: "DCAE"
diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml
index d5a7efa..b7d7f7b 100644
--- a/blueprints/k8s-ves.yaml
+++ b/blueprints/k8s-ves.yaml
@@ -2,7 +2,7 @@
#
# ============LICENSE_START====================================================
# =============================================================================
-# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2021 AT&T Intellectual Property. All rights reserved.
# Copyright (c) 2020 Nokia. All rights reserved.
# =============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -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.8.0"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.10.1"
internal_port:
type: string
description: Kubernetes node port on which collector is exposed
diff --git a/pom.xml b/pom.xml
index acc6aeb..3cbe307 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>3.3.4-SNAPSHOT</version>
+ <version>3.3.5-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<packaging>pom</packaging>
diff --git a/version.properties b/version.properties
index 9c28a84..3db1eb0 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=3
minor=3
-patch=4
+patch=5
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT