Attempt 2 at chart restructure

Helm value override file now supports component-specific settings:

dcae-bootstrap:
  enabled: true
dcae-cloudify-manager:
  enabled: true
dcae-config-binding-service:
  enabled: true
dcae-healthcheck:
  enabled: true
dcae-redis:
  enabled: true
dcae-servicechange-handler:
  enabled: true
dcae-inventory-api:
  enabled: true
dcae-deployment-handler:
  enabled: true
dcae-policy-handler:
  enabled: true
dcae-dashboard:
  enabled: true

Issue-ID: OOM-1574
Signed-off-by: Ubuntu <dgl@research.att.com>
Change-Id: I85e0fe6ae19e176d954611549ec954a5fe662307
Signed-off-by: Ubuntu <dgl@research.att.com>

diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index 9c23194..6dbd406 100644 (file)
--- 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 fcd62da..f10f2fc 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/.helmignore
rename to kubernetes/dcaegen2/components/dcae-bootstrap/.helmignore

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
similarity index 98%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml
rename to kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
index b92c943..87b6a87 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/certs/cacert.pem
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/dmaap-plugin.json
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-datafile-collector-inputs.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-hv_ves-inputs.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-pgaas-initdb-inputs.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-prh-inputs.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-snmptrap-inputs.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-tca-inputs.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/templates/configmap.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/templates/secret.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/.helmignore
rename to 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
similarity index 98%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml
rename to kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
index 159e2b5..5a23621 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/README.md
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/resources/config/config.txt
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/resources/config/log/filebeat.yml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/configmap.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/job.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/namespace.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pv.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pvc.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml
rename to 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
similarity index 98%
rename from kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml
rename to kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
index f1aa82b..8d9a28a 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-config-binding-service/resources/config/log/filebeat/filebeat.yml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/configmap.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/service.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-dashboard/.helmignore
rename to kubernetes/dcaegen2/components/dcae-dashboard/.helmignore

diff --git a/kubernetes/dcaegen2/charts/dcae-dashboard/Chart.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
similarity index 84%
rename from kubernetes/dcaegen2/charts/dcae-dashboard/Chart.yaml
rename to kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
index 5250c17..a46ea7e 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-dashboard/requirements.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-dashboard/resources/log/filebeat.yml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-dashboard/templates/configmap.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-dashboard/templates/deployment.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-dashboard/templates/service.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-dashboard/values.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-deployment-handler/.helmignore
rename to 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
similarity index 98%
rename from kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml
rename to kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
index 042eb68..e918b77 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/config/config.json
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-deployment-handler/resources/log/filebeat.yml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/configmap.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/deployment.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-deployment-handler/templates/service.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-deployment-handler/values.yaml
rename to 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
similarity index 98%
rename from kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml
rename to kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
index c6db31d..7c10b31 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-healthcheck/templates/deployment.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-healthcheck/templates/service.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml
rename to 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
similarity index 98%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml
rename to kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
index e1735ec..face827 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/resources/config/config.json
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/configmap.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/deployment.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-policy-handler/templates/service.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/values.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-policy-handler/.helmignore
rename to 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
similarity index 98%
rename from kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml
rename to kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
index d2b275b..dfcc52e 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-policy-handler/resources/config/config.json
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-policy-handler/resources/log/filebeat.yml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-policy-handler/templates/configmap.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-policy-handler/templates/deployment.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/service.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-policy-handler/values.yaml
rename to kubernetes/dcaegen2/components/dcae-policy-handler/values.yaml

diff --git a/kubernetes/dcaegen2/charts/dcae-redis/.helmignore b/kubernetes/dcaegen2/components/dcae-redis/.helmignore
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-redis/.helmignore
rename to kubernetes/dcaegen2/components/dcae-redis/.helmignore

diff --git a/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml b/kubernetes/dcaegen2/components/dcae-redis/Chart.yaml
similarity index 97%
rename from kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml
rename to kubernetes/dcaegen2/components/dcae-redis/Chart.yaml
index 49ae5d2..d4c264f 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-redis/resources/redis/scripts/redis-cluster-config.sh
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-redis/templates/NOTES.txt
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-redis/templates/configmap.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-redis/templates/pv.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-redis/templates/service.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-redis/values.yaml
rename to 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
similarity index 98%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml
rename to kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
index 64c8910..3b96aca 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/resources/config/config.json
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/configmap.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/deployment.yaml
rename to 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
similarity index 100%
rename from kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml
rename to kubernetes/dcaegen2/components/dcae-servicechange-handler/values.yaml

diff --git a/kubernetes/dcaegen2/requirements.yaml b/kubernetes/dcaegen2/requirements.yaml
index ad039c2..cd04d8a 100644 (file)
--- 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/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 8b186c0..70c4721 100755 (executable)
--- 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