Update type files for R6

Configures resolver to R6 path to type files
Picks up k8splugin change to provide CA certs in JKS format

Issue-ID: DCAEGEN2-1938
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Change-Id: I7519d8be52254ef0ac41eb02d6a66f4a80d79501

3 files changed, 15 insertions, 16 deletions

diff --git a/cm-container/README.md b/cm-container/README.md
index 7d90aeb..3e3d45a 100644
--- a/cm-container/README.md
+++ b/cm-container/README.md
@@ -3,12 +3,11 @@
 The artifacts in this directory build a Docker image based on the
 public image from Cloudify (`cloudifyplatform/community`).  The
 image has the Cloudify Manager software from the base image
-and adds our types files.  It edits `/etc/cloudify/config.yaml`
-to configure the import resolver to use our local type files instead
-of fetching them over the Internet.   It adds
-Cloudify 3.4 type files that are still used in some plugins
-and blueprints.  Finally, it sets up the `/opt/onap` mount point
-for our config files.
+and adds our types files.  It configures
+the import resolver to use our local type files instead
+of fetching them over the Internet.   It sets up the `/opt/onap` mount point
+for our config files.  It also sets up the certificate, key and other
+configuration for using TLS.
 
 ## Running the Container
 The container is intended to be launched via a Helm chart as part
@@ -37,7 +36,7 @@ In an ONAP deployment driven by OOM, Cloudify Manager will store data related to
 in a Kubernetes PersistentVolume.  If the Cloudify Manager pod is destroyed and recreated,
 the new instance will have all of the state information from the previous run.
 
-To set up persistent, we replace the command run by the container (`CMD` in the Dockerfile) with
+To set up persistent storage, we replace the command run by the container (`CMD` in the Dockerfile) with
 our own script `start-persistent.sh`.  This script checks to see if a persistent volume has been
 mounted in a well-known place (`/cfy-persist` in the container's file system).  If so, the script
 then checks to see if the persistent volume has been populated with data.  There are two possibilities:
diff --git a/cm-container/pom.xml b/cm-container/pom.xml
index f59c66c..207e979 100644
--- a/cm-container/pom.xml
+++ b/cm-container/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 ================================================================================
-Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2018-2020 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.
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>cm-container</artifactId>
   <name>dcaegen2-deployments-cm-container</name>
-  <version>2.0.2</version>
+  <version>2.1.0</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/cm-container/scripts/get-type-files.sh b/cm-container/scripts/get-type-files.sh
index 067f45c..3b25bbb 100755
--- a/cm-container/scripts/get-type-files.sh
+++ b/cm-container/scripts/get-type-files.sh
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # org.onap.dcae
 # ================================================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 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.
@@ -28,11 +28,11 @@ EXTRA_RULES=/opt/manager/extra-resolver-rules
 
 DCAETYPEFILES=\
 "\
-/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml \
-/relationshipplugin/1.0.0/relationshipplugin_types.yaml \
-/k8splugin/1.4.13/k8splugin_types.yaml \
-/k8splugin/1.6.0/k8splugin_types.yaml \
-clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml \
+/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml \
+/relationshipplugin/1.1.0/relationshipplugin_types.yaml \
+/k8splugin/1.7.2/k8splugin_types.yaml \
+/k8splugin/2.0.0/k8splugin_types.yaml \
+clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml \
 
 "
 
@@ -40,7 +40,7 @@ CCSDKTYPEFILES=\
 "\
 /type_files/pgaas/1.1.0/pgaas_types.yaml \
 /type_files/sshkeyshare/sshkey_types.yaml \
-/type_files/helm/4.0.0/helm-type.yaml \
+/type_files/helm/4.0.2/helm-type.yaml \
 /type_files/dmaap/dmaap.yaml \
 "