summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--blueprints/k8s-bbs-event-processor.yaml2
-rw-r--r--blueprints/k8s-datafile.yaml2
-rw-r--r--blueprints/k8s-heartbeat.yaml2
-rw-r--r--blueprints/k8s-holmes-engine.yaml26
-rw-r--r--blueprints/k8s-holmes-rules.yaml25
-rw-r--r--blueprints/k8s-hv-ves.yaml2
-rw-r--r--blueprints/k8s-pm-mapper.yaml2
-rw-r--r--blueprints/k8s-pmsh.yaml2
-rw-r--r--blueprints/k8s-prh.yaml2
-rw-r--r--blueprints/k8s-sonhms.yaml4
-rw-r--r--blueprints/k8s-tcagen2-clampnode.yaml2
-rw-r--r--blueprints/k8s-tcagen2.yaml2
-rw-r--r--blueprints/k8s-ves-mapper.yaml2
-rw-r--r--blueprints/k8s-ves.yaml4
-rw-r--r--pom.xml2
-rw-r--r--reference_templates/k8s-tca-clampnode.yaml (renamed from blueprints/k8s-tca-clampnode.yaml)0
-rw-r--r--reference_templates/k8s-tca.yaml (renamed from blueprints/k8s-tca.yaml)0
-rw-r--r--releases/2.1.6-k8s-bootstrap-container.yaml8
-rw-r--r--version.properties2
19 files changed, 72 insertions, 19 deletions
diff --git a/blueprints/k8s-bbs-event-processor.yaml b/blueprints/k8s-bbs-event-processor.yaml
index 5115b6b..cbd0318 100644
--- a/blueprints/k8s-bbs-event-processor.yaml
+++ b/blueprints/k8s-bbs-event-processor.yaml
@@ -19,7 +19,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- - plugin:k8splugin?version=3.0.0
+ - plugin:k8splugin?version=3.4.2
inputs:
aai_enrichment_host:
diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml
index 7ab5607..87f508c 100644
--- a/blueprints/k8s-datafile.yaml
+++ b/blueprints/k8s-datafile.yaml
@@ -6,7 +6,7 @@ tosca_definitions_version: cloudify_dsl_1_3
description: Docker application to collect log file from PNF
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-- plugin:k8splugin?version=3.3.0
+- plugin:k8splugin?version=3.4.2
- plugin:dmaap?version=1.5.0
inputs:
PM_MEAS_FILES_feed0_location:
diff --git a/blueprints/k8s-heartbeat.yaml b/blueprints/k8s-heartbeat.yaml
index a8e2cf6..e349df0 100644
--- a/blueprints/k8s-heartbeat.yaml
+++ b/blueprints/k8s-heartbeat.yaml
@@ -19,7 +19,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- - plugin:k8splugin?version=3.0.0
+ - plugin:k8splugin?version=3.4.2
- plugin:pgaas?version=1.3.0
diff --git a/blueprints/k8s-holmes-engine.yaml b/blueprints/k8s-holmes-engine.yaml
index 64474c2..1684851 100644
--- a/blueprints/k8s-holmes-engine.yaml
+++ b/blueprints/k8s-holmes-engine.yaml
@@ -21,7 +21,7 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-- plugin:k8splugin?version=3.3.0
+- plugin:k8splugin?version=3.4.2
- plugin:dcaepolicyplugin?version=2.4.0
- plugin:pgaas?version=1.3.0
inputs:
@@ -54,7 +54,18 @@ inputs:
service_component_name_override:
type: string
default: "holmes-engine-mgmt"
-
+ dcae-analytics-holmes-engine-mgt_cpu_limit:
+ type: string
+ default: "500m"
+ dcae-analytics-holmes-engine-mgt_cpu_request:
+ type: string
+ default: "500m"
+ dcae-analytics-holmes-engine-mgt_memory_limit:
+ type: string
+ default: "1024Mi"
+ dcae-analytics-holmes-engine-mgt_memory_request:
+ type: string
+ default: "256Mi"
node_templates:
pgaasvm:
type: dcae.nodes.pgaas.database
@@ -105,6 +116,17 @@ node_templates:
image: { get_input: he_image }
# need to use truncated name!!
#service_component_type: dcae-analytics-holmes-engin-management
+ resource_config:
+ limits:
+ cpu:
+ get_input: dcae-analytics-holmes-engine-mgt_cpu_limit
+ memory:
+ get_input: dcae-analytics-holmes-engine-mgt_memory_limit
+ requests:
+ cpu:
+ get_input: dcae-analytics-holmes-engine-mgt_cpu_request
+ memory:
+ get_input: dcae-analytics-holmes-engine-mgt_memory_request
relationships:
- type: cloudify.relationships.depends_on
target: pgaasvm
diff --git a/blueprints/k8s-holmes-rules.yaml b/blueprints/k8s-holmes-rules.yaml
index 2431131..fd89fc2 100644
--- a/blueprints/k8s-holmes-rules.yaml
+++ b/blueprints/k8s-holmes-rules.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.3.0
+- plugin:k8splugin?version=3.4.2
- plugin:dcaepolicyplugin?version=2.4.0
- plugin:pgaas?version=1.3.0
inputs:
@@ -47,6 +47,18 @@ inputs:
service_component_name_override:
type: string
default: "holmes-rule-mgmt"
+ dcae-analytics-holmes-rule-mgt_cpu_limit:
+ type: string
+ default: "250m"
+ dcae-analytics-holmes-rule-mgt_cpu_request:
+ type: string
+ default: "250m"
+ dcae-analytics-holmes-rule-mgt_memory_limit:
+ type: string
+ default: "1024Mi"
+ dcae-analytics-holmes-rule-mgt_memory_request:
+ type: string
+ default: "256Mi"
node_templates:
pgaasvm:
type: dcae.nodes.pgaas.database
@@ -86,6 +98,17 @@ node_templates:
streams_subscribes: {}
image: { get_input: hr_image }
#service_component_type: dcae-analytics-holmes-rule-management
+ resource_config:
+ limits:
+ cpu:
+ get_input: dcae-analytics-holmes-rule-mgt_cpu_limit
+ memory:
+ get_input: dcae-analytics-holmes-rule-mgt_memory_limit
+ requests:
+ cpu:
+ get_input: dcae-analytics-holmes-rule-mgt_cpu_request
+ memory:
+ get_input: dcae-analytics-holmes-rule-mgt_memory_request
relationships:
- type: cloudify.relationships.depends_on
target: pgaasvm
diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml
index d6f753a..8c42786 100644
--- a/blueprints/k8s-hv-ves.yaml
+++ b/blueprints/k8s-hv-ves.yaml
@@ -22,7 +22,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.1
+ - plugin:k8splugin?version=3.4.2
inputs:
tag_version:
diff --git a/blueprints/k8s-pm-mapper.yaml b/blueprints/k8s-pm-mapper.yaml
index ad6a325..ead7d74 100644
--- a/blueprints/k8s-pm-mapper.yaml
+++ b/blueprints/k8s-pm-mapper.yaml
@@ -23,7 +23,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml'
- - plugin:k8splugin?version=3.3.0
+ - plugin:k8splugin?version=3.4.2
- plugin:dmaap?version=1.5.0
inputs:
diff --git a/blueprints/k8s-pmsh.yaml b/blueprints/k8s-pmsh.yaml
index 2dc5b60..51b018d 100644
--- a/blueprints/k8s-pmsh.yaml
+++ b/blueprints/k8s-pmsh.yaml
@@ -22,7 +22,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml'
- - plugin:k8splugin?version=3.0.0
+ - plugin:k8splugin?version=3.4.2
- plugin:pgaas?version=1.3.0
inputs:
tag_version:
diff --git a/blueprints/k8s-prh.yaml b/blueprints/k8s-prh.yaml
index f625912..22ea068 100644
--- a/blueprints/k8s-prh.yaml
+++ b/blueprints/k8s-prh.yaml
@@ -22,7 +22,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- - plugin:k8splugin?version=3.3.0
+ - plugin:k8splugin?version=3.4.2
inputs:
pnfUrl:
type: string
diff --git a/blueprints/k8s-sonhms.yaml b/blueprints/k8s-sonhms.yaml
index 4d9d648..795000e 100644
--- a/blueprints/k8s-sonhms.yaml
+++ b/blueprints/k8s-sonhms.yaml
@@ -19,7 +19,7 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
- "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"
- - plugin:k8splugin?version=3.0.0
+ - plugin:k8splugin?version=3.4.2
- plugin:pgaas?version=1.3.0
- plugin:dcaepolicyplugin?version=2.4.0
inputs:
@@ -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.0.2"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:2.1.1"
pgaas_cluster_name:
type: string
description: pg cluster
diff --git a/blueprints/k8s-tcagen2-clampnode.yaml b/blueprints/k8s-tcagen2-clampnode.yaml
index cc15ffa..f5bdbf6 100644
--- a/blueprints/k8s-tcagen2-clampnode.yaml
+++ b/blueprints/k8s-tcagen2-clampnode.yaml
@@ -19,7 +19,7 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- - plugin:k8splugin?version=3.0.0
+ - plugin:k8splugin?version=3.4.2
- plugin:clamppolicyplugin?version=1.1.0
inputs:
service_name:
diff --git a/blueprints/k8s-tcagen2.yaml b/blueprints/k8s-tcagen2.yaml
index 3c35b61..5fe2efb 100644
--- a/blueprints/k8s-tcagen2.yaml
+++ b/blueprints/k8s-tcagen2.yaml
@@ -18,7 +18,7 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- - plugin:k8splugin?version=3.3.0
+ - plugin:k8splugin?version=3.4.2
inputs:
service_component_type:
type: string
diff --git a/blueprints/k8s-ves-mapper.yaml b/blueprints/k8s-ves-mapper.yaml
index 0967122..b7c277a 100644
--- a/blueprints/k8s-ves-mapper.yaml
+++ b/blueprints/k8s-ves-mapper.yaml
@@ -20,7 +20,7 @@
description: "This blueprint deploys the UniversalVESAdapter"
imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- - plugin:k8splugin?version=3.0.0
+ - plugin:k8splugin?version=3.4.2
inputs:
rcc_notification_url:
diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml
index 845857a..d16a337 100644
--- a/blueprints/k8s-ves.yaml
+++ b/blueprints/k8s-ves.yaml
@@ -22,7 +22,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.1
+ - plugin:k8splugin?version=3.4.2
inputs:
ves_other_publish_url:
@@ -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.5"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.7.6"
internal_port:
type: string
description: Kubernetes node port on which collector is exposed
diff --git a/pom.xml b/pom.xml
index 8d9c553..5460f55 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.5-SNAPSHOT</version>
+ <version>2.1.7-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<packaging>pom</packaging>
diff --git a/blueprints/k8s-tca-clampnode.yaml b/reference_templates/k8s-tca-clampnode.yaml
index c2a0cc3..c2a0cc3 100644
--- a/blueprints/k8s-tca-clampnode.yaml
+++ b/reference_templates/k8s-tca-clampnode.yaml
diff --git a/blueprints/k8s-tca.yaml b/reference_templates/k8s-tca.yaml
index 627aee4..627aee4 100644
--- a/blueprints/k8s-tca.yaml
+++ b/reference_templates/k8s-tca.yaml
diff --git a/releases/2.1.6-k8s-bootstrap-container.yaml b/releases/2.1.6-k8s-bootstrap-container.yaml
new file mode 100644
index 0000000..e6f60aa
--- /dev/null
+++ b/releases/2.1.6-k8s-bootstrap-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '2.1.6'
+project: 'dcaegen2/blueprints'
+log_dir: 'dcaegen2-platform-blueprints-master-merge-java/300'
+ref: 04f2c06f34ae9c2cd91af8d665bf158b9c7d824e
+containers:
+ - name: 'org.onap.dcaegen2.deployments.k8s-bootstrap-container'
+ version: '2.1.6-SNAPSHOT-20200922T203744Z'
diff --git a/version.properties b/version.properties
index 201272e..d1ba756 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=2
minor=1
-patch=5
+patch=7
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT