From 2418a1d5854182a786f97075f8600ff0786e0e92 Mon Sep 17 00:00:00 2001 From: Piotr Marcinkiewicz Date: Fri, 27 Nov 2020 11:29:05 +0100 Subject: Update blueprints to use k8splugin in version range >=3.4.3,<4.0.0 Issue-ID: DCAEGEN2-2508 Signed-off-by: Piotr Marcinkiewicz Change-Id: Ic915d283367df6e675e083be0348f4751f47b5a2 --- blueprints/k8s-bbs-event-processor.yaml | 2 +- blueprints/k8s-datafile.yaml | 2 +- blueprints/k8s-datalake-des.yaml | 2 +- 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 | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/blueprints/k8s-bbs-event-processor.yaml b/blueprints/k8s-bbs-event-processor.yaml index e5f2d50..93f3fe4 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 inputs: aai_enrichment_host: diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml index ed85ec1..fda3c3d 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.3 +- plugin:k8splugin?version=>=3.4.3,<4.0.0 - 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 c3b235f..a6052c7 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 inputs: service_name: type: string diff --git a/blueprints/k8s-heartbeat.yaml b/blueprints/k8s-heartbeat.yaml index af0f1ef..f1afd82 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 - plugin:pgaas?version=1.3.0 diff --git a/blueprints/k8s-holmes-engine.yaml b/blueprints/k8s-holmes-engine.yaml index cf9c19b..87d7de8 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.3 +- plugin:k8splugin?version=>=3.4.3,<4.0.0 - 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 3249af9..c50c925 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.3 +- plugin:k8splugin?version=>=3.4.3,<4.0.0 - 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 4efd7d0..7943ed5 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 inputs: tag_version: diff --git a/blueprints/k8s-pm-mapper.yaml b/blueprints/k8s-pm-mapper.yaml index 41624e8..8d37860 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 - plugin:dmaap?version=1.5.0 inputs: diff --git a/blueprints/k8s-pmsh.yaml b/blueprints/k8s-pmsh.yaml index c653100..3e46d13 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 - plugin:pgaas?version=1.3.0 inputs: tag_version: diff --git a/blueprints/k8s-prh.yaml b/blueprints/k8s-prh.yaml index 9458d18..f76963a 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 inputs: pnfUrl: type: string diff --git a/blueprints/k8s-slice-analysis-ms.yaml b/blueprints/k8s-slice-analysis-ms.yaml index 86a8405..4615888 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 - plugin:pgaas?version=1.3.0 inputs: replicas: diff --git a/blueprints/k8s-sonhms.yaml b/blueprints/k8s-sonhms.yaml index ac96a60..a30d018 100644 --- a/blueprints/k8s-sonhms.yaml +++ b/blueprints/k8s-sonhms.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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 - 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 ff87321..0f13c53 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 - plugin:clamppolicyplugin?version=1.1.0 inputs: service_name: diff --git a/blueprints/k8s-tcagen2.yaml b/blueprints/k8s-tcagen2.yaml index 5a7b2db..3fe4c93 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 inputs: service_component_type: type: string diff --git a/blueprints/k8s-ves-mapper.yaml b/blueprints/k8s-ves-mapper.yaml index 3788acf..7d90763 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 inputs: rcc_notification_url: diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml index d6cf08f..b44b312 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.3 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 inputs: ves_other_publish_url: diff --git a/pom.xml b/pom.xml index a523193..f58846e 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.2.2-SNAPSHOT + 2.2.3-SNAPSHOT http://maven.apache.org pom diff --git a/version.properties b/version.properties index 3d83508..703b401 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=2 minor=2 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg