From 18bcb8230f6f1fac2f8dc905e2ca197f43810a1e Mon Sep 17 00:00:00 2001 From: Piotr Marcinkiewicz Date: Tue, 24 Nov 2020 09:20:30 +0100 Subject: Update blueprints to use k8splugin 3.4.3 Issue-ID: DCAEGEN2-2508 Signed-off-by: Piotr Marcinkiewicz Change-Id: I74207c61f343d0caaeb41e214dde015fb06c1818 --- blueprints/k8s-bbs-event-processor.yaml | 2 +- blueprints/k8s-datafile.yaml | 2 +- blueprints/k8s-datalake-des.yaml | 4 ++-- blueprints/k8s-heartbeat.yaml | 2 +- blueprints/k8s-holmes-engine.yaml | 2 +- blueprints/k8s-holmes-rules.yaml | 2 +- blueprints/k8s-hv-ves.yaml | 2 +- blueprints/k8s-pm-mapper.yaml | 2 +- blueprints/k8s-pmsh.yaml | 2 +- blueprints/k8s-prh.yaml | 2 +- blueprints/k8s-slice-analysis-ms.yaml | 2 +- blueprints/k8s-sonhms.yaml | 2 +- blueprints/k8s-tcagen2-clampnode.yaml | 2 +- blueprints/k8s-tcagen2.yaml | 2 +- blueprints/k8s-ves-mapper.yaml | 2 +- blueprints/k8s-ves.yaml | 2 +- pom.xml | 2 +- version.properties | 4 ++-- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/blueprints/k8s-bbs-event-processor.yaml b/blueprints/k8s-bbs-event-processor.yaml index cbd0318..cb13397 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.4.2 + - plugin:k8splugin?version=3.4.3 inputs: aai_enrichment_host: diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml index 87f508c..a43e378 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.4.2 +- plugin:k8splugin?version=3.4.3 - plugin:dmaap?version=1.5.0 inputs: PM_MEAS_FILES_feed0_location: diff --git a/blueprints/k8s-datalake-des.yaml b/blueprints/k8s-datalake-des.yaml index debe95d..c3b235f 100644 --- a/blueprints/k8s-datalake-des.yaml +++ b/blueprints/k8s-datalake-des.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.4.2 + - plugin:k8splugin?version=3.4.3 inputs: service_name: type: string @@ -124,4 +124,4 @@ node_templates: endpoint: /datalake/v1/exposure service_component_type: 'dcae-des' service_id: 'dcae-des' - service_component_name_override: 'dcae-des' \ No newline at end of file + service_component_name_override: 'dcae-des' diff --git a/blueprints/k8s-heartbeat.yaml b/blueprints/k8s-heartbeat.yaml index 2fdee83..af0f1ef 100644 --- a/blueprints/k8s-heartbeat.yaml +++ b/blueprints/k8s-heartbeat.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.2 + - plugin:k8splugin?version=3.4.3 - plugin:pgaas?version=1.3.0 diff --git a/blueprints/k8s-holmes-engine.yaml b/blueprints/k8s-holmes-engine.yaml index 6557535..cf9c19b 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.4.2 +- plugin:k8splugin?version=3.4.3 - plugin:dcaepolicyplugin?version=2.4.0 - plugin:pgaas?version=1.3.0 inputs: diff --git a/blueprints/k8s-holmes-rules.yaml b/blueprints/k8s-holmes-rules.yaml index 62376ad..3249af9 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.4.2 +- plugin:k8splugin?version=3.4.3 - plugin:dcaepolicyplugin?version=2.4.0 - plugin:pgaas?version=1.3.0 inputs: diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml index 8c42786..a11e696 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.2 + - plugin:k8splugin?version=3.4.3 inputs: tag_version: diff --git a/blueprints/k8s-pm-mapper.yaml b/blueprints/k8s-pm-mapper.yaml index adfe740..c2eeeaa 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.4.2 + - plugin:k8splugin?version=3.4.3 - plugin:dmaap?version=1.5.0 inputs: diff --git a/blueprints/k8s-pmsh.yaml b/blueprints/k8s-pmsh.yaml index 92405b6..c653100 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.4.2 + - plugin:k8splugin?version=3.4.3 - plugin:pgaas?version=1.3.0 inputs: tag_version: diff --git a/blueprints/k8s-prh.yaml b/blueprints/k8s-prh.yaml index 22ea068..9458d18 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.4.2 + - plugin:k8splugin?version=3.4.3 inputs: pnfUrl: type: string diff --git a/blueprints/k8s-slice-analysis-ms.yaml b/blueprints/k8s-slice-analysis-ms.yaml index 41523a2..86a8405 100644 --- a/blueprints/k8s-slice-analysis-ms.yaml +++ b/blueprints/k8s-slice-analysis-ms.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.4.2 + - plugin:k8splugin?version=3.4.3 - plugin:pgaas?version=1.3.0 inputs: replicas: diff --git a/blueprints/k8s-sonhms.yaml b/blueprints/k8s-sonhms.yaml index c707ac1..63761cf 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.4.2 + - plugin:k8splugin?version=3.4.3 - plugin:pgaas?version=1.3.0 - plugin:dcaepolicyplugin?version=2.4.0 inputs: diff --git a/blueprints/k8s-tcagen2-clampnode.yaml b/blueprints/k8s-tcagen2-clampnode.yaml index e7d967a..ff87321 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.4.2 + - plugin:k8splugin?version=3.4.3 - plugin:clamppolicyplugin?version=1.1.0 inputs: service_name: diff --git a/blueprints/k8s-tcagen2.yaml b/blueprints/k8s-tcagen2.yaml index 046d65c..5a7b2db 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.4.2 + - plugin:k8splugin?version=3.4.3 inputs: service_component_type: type: string diff --git a/blueprints/k8s-ves-mapper.yaml b/blueprints/k8s-ves-mapper.yaml index b7c277a..3788acf 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.4.2 + - plugin:k8splugin?version=3.4.3 inputs: rcc_notification_url: diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml index 8b134f3..c21093a 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.2 + - plugin:k8splugin?version=3.4.3 inputs: ves_other_publish_url: diff --git a/pom.xml b/pom.xml index c66a745..2c37187 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. org.onap.dcaegen2.deployments k8s-bootstrap-container dcaegen2-deployments-k8s-bootstrap-container - 2.1.8-SNAPSHOT + 2.2.0-SNAPSHOT http://maven.apache.org pom diff --git a/version.properties b/version.properties index 8ac80b7..5791c10 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=2 -minor=1 -patch=8 +minor=2 +patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg