Update blueprints to use k8splugin 3.4.2

k8splugin 3.4.2 correctly labels the k8s deployments it creates so
that the DCAE healthcheck can find them and check their health
Also move tca (gen1) blueprints to reference_templates since
they are no longer used

Issue-ID: DCAEGEN2-2433
Signed-off-by: Jack Lucas <jflos@sonoris.net>
Change-Id: Ib20889feade01deb414627a6da0c663af4a7d6cf

diff --git a/blueprints/k8s-bbs-event-processor.yaml b/blueprints/k8s-bbs-event-processor.yaml
index 5115b6b..cbd0318 100644 (file)
--- 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
 \r
 imports:\r
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml\r
-  - plugin:k8splugin?version=3.0.0\r
+  - plugin:k8splugin?version=3.4.2\r
 \r
 inputs:\r
   aai_enrichment_host:\r

diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml
index 7ab5607..87f508c 100644 (file)
--- 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 (file)
--- 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..db87ba3 100644 (file)
--- 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:

diff --git a/blueprints/k8s-holmes-rules.yaml b/blueprints/k8s-holmes-rules.yaml
index 2431131..830db47 100644 (file)
--- 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:

diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml
index d6f753a..8c42786 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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..bbf9cc7 100644 (file)
--- 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:

diff --git a/blueprints/k8s-tcagen2-clampnode.yaml b/blueprints/k8s-tcagen2-clampnode.yaml
index cc15ffa..f5bdbf6 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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..b956d0f 100644 (file)
--- 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:

diff --git a/pom.xml b/pom.xml
index 8d9c553..77a3af3 100644 (file)
--- 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.6-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
similarity index 100%
rename from blueprints/k8s-tca-clampnode.yaml
rename to reference_templates/k8s-tca-clampnode.yaml

diff --git a/blueprints/k8s-tca.yaml b/reference_templates/k8s-tca.yaml
similarity index 100%
rename from blueprints/k8s-tca.yaml
rename to reference_templates/k8s-tca.yaml

diff --git a/version.properties b/version.properties
index 201272e..0ababa3 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=2\r
 minor=1\r
-patch=5\r
+patch=6\r
 base_version=${major}.${minor}.${patch}\r
 release_version=${base_version}\r
 snapshot_version=${base_version}-SNAPSHOT\r