summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/cds/charts/cds-ui/values.yaml2
-rw-r--r--kubernetes/dcaegen2/Chart.yaml2
-rw-r--r--kubernetes/dcaegen2/Makefile37
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/.helmignore (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/.helmignore)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml)2
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/certs/cacert.pem (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/certs/cacert.pem)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/dmaap-plugin.json (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/dmaap-plugin.json)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-hv_ves-inputs.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-hv_ves-inputs.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-pgaas-initdb-inputs.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-pgaas-initdb-inputs.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-prh-inputs.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-prh-inputs.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-snmptrap-inputs.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-snmptrap-inputs.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-tca-inputs.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-tca-inputs.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/templates/configmap.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/templates/configmap.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/templates/secret.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/templates/secret.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml (renamed from kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/.helmignore (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/.helmignore)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml)2
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/README.md (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/README.md)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/resources/config/config.txt (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/resources/config/config.txt)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/resources/config/log/filebeat.yml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/resources/config/log/filebeat.yml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/configmap.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/job.yaml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/job.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/namespace.yaml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/namespace.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/pv.yaml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pv.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/pvc.yaml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pvc.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/secret.yaml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/service.yaml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml (renamed from kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml (renamed from kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml)2
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml (renamed from kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/resources/config/log/filebeat/filebeat.yml (renamed from kubernetes/dcaegen2/charts/dcae-config-binding-service/resources/config/log/filebeat/filebeat.yml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/templates/configmap.yaml (renamed from kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/configmap.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml (renamed from kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/templates/service.yaml (renamed from kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/service.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-config-binding-service/values.yaml (renamed from kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-dashboard/.helmignore (renamed from kubernetes/dcaegen2/charts/dcae-dashboard/.helmignore)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml (renamed from kubernetes/dcaegen2/charts/dcae-dashboard/Chart.yaml)2
-rw-r--r--kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml (renamed from kubernetes/dcaegen2/charts/dcae-dashboard/requirements.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-dashboard/resources/log/filebeat.yml (renamed from kubernetes/dcaegen2/charts/dcae-dashboard/resources/log/filebeat.yml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-dashboard/templates/configmap.yaml (renamed from kubernetes/dcaegen2/charts/dcae-dashboard/templates/configmap.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-dashboard/templates/deployment.yaml (renamed from kubernetes/dcaegen2/charts/dcae-dashboard/templates/deployment.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-dashboard/templates/service.yaml (renamed from kubernetes/dcaegen2/charts/dcae-dashboard/templates/service.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-dashboard/values.yaml (renamed from kubernetes/dcaegen2/charts/dcae-dashboard/values.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/.helmignore (renamed from kubernetes/dcaegen2/charts/dcae-deployment-handler/.helmignore)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml (renamed from kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml)2
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml (renamed from kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/resources/config/config.json (renamed from kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/config/config.json)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log/filebeat.yml (renamed from kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/log/filebeat.yml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml (renamed from kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/configmap.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml (renamed from kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/deployment.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/templates/service.yaml (renamed from kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/service.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/values.yaml (renamed from kubernetes/dcaegen2/charts/dcae-deployment-handler/values.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml (renamed from kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml)2
-rw-r--r--kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml (renamed from kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-healthcheck/templates/deployment.yaml (renamed from kubernetes/dcaegen2/charts/dcae-healthcheck/templates/deployment.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-healthcheck/templates/service.yaml (renamed from kubernetes/dcaegen2/charts/dcae-healthcheck/templates/service.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml (renamed from kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml)2
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/resources/config/config.json (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/resources/config/config.json)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/templates/configmap.yaml (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/configmap.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/deployment.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/templates/service.yaml (renamed from kubernetes/dcaegen2/charts/dcae-policy-handler/templates/service.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-inventory-api/values.yaml (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/values.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/.helmignore (renamed from kubernetes/dcaegen2/charts/dcae-policy-handler/.helmignore)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml (renamed from kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml)2
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml (renamed from kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/resources/config/config.json (renamed from kubernetes/dcaegen2/charts/dcae-policy-handler/resources/config/config.json)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/resources/log/filebeat.yml (renamed from kubernetes/dcaegen2/charts/dcae-policy-handler/resources/log/filebeat.yml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/templates/configmap.yaml (renamed from kubernetes/dcaegen2/charts/dcae-policy-handler/templates/configmap.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/templates/deployment.yaml (renamed from kubernetes/dcaegen2/charts/dcae-policy-handler/templates/deployment.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/templates/service.yaml (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/service.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/values.yaml (renamed from kubernetes/dcaegen2/charts/dcae-policy-handler/values.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-redis/.helmignore (renamed from kubernetes/dcaegen2/charts/dcae-redis/.helmignore)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-redis/Chart.yaml (renamed from kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml)2
-rw-r--r--kubernetes/dcaegen2/components/dcae-redis/requirements.yaml (renamed from kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml)0
-rwxr-xr-xkubernetes/dcaegen2/components/dcae-redis/resources/redis/scripts/redis-cluster-config.sh (renamed from kubernetes/dcaegen2/charts/dcae-redis/resources/redis/scripts/redis-cluster-config.sh)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-redis/templates/NOTES.txt (renamed from kubernetes/dcaegen2/charts/dcae-redis/templates/NOTES.txt)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-redis/templates/configmap.yaml (renamed from kubernetes/dcaegen2/charts/dcae-redis/templates/configmap.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-redis/templates/pv.yaml (renamed from kubernetes/dcaegen2/charts/dcae-redis/templates/pv.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-redis/templates/service.yaml (renamed from kubernetes/dcaegen2/charts/dcae-redis/templates/service.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-redis/templates/statefulset.yaml (renamed from kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-redis/values.yaml (renamed from kubernetes/dcaegen2/charts/dcae-redis/values.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml)2
-rw-r--r--kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-servicechange-handler/resources/config/config.json (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/resources/config/config.json)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-servicechange-handler/templates/configmap.yaml (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/configmap.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-servicechange-handler/templates/deployment.yaml (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/deployment.yaml)0
-rw-r--r--kubernetes/dcaegen2/components/dcae-servicechange-handler/values.yaml (renamed from kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml)0
-rw-r--r--kubernetes/dcaegen2/requirements.yaml41
-rw-r--r--kubernetes/msb/charts/msb-consul/values.yaml2
-rw-r--r--kubernetes/msb/charts/msb-discovery/values.yaml2
-rw-r--r--kubernetes/msb/charts/msb-eag/templates/service.yaml3
-rw-r--r--kubernetes/msb/charts/msb-eag/values.yaml1
-rw-r--r--kubernetes/msb/charts/msb-iag/templates/service.yaml3
-rw-r--r--kubernetes/multicloud/charts/multicloud-lenovo/.helmignore21
-rw-r--r--kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml18
-rw-r--r--kubernetes/multicloud/charts/multicloud-lenovo/resources/config/log/log.yml47
-rw-r--r--kubernetes/multicloud/charts/multicloud-lenovo/templates/NOTES.txt34
-rw-r--r--kubernetes/multicloud/charts/multicloud-lenovo/templates/configmap.yaml28
-rw-r--r--kubernetes/multicloud/charts/multicloud-lenovo/templates/deployment.yaml110
-rw-r--r--kubernetes/multicloud/charts/multicloud-lenovo/templates/service.yaml61
-rw-r--r--kubernetes/multicloud/charts/multicloud-lenovo/values.yaml87
-rwxr-xr-xkubernetes/onap/requirements.yaml2
-rw-r--r--kubernetes/policy/charts/policy-xacml-pdp/resources/config/config.json3
115 files changed, 85 insertions, 439 deletions
diff --git a/kubernetes/cds/charts/cds-ui/values.yaml b/kubernetes/cds/charts/cds-ui/values.yaml
index 3b7659a3a5..8fd2c7a651 100644
--- a/kubernetes/cds/charts/cds-ui/values.yaml
+++ b/kubernetes/cds/charts/cds-ui/values.yaml
@@ -40,7 +40,7 @@ config:
api:
controller:
http:
- baseUrl: http://cds-controller-blueprints:8080/api/v1
+ baseUrl: http://cds-blueprints-processor-http:8081/api/v1
authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
processor:
http:
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index 9c23194558..6dbd40679e 100644
--- a/kubernetes/dcaegen2/Chart.yaml
+++ b/kubernetes/dcaegen2/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP DCAE Gen2
name: dcaegen2
-version: 5.0.0
+version: 6.0.0
diff --git a/kubernetes/dcaegen2/Makefile b/kubernetes/dcaegen2/Makefile
index fcd62da048..f10f2fc682 100644
--- a/kubernetes/dcaegen2/Makefile
+++ b/kubernetes/dcaegen2/Makefile
@@ -1,31 +1,48 @@
+# Copyright © 2019 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
make-dcaegen2: make-dcae-bootstrap make-dcae-cloudify-manager make-dcae-config-binding-service make-dcae-healthcheck make-dcae-redis make-dcae-servicechange-handler make-dcae-inventory-api make-dcae-deployment-handler make-dcae-policy-handler make-dcae-dashboard
make-dcae-bootstrap:
- cd charts && helm dep up dcae-bootstrap && helm lint dcae-bootstrap
+ cd components && helm dep up dcae-bootstrap && helm lint dcae-bootstrap
make-dcae-cloudify-manager:
- cd charts && helm dep up dcae-cloudify-manager && helm lint dcae-cloudify-manager
+ cd components && helm dep up dcae-cloudify-manager && helm lint dcae-cloudify-manager
make-dcae-config-binding-service:
- cd charts && helm dep up dcae-config-binding-service && helm lint dcae-config-binding-service
+ cd components && helm dep up dcae-config-binding-service && helm lint dcae-config-binding-service
make-dcae-healthcheck:
- cd charts && helm dep up dcae-healthcheck && helm lint dcae-healthcheck
+ cd components && helm dep up dcae-healthcheck && helm lint dcae-healthcheck
make-dcae-redis:
- cd charts && helm dep up dcae-redis && helm lint dcae-redis
+ cd components && helm dep up dcae-redis && helm lint dcae-redis
make-dcae-servicechange-handler:
- cd charts && helm dep up dcae-servicechange-handler && helm lint dcae-servicechange-handler
+ cd components && helm dep up dcae-servicechange-handler && helm lint dcae-servicechange-handler
make-dcae-inventory-api:
- cd charts/dcae-servicechange-handler/charts && helm dep up dcae-inventory-api && helm lint dcae-inventory-api
+ cd components && helm dep up dcae-inventory-api && helm lint dcae-inventory-api
make-dcae-deployment-handler:
- cd charts && helm dep up dcae-deployment-handler && helm lint dcae-deployment-handler
+ cd components && helm dep up dcae-deployment-handler && helm lint dcae-deployment-handler
make-dcae-policy-handler:
- cd charts && helm dep up dcae-policy-handler && helm lint dcae-policy-handler
+ cd components && helm dep up dcae-policy-handler && helm lint dcae-policy-handler
make-dcae-dashboard:
- cd charts && helm dep up dcae-dashboard && helm lint dcae-dashboard
+ cd components && helm dep up dcae-dashboard && helm lint dcae-dashboard
+
+clean:
+ @find . -type f -name '*.tgz' -delete
+ @find . -type f -name '*.lock' -delete
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/.helmignore b/kubernetes/dcaegen2/components/dcae-bootstrap/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/.helmignore
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/.helmignore
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
index b92c9439e8..87b6a87ee2 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE Bootstrap
name: dcae-bootstrap
-version: 5.0.0
+version: 6.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
index 4b650c06dd..4b650c06dd 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/certs/cacert.pem b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/certs/cacert.pem
index 897c8ae499..897c8ae499 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/certs/cacert.pem
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/certs/cacert.pem
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/dmaap-plugin.json b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/dmaap-plugin.json
index 41404b0199..41404b0199 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/dmaap-plugin.json
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/dmaap-plugin.json
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json
index d459d5bb95..d459d5bb95 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml
index 2718e1882f..2718e1882f 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml
index f330e647b4..f330e647b4 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml
index f6a4c7cf85..f6a4c7cf85 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml
index 7ede89e521..7ede89e521 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-hv_ves-inputs.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-hv_ves-inputs.yaml
index a6fbea1e1d..a6fbea1e1d 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-hv_ves-inputs.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-hv_ves-inputs.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-pgaas-initdb-inputs.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-pgaas-initdb-inputs.yaml
index 23bb080690..23bb080690 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-pgaas-initdb-inputs.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-pgaas-initdb-inputs.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-prh-inputs.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-prh-inputs.yaml
index 1491e731d8..1491e731d8 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-prh-inputs.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-prh-inputs.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-snmptrap-inputs.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-snmptrap-inputs.yaml
index aa2b9a3f18..aa2b9a3f18 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-snmptrap-inputs.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-snmptrap-inputs.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-tca-inputs.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-tca-inputs.yaml
index 9240094fa9..9240094fa9 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-tca-inputs.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-tca-inputs.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml
index 69e7cb76de..69e7cb76de 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/configmap.yaml
index 21134ada9f..21134ada9f 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml
index be5a769a37..be5a769a37 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/secret.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/secret.yaml
index 87dc6cd219..87dc6cd219 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/secret.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/secret.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
index 00a285bd3d..00a285bd3d 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/.helmignore b/kubernetes/dcaegen2/components/dcae-cloudify-manager/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/.helmignore
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/.helmignore
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
index 159e2b5933..5a23621f2a 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE Cloudify Manager
name: dcae-cloudify-manager
-version: 5.0.0
+version: 6.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/README.md b/kubernetes/dcaegen2/components/dcae-cloudify-manager/README.md
index c995a62c09..c995a62c09 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/README.md
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/README.md
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
index 57ee781445..57ee781445 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/resources/config/config.txt b/kubernetes/dcaegen2/components/dcae-cloudify-manager/resources/config/config.txt
index 7606ba55ae..7606ba55ae 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/resources/config/config.txt
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/resources/config/config.txt
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/resources/config/log/filebeat.yml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/resources/config/log/filebeat.yml
index 1a3f693a12..1a3f693a12 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/resources/config/log/filebeat.yml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/resources/config/log/filebeat.yml
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml
index b8dadaae89..b8dadaae89 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml
index b3e90a2efb..b3e90a2efb 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/job.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/job.yaml
index bd0ea517f6..bd0ea517f6 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/job.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/job.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/namespace.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/namespace.yaml
index 57cbe89cc1..57cbe89cc1 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/namespace.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/namespace.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pv.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/pv.yaml
index bef681ad27..bef681ad27 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pv.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/pv.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pvc.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/pvc.yaml
index 6740082b37..6740082b37 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pvc.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/pvc.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/secret.yaml
index d290204c03..d290204c03 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/secret.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/service.yaml
index 7eaf4b6ae2..7eaf4b6ae2 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/service.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
index d8db056f96..d8db056f96 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
index f1aa82bc69..8d9a28a4b4 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
@@ -18,4 +18,4 @@
apiVersion: v1
description: ONAP DCAE Config Binding Service
name: dcae-config-binding-service
-version: 5.0.0 \ No newline at end of file
+version: 6.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
index 57ee781445..57ee781445 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/resources/config/log/filebeat/filebeat.yml b/kubernetes/dcaegen2/components/dcae-config-binding-service/resources/config/log/filebeat/filebeat.yml
index 1a3f693a12..1a3f693a12 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/resources/config/log/filebeat/filebeat.yml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/resources/config/log/filebeat/filebeat.yml
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/configmap.yaml
index a150cbd336..a150cbd336 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
index c3e63fb968..c3e63fb968 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/service.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/service.yaml
index 8176e77c1e..8176e77c1e 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/service.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/service.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/values.yaml
index 8cff544d93..8cff544d93 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/values.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-dashboard/.helmignore b/kubernetes/dcaegen2/components/dcae-dashboard/.helmignore
index 50af031725..50af031725 100644
--- a/kubernetes/dcaegen2/charts/dcae-dashboard/.helmignore
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/.helmignore
diff --git a/kubernetes/dcaegen2/charts/dcae-dashboard/Chart.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
index 5250c17584..a46ea7ec52 100644
--- a/kubernetes/dcaegen2/charts/dcae-dashboard/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: DCAE Dashboard
name: dcae-dashboard
-version: 5.0.0
+version: 6.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-dashboard/requirements.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
index b0e70b3c2f..b0e70b3c2f 100644
--- a/kubernetes/dcaegen2/charts/dcae-dashboard/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-dashboard/resources/log/filebeat.yml b/kubernetes/dcaegen2/components/dcae-dashboard/resources/log/filebeat.yml
index 0e5ee9bffa..0e5ee9bffa 100644
--- a/kubernetes/dcaegen2/charts/dcae-dashboard/resources/log/filebeat.yml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/resources/log/filebeat.yml
diff --git a/kubernetes/dcaegen2/charts/dcae-dashboard/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/templates/configmap.yaml
index 41d5826e13..41d5826e13 100644
--- a/kubernetes/dcaegen2/charts/dcae-dashboard/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-dashboard/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/templates/deployment.yaml
index 779844c0e3..779844c0e3 100644
--- a/kubernetes/dcaegen2/charts/dcae-dashboard/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-dashboard/templates/service.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/templates/service.yaml
index 39f16bd6b1..39f16bd6b1 100644
--- a/kubernetes/dcaegen2/charts/dcae-dashboard/templates/service.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/templates/service.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-dashboard/values.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml
index 615afc42c2..615afc42c2 100644
--- a/kubernetes/dcaegen2/charts/dcae-dashboard/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/.helmignore b/kubernetes/dcaegen2/components/dcae-deployment-handler/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/.helmignore
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/.helmignore
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
index 042eb68648..e918b7717c 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
@@ -18,4 +18,4 @@
apiVersion: v1
description: ONAP DCAE Deployment Handler
name: dcae-deployment-handler
-version: 5.0.0
+version: 6.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
index 2dabd190b1..2dabd190b1 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/config/config.json b/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/config/config.json
index 026355a909..026355a909 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/config/config.json
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/config/config.json
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/log/filebeat.yml b/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log/filebeat.yml
index 0e5ee9bffa..0e5ee9bffa 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/log/filebeat.yml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log/filebeat.yml
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml
index 39af31a4f3..39af31a4f3 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
index a67197849f..a67197849f 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/service.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/service.yaml
index 088d381d50..088d381d50 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/service.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/service.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/values.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/values.yaml
index 30893b6d7c..30893b6d7c 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/values.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
index c6db31d6f6..7c10b31b58 100644
--- a/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
@@ -19,4 +19,4 @@
apiVersion: v1
description: ONAP DCAE Health Check
name: dcae-healthcheck
-version: 5.0.0
+version: 6.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
index 500ab3c5f9..500ab3c5f9 100644
--- a/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/templates/deployment.yaml
index d38681d8c2..d38681d8c2 100644
--- a/kubernetes/dcaegen2/charts/dcae-healthcheck/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/templates/service.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/templates/service.yaml
index cc5ffcefeb..cc5ffcefeb 100644
--- a/kubernetes/dcaegen2/charts/dcae-healthcheck/templates/service.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/templates/service.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml
index fb5a195e60..fb5a195e60 100644
--- a/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
index e1735ec8e3..face827504 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
@@ -18,4 +18,4 @@
apiVersion: v1
description: ONAP DCAE Inventory API Service
name: dcae-inventory-api
-version: 5.0.0 \ No newline at end of file
+version: 6.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
index 9136278557..9136278557 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/resources/config/config.json b/kubernetes/dcaegen2/components/dcae-inventory-api/resources/config/config.json
index c8c7dd79f1..c8c7dd79f1 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/resources/config/config.json
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/resources/config/config.json
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/configmap.yaml
index 9cda43c499..9cda43c499 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml
index 28eeae23a1..28eeae23a1 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/templates/service.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/service.yaml
index 088d381d50..088d381d50 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/templates/service.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/service.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/values.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/values.yaml
index 8e4430c37e..8e4430c37e 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/values.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/.helmignore b/kubernetes/dcaegen2/components/dcae-policy-handler/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/.helmignore
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/.helmignore
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
index d2b275b615..dfcc52e116 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
@@ -18,4 +18,4 @@
apiVersion: v1
description: ONAP DCAE Policy Handler
name: dcae-policy-handler
-version: 5.0.0
+version: 6.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
index 2dabd190b1..2dabd190b1 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/resources/config/config.json b/kubernetes/dcaegen2/components/dcae-policy-handler/resources/config/config.json
index 7342ca633a..7342ca633a 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/resources/config/config.json
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/resources/config/config.json
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/resources/log/filebeat.yml b/kubernetes/dcaegen2/components/dcae-policy-handler/resources/log/filebeat.yml
index 1a3f693a12..1a3f693a12 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/resources/log/filebeat.yml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/resources/log/filebeat.yml
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/templates/configmap.yaml
index 39af31a4f3..39af31a4f3 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/templates/deployment.yaml
index 8c1c8741aa..8c1c8741aa 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/service.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/templates/service.yaml
index 088d381d50..088d381d50 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/service.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/templates/service.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/values.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/values.yaml
index 3b15c55118..3b15c55118 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/values.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/.helmignore b/kubernetes/dcaegen2/components/dcae-redis/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/.helmignore
+++ b/kubernetes/dcaegen2/components/dcae-redis/.helmignore
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml b/kubernetes/dcaegen2/components/dcae-redis/Chart.yaml
index 49ae5d27b5..d4c264f713 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-redis/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP DCAE Redis
name: dcae-redis
-version: 5.0.0
+version: 6.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml b/kubernetes/dcaegen2/components/dcae-redis/requirements.yaml
index c0e6595354..c0e6595354 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-redis/requirements.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/resources/redis/scripts/redis-cluster-config.sh b/kubernetes/dcaegen2/components/dcae-redis/resources/redis/scripts/redis-cluster-config.sh
index 49872863a9..49872863a9 100755
--- a/kubernetes/dcaegen2/charts/dcae-redis/resources/redis/scripts/redis-cluster-config.sh
+++ b/kubernetes/dcaegen2/components/dcae-redis/resources/redis/scripts/redis-cluster-config.sh
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/templates/NOTES.txt b/kubernetes/dcaegen2/components/dcae-redis/templates/NOTES.txt
index 0a386aa131..0a386aa131 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/templates/NOTES.txt
+++ b/kubernetes/dcaegen2/components/dcae-redis/templates/NOTES.txt
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-redis/templates/configmap.yaml
index 85ebee672b..85ebee672b 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-redis/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/templates/pv.yaml b/kubernetes/dcaegen2/components/dcae-redis/templates/pv.yaml
index 5573179d87..5573179d87 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/templates/pv.yaml
+++ b/kubernetes/dcaegen2/components/dcae-redis/templates/pv.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/templates/service.yaml b/kubernetes/dcaegen2/components/dcae-redis/templates/service.yaml
index 636f512a53..636f512a53 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/templates/service.yaml
+++ b/kubernetes/dcaegen2/components/dcae-redis/templates/service.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml b/kubernetes/dcaegen2/components/dcae-redis/templates/statefulset.yaml
index 5a5b220e61..5a5b220e61 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
+++ b/kubernetes/dcaegen2/components/dcae-redis/templates/statefulset.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/values.yaml b/kubernetes/dcaegen2/components/dcae-redis/values.yaml
index 40812f2144..40812f2144 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-redis/values.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
index 64c891097c..3b96aca5b9 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
@@ -18,4 +18,4 @@
apiVersion: v1
description: ONAP DCAE Service Change Handler
name: dcae-servicechange-handler
-version: 5.0.0 \ No newline at end of file
+version: 6.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
index 57ee781445..57ee781445 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/resources/config/config.json b/kubernetes/dcaegen2/components/dcae-servicechange-handler/resources/config/config.json
index 4578d4c4ee..4578d4c4ee 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/resources/config/config.json
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/resources/config/config.json
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/templates/configmap.yaml
index 9cda43c499..9cda43c499 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/templates/deployment.yaml
index d948d3425b..d948d3425b 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/values.yaml
index 0b88a65c69..0b88a65c69 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/values.yaml
diff --git a/kubernetes/dcaegen2/requirements.yaml b/kubernetes/dcaegen2/requirements.yaml
index ad039c205b..cd04d8a907 100644
--- a/kubernetes/dcaegen2/requirements.yaml
+++ b/kubernetes/dcaegen2/requirements.yaml
@@ -16,3 +16,44 @@ dependencies:
- name: common
version: ~5.x-0
repository: '@local'
+ - name: dcae-bootstrap
+ version: ~6.x-0
+ repository: 'file://components/dcae-bootstrap'
+ condition: dcae-bootstrap.enabled
+ - name: dcae-cloudify-manager
+ version: ~6.x-0
+ repository: 'file://components/dcae-cloudify-manager'
+ condition: dcae-cloudify-manager.enabled
+ - name: dcae-config-binding-service
+ version: ~6.x-0
+ repository: 'file://components/dcae-config-binding-service'
+ condition: dcae-config-binding-service.enabled
+ - name: dcae-healthcheck
+ version: ~6.x-0
+ repository: 'file://components/dcae-healthcheck'
+ condition: dcae-healthcheck.enabled
+ - name: dcae-redis
+ version: ~6.x-0
+ repository: 'file://components/dcae-redis'
+ condition: dcae-redis.enabled
+ - name: dcae-servicechange-handler
+ version: ~6.x-0
+ repository: 'file://components/dcae-servicechange-handler'
+ condition: dcae-servicechange-handler.enabled
+ - name: dcae-inventory-api
+ version: ~6.x-0
+ repository: 'file://components/dcae-inventory-api'
+ condition: dcae-inventory-api.enabled
+ - name: dcae-deployment-handler
+ version: ~6.x-0
+ repository: 'file://components/dcae-deployment-handler'
+ condition: dcae-deployment-handler.enabled
+ - name: dcae-policy-handler
+ version: ~6.x-0
+ repository: 'file://components/dcae-policy-handler'
+ condition: dcae-policy-handler.enabled
+ - name: dcae-dashboard
+ version: ~6.x-0
+ repository: 'file://components/dcae-dashboard'
+ condition: dcae-dashboard.enabled
+
diff --git a/kubernetes/msb/charts/msb-consul/values.yaml b/kubernetes/msb/charts/msb-consul/values.yaml
index 3cb5c74c14..1693f22600 100644
--- a/kubernetes/msb/charts/msb-consul/values.yaml
+++ b/kubernetes/msb/charts/msb-consul/values.yaml
@@ -49,7 +49,7 @@ readiness:
periodSeconds: 10
service:
- type: NodePort
+ type: ClusterIP
name: msb-consul
externalPort: 8500
internalPort: 8500
diff --git a/kubernetes/msb/charts/msb-discovery/values.yaml b/kubernetes/msb/charts/msb-discovery/values.yaml
index b47127865d..10315d6b63 100644
--- a/kubernetes/msb/charts/msb-discovery/values.yaml
+++ b/kubernetes/msb/charts/msb-discovery/values.yaml
@@ -51,7 +51,7 @@ readiness:
periodSeconds: 10
service:
- type: NodePort
+ type: ClusterIP
name: msb-discovery
externalPort: 10081
internalPort: 10081
diff --git a/kubernetes/msb/charts/msb-eag/templates/service.yaml b/kubernetes/msb/charts/msb-eag/templates/service.yaml
index 2055b21392..bc5e661c54 100644
--- a/kubernetes/msb/charts/msb-eag/templates/service.yaml
+++ b/kubernetes/msb/charts/msb-eag/templates/service.yaml
@@ -26,9 +26,6 @@ spec:
type: {{ .Values.service.type }}
ports:
{{if eq .Values.service.type "NodePort" -}}
- - port: {{ .Values.service.externalPort }}
- nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: http-{{ .Values.service.name }}
- port: {{ .Values.service.externalPortHttps }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePortHttps }}
name: https-{{ .Values.service.name }}
diff --git a/kubernetes/msb/charts/msb-eag/values.yaml b/kubernetes/msb/charts/msb-eag/values.yaml
index e25fa28685..e7bf415c4e 100644
--- a/kubernetes/msb/charts/msb-eag/values.yaml
+++ b/kubernetes/msb/charts/msb-eag/values.yaml
@@ -56,7 +56,6 @@ service:
name: msb-eag
externalPort: 80
internalPort: 80
- nodePort: 82
externalPortHttps: 443
internalPortHttps: 443
nodePortHttps: 84
diff --git a/kubernetes/msb/charts/msb-iag/templates/service.yaml b/kubernetes/msb/charts/msb-iag/templates/service.yaml
index 2055b21392..bc5e661c54 100644
--- a/kubernetes/msb/charts/msb-iag/templates/service.yaml
+++ b/kubernetes/msb/charts/msb-iag/templates/service.yaml
@@ -26,9 +26,6 @@ spec:
type: {{ .Values.service.type }}
ports:
{{if eq .Values.service.type "NodePort" -}}
- - port: {{ .Values.service.externalPort }}
- nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: http-{{ .Values.service.name }}
- port: {{ .Values.service.externalPortHttps }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePortHttps }}
name: https-{{ .Values.service.name }}
diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/.helmignore b/kubernetes/multicloud/charts/multicloud-lenovo/.helmignore
deleted file mode 100644
index f0c1319444..0000000000
--- a/kubernetes/multicloud/charts/multicloud-lenovo/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml b/kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml
deleted file mode 100644
index fc682be388..0000000000
--- a/kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2019 Lenovo
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-description: ONAP multicloud OpenStack Lenovo Plugin
-name: multicloud-lenovo
-version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/resources/config/log/log.yml b/kubernetes/multicloud/charts/multicloud-lenovo/resources/config/log/log.yml
deleted file mode 100644
index 08a9348fd4..0000000000
--- a/kubernetes/multicloud/charts/multicloud-lenovo/resources/config/log/log.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (c) 2019 Lenovo 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.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-version: 1
-disable_existing_loggers: False
-
-loggers:
- thinkcloud:
- handlers: [thinkcloud_handler]
- level: "DEBUG"
- propagate: False
- newton_base:
- handlers: [thinkcloud_handler]
- level: "DEBUG"
- propagate: False
- common:
- handlers: [thinkcloud_handler]
- level: "DEBUG"
- propagate: False
-
-handlers:
- thinkcloud_handler:
- level: "DEBUG"
- class: "logging.handlers.RotatingFileHandler"
- filename: "/var/log/onap/multicloud/openstack/lenovo/thinkcloud.log"
- formatter: "mdcFormat"
- maxBytes: 1024*1024*50
- backupCount: 10
-
-formatters:
- standard:
- format: "%(asctime)s|||||%(name)s||%(thread)||%(funcName)s||%(levelname)s||%(message)s"
- mdcFormat:
- format: "%(asctime)s|||||%(name)s||%(thread)s||%(funcName)s||%(levelname)s||%(message)s||||%(mdc)s \t"
- mdcfmt: "{requestID} {invocationID} {serviceName} {serviceIP}"
- datefmt: "%Y-%m-%d %H:%M:%S"
- (): onaplogging.mdcformatter.MDCFormatter
diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/templates/NOTES.txt b/kubernetes/multicloud/charts/multicloud-lenovo/templates/NOTES.txt
deleted file mode 100644
index 7df04139e2..0000000000
--- a/kubernetes/multicloud/charts/multicloud-lenovo/templates/NOTES.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2019 Lenovo
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
- http://{{ . }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
- export NODE_PORT=$(kubectl get --namespace {{ include "common.namespace" . }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.name" . }})
- export NODE_IP=$(kubectl get nodes --namespace {{ include "common.namespace" . }} -o jsonpath="{.items[0].status.addresses[0].address}")
- echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
- NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- You can watch the status of by running 'kubectl get svc -w {{ include "common.name" . }}'
- export SERVICE_IP=$(kubectl get svc --namespace {{ include "common.namespace" . }} {{ include "common.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
- echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
-{{- else if contains "ClusterIP" .Values.service.type }}
- export POD_NAME=$(kubectl get pods --namespace {{ include "common.namespace" . }} -l "app={{ include "common.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
- echo "Visit http://127.0.0.1:8080 to use your application"
- kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
-{{- end }}
diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/templates/configmap.yaml b/kubernetes/multicloud/charts/multicloud-lenovo/templates/configmap.yaml
deleted file mode 100644
index f6eb87eab1..0000000000
--- a/kubernetes/multicloud/charts/multicloud-lenovo/templates/configmap.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-{{/*
-# Copyright (c) 2019 Lenovo
-# #
-# # Licensed under the Apache License, Version 2.0 (the "License");
-# # you may not use this file except in compliance with the License.
-# # You may obtain a copy of the License at
-# #
-# # http://www.apache.org/licenses/LICENSE-2.0
-# #
-# # Unless required by applicable law or agreed to in writing, software
-# # distributed under the License is distributed on an "AS IS" BASIS,
-# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# # See the License for the specific language governing permissions and
-# # limitations under the License.
-*/}}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-log-configmap
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-lenovo/templates/deployment.yaml
deleted file mode 100644
index 3be4d7cef7..0000000000
--- a/kubernetes/multicloud/charts/multicloud-lenovo/templates/deployment.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-{{/*
-# Copyright (c) 2019 Lenovo
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
- name: {{ include "common.fullname" . }}
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
-spec:
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- app: {{ include "common.name" . }}
- template:
- metadata:
- labels:
- app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
- name: {{ include "common.name" . }}
- annotations:
- sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
- spec:
- containers:
- - env:
- - name: MSB_ADDR
- value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
- - name: MSB_PORT
- value: "{{ .Values.config.msbPort }}"
- - name: AAI_ADDR
- value: aai.{{ include "common.namespace" . }}
- - name: AAI_PORT
- value: "{{ .Values.config.aai.port }}"
- - name: AAI_SCHEMA_VERSION
- value: "{{ .Values.config.aai.schemaVersion }}"
- - name: AAI_USERNAME
- value: "{{ .Values.config.aai.username }}"
- - name: AAI_PASSWORD
- value: "{{ .Values.config.aai.password }}"
- name: {{ include "common.name" . }}
- volumeMounts:
- - mountPath: /var/log/onap
- name: lenovo-log
- - mountPath: /opt/lenovo/thinkcloud/pub/config/log.yml
- name: lenovo-logconfig
- subPath: log.yml
- resources:
-{{ include "common.resources" . | indent 12 }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- ports:
- - containerPort: {{ .Values.service.internalPort }}
- # disable liveness probe when breakpoints set in debugger
- # so K8s doesn't restart unresponsive container
- {{ if .Values.liveness.enabled }}
- livenessProbe:
- httpGet:
- path: /api/multicloud-thinkcloud/v1/swagger.json
- port: {{ .Values.service.internalPort }}
- scheme: HTTP
- initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
- periodSeconds: {{ .Values.liveness.periodSeconds }}
- timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
- successThreshold: {{ .Values.liveness.successThreshold }}
- failureThreshold: {{ .Values.liveness.failureThreshold }}
- {{ end }}
- # side car containers
- - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: filebeat-onap
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - mountPath: /var/log/onap
- name: lenovo-log
- - mountPath: /usr/share/filebeat/data
- name: lenovo-data-filebeat
-
- volumes:
- - name: lenovo-log
- emptyDir: {}
- - name: lenovo-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
- - name: lenovo-logconfig
- configMap:
- name: {{ include "common.fullname" . }}-log-configmap
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
- restartPolicy: Always
diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-lenovo/templates/service.yaml
deleted file mode 100644
index 43f735a96e..0000000000
--- a/kubernetes/multicloud/charts/multicloud-lenovo/templates/service.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-{{/*
-# Copyright (c) 2019 Lenovo
-# #
-# # Licensed under the Apache License, Version 2.0 (the "License");
-# # you may not use this file except in compliance with the License.
-# # You may obtain a copy of the License at
-# #
-# # http://www.apache.org/licenses/LICENSE-2.0
-# #
-# # Unless required by applicable law or agreed to in writing, software
-# # distributed under the License is distributed on an "AS IS" BASIS,
-# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# # See the License for the specific language governing permissions and
-# # limitations under the License.
-*/}}
-
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "common.servicename" . }}
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
- annotations:
- msb.onap.org/service-info: '[
- {
- "serviceName": "multicloud-thinkcloud",
- "version": "v0",
- "url": "/api/multicloud-thinkcloud/v0",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange": "1"
- },
- {
- "serviceName": "multicloud-thinkcloud",
- "version": "v1",
- "url": "/api/multicloud-thinkcloud/v1",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange": "1"
- }
- ]'
-
-spec:
- ports:
- {{ if eq .Values.service.type "NodePort" -}}
- - port: {{ .Values.service.externalPort }}
- nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
- {{- else -}}
- - port: {{ .Values.service.externalPort }}
- targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
- {{- end }}
- selector:
- app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
- type: {{ .Values.service.type }}
diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/values.yaml b/kubernetes/multicloud/charts/multicloud-lenovo/values.yaml
deleted file mode 100644
index 953f35503a..0000000000
--- a/kubernetes/multicloud/charts/multicloud-lenovo/values.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (c) 2019 Lenovo
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#################################################################
-# Global configuration defaults.
-#################################################################
-global:
- nodePortPrefix: 304
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-lenovo:1.3.4
-pullPolicy: Always
-
-#Istio sidecar injection policy
-istioSidecar: true
-
-# application configuration
-config:
- msbgateway: msb-iag
- msbPort: 80
- aai:
- port: 8443
- schemaVersion: v13
- username: AAI
- password: AAI
-
-service:
- type: ClusterIP
- name: multicloud-thinkcloud
- portName: multicloud-thinkcloud
- externalPort: 9010
- internalPort: 9010
- nodePort: 86
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
- initialDelaySeconds: 30
- periodSeconds: 10
- timeoutSeconds: 10
- successThreshold: 1
- failureThreshold: 5
- enabled: true
-
-ingress:
- enabled: false
-
-# Resource Limit flavor -By Default using small
-flavor: small
-# Segregation for Different environment (Small and Large)
-resources:
- small:
- limits:
- cpu: 1
- memory: 4Gi
- requests:
- cpu: 10m
- memory: 1Gi
- large:
- limits:
- cpu: 2
- memory: 8Gi
- requests:
- cpu: 20m
- memory: 2Gi
- unlimited: {}
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 8b186c01d6..70c4721fb1 100755
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -57,7 +57,7 @@ dependencies:
repository: '@local'
condition: contrib.enabled
- name: dcaegen2
- version: ~5.x-0
+ version: ~6.x-0
repository: '@local'
condition: dcaegen2.enabled
- name: dmaap
diff --git a/kubernetes/policy/charts/policy-xacml-pdp/resources/config/config.json b/kubernetes/policy/charts/policy-xacml-pdp/resources/config/config.json
index 4483a1b51a..7fd8572c1f 100644
--- a/kubernetes/policy/charts/policy-xacml-pdp/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-xacml-pdp/resources/config/config.json
@@ -16,7 +16,8 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
{
- "name": "XacmlPdpGroup",
+ "name": "XacmlPdpParameters",
+ "pdpGroup": "defaultGroup",
"restServerParameters": {
"host": "0.0.0.0",
"port": 6969,