summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvv770d <vv770d@att.com>2021-08-30 20:50:17 +0000
committervv770d <vv770d@att.com>2021-08-30 20:51:57 +0000
commit5b757a319fe5dc639861086fdac854692e65c5d7 (patch)
tree0f16f53a551730217a03a9ed2a8322ec2f0cc3f0
parent7c71e22211f7c1bb75f52d2d33a41bfeb0d0c6df (diff)
Blueprint updates for VES-mapper and TCAgen2
Change-Id: I859aeb397a1c4135b3181aee4edd0d94fa581c2b Signed-off-by: vv770d <vv770d@att.com> Issue-ID: DCAEGEN2-2806 Issue-ID: DCAEGEN2-2858 Issue-ID: DCAEGEN2-2859 Issue-ID: DCAEGEN2-2892 Signed-off-by: vv770d <vv770d@att.com>
-rw-r--r--Changelog.md4
-rw-r--r--blueprints/k8s-tcagen2-clampnode.yaml26
-rw-r--r--blueprints/k8s-tcagen2.yaml26
-rw-r--r--blueprints/k8s-ves-mapper.yaml2
4 files changed, 53 insertions, 5 deletions
diff --git a/Changelog.md b/Changelog.md
index f41642c..229b795 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,8 +4,10 @@ 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.4]
+## [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
+ - [DCAEGEN2-2892] - Set resource limits for TCAgen2 blueprints
## [3.3.3] - 2021-08-03
- [DCAEGEN2-2853] SNMPTrap container updated to 2.0.5 - Switched to CBS client lib to 2.2.1
diff --git a/blueprints/k8s-tcagen2-clampnode.yaml b/blueprints/k8s-tcagen2-clampnode.yaml
index 0f13c53..82335d5 100644
--- a/blueprints/k8s-tcagen2-clampnode.yaml
+++ b/blueprints/k8s-tcagen2-clampnode.yaml
@@ -1,6 +1,6 @@
# ============LICENSE_START====================================================
# =============================================================================
-# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2019-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.
@@ -62,6 +62,19 @@ inputs:
policy_id:
type: string
default: "onap.restart.tca"
+ cpu_limit:
+ type: string
+ default: "2000m"
+ cpu_request:
+ type: string
+ default: "1000m"
+ memory_limit:
+ type: string
+ default: "2048Mi"
+ memory_request:
+ type: string
+ default: "1024Mi"
+
node_templates:
docker.tca:
type: dcae.nodes.ContainerizedServiceComponent
@@ -123,6 +136,17 @@ node_templates:
type: http
image:
get_input: tag_version
+ resource_config:
+ limits:
+ cpu:
+ get_input: cpu_limit
+ memory:
+ get_input: memory_limit
+ requests:
+ cpu:
+ get_input: cpu_request
+ memory:
+ get_input: memory_request
log_info:
log_directory:
get_input: log_directory
diff --git a/blueprints/k8s-tcagen2.yaml b/blueprints/k8s-tcagen2.yaml
index 4f161ae..55590d2 100644
--- a/blueprints/k8s-tcagen2.yaml
+++ b/blueprints/k8s-tcagen2.yaml
@@ -1,6 +1,6 @@
# ============LICENSE_START====================================================
# =============================================================================
-# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2019-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.
@@ -60,7 +60,18 @@ inputs:
tca_consumer_group:
type: string
default: "cg1"
-
+ cpu_limit:
+ type: string
+ default: "2000m"
+ cpu_request:
+ type: string
+ default: "1000m"
+ memory_limit:
+ type: string
+ default: "2048Mi"
+ memory_request:
+ type: string
+ default: "1024Mi"
node_templates:
docker.tca:
type: dcae.nodes.ContainerizedServiceComponent
@@ -119,6 +130,17 @@ node_templates:
type: http
image:
get_input: tag_version
+ resource_config:
+ limits:
+ cpu:
+ get_input: cpu_limit
+ memory:
+ get_input: memory_limit
+ requests:
+ cpu:
+ get_input: cpu_request
+ memory:
+ get_input: memory_request
log_info:
log_directory:
get_input: log_directory
diff --git a/blueprints/k8s-ves-mapper.yaml b/blueprints/k8s-ves-mapper.yaml
index 8fe25b8..a752514 100644
--- a/blueprints/k8s-ves-mapper.yaml
+++ b/blueprints/k8s-ves-mapper.yaml
@@ -30,7 +30,7 @@ inputs:
default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.ONAP-COLLECTOR-SNMPTRAP"
type: string
tag_version:
- default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:1.2.0"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:1.3.0"
type: string
ves_fault_publish_url:
default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_FAULT_OUTPUT"