aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDileep Ranganathan <dileep.ranganathan@intel.com>2019-05-30 12:38:37 -0700
committerDileep Ranganathan <dileep.ranganathan@intel.com>2019-05-30 21:11:52 +0000
commit3d5a3e06530c1250d48f7d838c619f3bfbcd019d (patch)
tree349e370c43ce7318b3f7eb7736345de6872cbef2
parent31802660dfe74a8671ae29789f0018f0f887ea1a (diff)
Refactor Distributed Analytics project structure
Modified the project structure to improve maintainability and to add future CI and integration test support. Change-Id: Id30bfb1f83f23785a6b5f99e81f42f752d59c0f8 Issue-ID: ONAPARC-280 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
-rw-r--r--vnfs/DAaaS/README.md2
-rw-r--r--vnfs/DAaaS/applications/Chart.yaml5
-rw-r--r--vnfs/DAaaS/build/README.md1
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/.helmignore (renamed from vnfs/DAaaS/00-init/gloo/.helmignore)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/Chart.yaml (renamed from vnfs/DAaaS/00-init/gloo/Chart.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/0-namespace.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/0-namespace.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/10-ingress-deployment.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/10-ingress-deployment.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/100-gloo-crds.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/100-gloo-crds.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/101-knative-crds-0.5.1.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/101-knative-crds-0.5.1.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/11-ingress-proxy-deployment.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/11-ingress-proxy-deployment.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/12-ingress-proxy-configmap.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/12-ingress-proxy-configmap.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/13-ingress-proxy-service.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/13-ingress-proxy-service.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/14-clusteringress-proxy-deployment.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/14-clusteringress-proxy-deployment.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/15-clusteringress-proxy-configmap.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/15-clusteringress-proxy-configmap.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/16-clusteringress-proxy-service.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/16-clusteringress-proxy-service.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/17-knative-no-istio-0.5.1.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/17-knative-no-istio-0.5.1.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/18-settings.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/18-settings.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/20-namespace-clusterrole-gateway.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/20-namespace-clusterrole-gateway.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/21-namespace-clusterrole-ingress.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/21-namespace-clusterrole-ingress.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/22-namespace-clusterrole-knative.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/22-namespace-clusterrole-knative.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/23-namespace-clusterrolebinding-gateway.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/23-namespace-clusterrolebinding-gateway.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/24-namespace-clusterrolebinding-ingress.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/24-namespace-clusterrolebinding-ingress.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/25-namespace-clusterrolebinding-knative.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/25-namespace-clusterrolebinding-knative.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/3-gloo-deployment.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/3-gloo-deployment.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/4-gloo-service.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/4-gloo-service.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/5-discovery-deployment.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/5-discovery-deployment.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/6-gateway-deployment.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/6-gateway-deployment.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/7-gateway-proxy-deployment.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/7-gateway-proxy-deployment.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/8-gateway-proxy-service.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/8-gateway-proxy-service.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/templates/9-gateway-proxy-configmap.yaml (renamed from vnfs/DAaaS/00-init/gloo/templates/9-gateway-proxy-configmap.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/values-ingress.yaml (renamed from vnfs/DAaaS/00-init/gloo/values-ingress.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/values-knative.yaml (renamed from vnfs/DAaaS/00-init/gloo/values-knative.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/00-init/gloo/values.yaml (renamed from vnfs/DAaaS/00-init/gloo/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/istio/README.md (renamed from vnfs/DAaaS/00-init/istio/README.md)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/Chart.yaml (renamed from vnfs/DAaaS/00-init/rook-ceph/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/NOTES.txt (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/_helpers.tpl (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/cluster.yml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/cluster.yml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/clusterrole.yaml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/clusterrole.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/clusterrolebinding.yaml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/clusterrolebinding.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/dashboard-external-http.yaml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/dashboard-external-http.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/deployment.yaml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/deployment.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/psp.yaml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/psp.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/resources.yaml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/resources.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/role.yaml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/role.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/rolebinding.yaml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/rolebinding.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/serviceaccount.yaml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/serviceaccount.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/storageclass.yml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/storageclass.yml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/templates/tool-box.yml (renamed from vnfs/DAaaS/00-init/rook-ceph/templates/tool-box.yml)0
-rw-r--r--vnfs/DAaaS/deploy/00-init/rook-ceph/values.yaml (renamed from vnfs/DAaaS/00-init/rook-ceph/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/.helmignore (renamed from vnfs/DAaaS/applications/sample-spark-app/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/collection/Chart.yaml (renamed from vnfs/DAaaS/collection/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/cadvisor/.helmignore (renamed from vnfs/DAaaS/collection/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml (renamed from vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/NOTES.txt (renamed from vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/_helpers.tpl (renamed from vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml (renamed from vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml (renamed from vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/cadvisor/values.yaml (renamed from vnfs/DAaaS/collection/charts/cadvisor/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/collectd/.helmignore (renamed from vnfs/DAaaS/collection/charts/collectd/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/collectd/Chart.yaml (renamed from vnfs/DAaaS/collection/charts/collectd/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/collectd/resources/config/collectd.conf (renamed from vnfs/DAaaS/collection/charts/collectd/resources/config/collectd.conf)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/collectd/templates/NOTES.txt (renamed from vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/collectd/templates/_helpers.tpl (renamed from vnfs/DAaaS/collection/charts/collectd/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/collectd/templates/configmap.yaml (renamed from vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/collectd/templates/daemonset.yaml (renamed from vnfs/DAaaS/collection/charts/collectd/templates/daemonset.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/collectd/templates/service.yaml (renamed from vnfs/DAaaS/collection/charts/collectd/templates/service.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/collectd/values.yaml (renamed from vnfs/DAaaS/collection/charts/collectd/values.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/.helmignore (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/.helmignore)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/Chart.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/Chart.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/OWNERS (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/OWNERS)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/README.md (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/README.md)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/NOTES.txt (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/NOTES.txt)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/_helpers.tpl (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/_helpers.tpl)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/daemonset.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/endpoints.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/monitor.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/monitor.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/service.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/service.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/values.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus-node-exporter/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/prometheus/.helmignore (renamed from vnfs/DAaaS/collection/charts/cadvisor/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/prometheus/Chart.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/prometheus/templates/NOTES.txt (renamed from vnfs/DAaaS/collection/charts/prometheus/templates/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/prometheus/templates/_helpers.tpl (renamed from vnfs/DAaaS/collection/charts/prometheus/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/prometheus/templates/service.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus/templates/service.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/prometheus/templates/servicemonitor.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml (renamed from vnfs/DAaaS/collection/charts/prometheus/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/collection/values.yaml (renamed from vnfs/DAaaS/collection/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/day2_configs/collectd/README.txt (renamed from vnfs/DAaaS/day2_configs/collectd/README.txt)0
-rw-r--r--vnfs/DAaaS/deploy/day2_configs/collectd/add_plugins.yaml (renamed from vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/day2_configs/collectd/replace_image.yaml (renamed from vnfs/DAaaS/day2_configs/collectd/replace_image.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/day2_configs/prometheus/README.txt (renamed from vnfs/DAaaS/day2_configs/prometheus/README.txt)0
-rw-r--r--vnfs/DAaaS/deploy/day2_configs/prometheus/add_remote_write.yaml (renamed from vnfs/DAaaS/day2_configs/prometheus/add_remote_write.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/.helmignore (renamed from vnfs/DAaaS/collection/charts/prometheus/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/Chart.yaml (renamed from vnfs/DAaaS/inference-core/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/charts/tf-serving/.helmignore (renamed from vnfs/DAaaS/inference-core/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/charts/tf-serving/Chart.yaml (renamed from vnfs/DAaaS/inference-core/charts/tf-serving/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/NOTES.txt (renamed from vnfs/DAaaS/inference-core/charts/tf-serving/templates/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/_helpers.tpl (renamed from vnfs/DAaaS/inference-core/charts/tf-serving/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/deployment.yaml (renamed from vnfs/DAaaS/inference-core/charts/tf-serving/templates/deployment.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/ingress.yaml (renamed from vnfs/DAaaS/inference-core/charts/tf-serving/templates/ingress.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/secrets.yaml (renamed from vnfs/DAaaS/inference-core/charts/tf-serving/templates/secrets.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/service.yaml (renamed from vnfs/DAaaS/inference-core/charts/tf-serving/templates/service.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/serviceaccount.yaml (renamed from vnfs/DAaaS/inference-core/charts/tf-serving/templates/serviceaccount.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/charts/tf-serving/values.yaml (renamed from vnfs/DAaaS/inference-core/charts/tf-serving/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/inference-core/values.yaml (renamed from vnfs/DAaaS/inference-core/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/.helmignore (renamed from vnfs/DAaaS/inference-core/charts/tf-serving/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/Chart.yaml (renamed from vnfs/DAaaS/messaging/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/kafka/.helmignore (renamed from vnfs/DAaaS/messaging/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/kafka/Chart.yaml (renamed from vnfs/DAaaS/messaging/charts/kafka/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/kafka/templates/kafka-cluster.yaml (renamed from vnfs/DAaaS/messaging/charts/kafka/templates/kafka-cluster.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/kafka/values.yaml (renamed from vnfs/DAaaS/messaging/charts/kafka/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/.helmignore (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/Chart.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/OWNERS (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/OWNERS)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/README.md (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/README.md)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/010-ServiceAccount-strimzi-cluster-operator.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/010-ServiceAccount-strimzi-cluster-operator.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRoleBinding-strimzi-cluster-operator.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRoleBinding-strimzi-cluster-operator.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRole-strimzi-kafka-broker.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRole-strimzi-kafka-broker.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRoleBinding-strimzi-cluster-operator-kafka-broker-delegation.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRoleBinding-strimzi-cluster-operator-kafka-broker-delegation.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/040-Crd-kafka.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/040-Crd-kafka.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/041-Crd-kafkaconnect.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/041-Crd-kafkaconnect.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/042-Crd-kafkaconnects2i.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/042-Crd-kafkaconnects2i.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/043-Crd-kafkatopic.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/043-Crd-kafkatopic.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/044-Crd-kafkauser.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/044-Crd-kafkauser.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/045-Crd-kafkamirrormaker.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/045-Crd-kafkamirrormaker.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/NOTES.txt (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/_helpers.tpl (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/values.yaml (renamed from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/messaging/values.yaml (renamed from vnfs/DAaaS/messaging/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/minio/.helmignore (renamed from vnfs/DAaaS/minio/.helmignore)0
-rwxr-xr-xvnfs/DAaaS/deploy/minio/Chart.yaml (renamed from vnfs/DAaaS/minio/Chart.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/minio/README.md (renamed from vnfs/DAaaS/minio/README.md)0
-rw-r--r--vnfs/DAaaS/deploy/minio/templates/NOTES.txt (renamed from vnfs/DAaaS/minio/templates/NOTES.txt)0
-rwxr-xr-xvnfs/DAaaS/deploy/minio/templates/_helper_create_bucket.txt (renamed from vnfs/DAaaS/minio/templates/_helper_create_bucket.txt)0
-rw-r--r--vnfs/DAaaS/deploy/minio/templates/_helpers.tpl (renamed from vnfs/DAaaS/minio/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/minio/templates/configmap.yaml (renamed from vnfs/DAaaS/minio/templates/configmap.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/minio/templates/deployment.yaml (renamed from vnfs/DAaaS/minio/templates/deployment.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/minio/templates/ingress.yaml (renamed from vnfs/DAaaS/minio/templates/ingress.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/minio/templates/networkpolicy.yaml (renamed from vnfs/DAaaS/minio/templates/networkpolicy.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/minio/templates/post-install-create-bucket-job.yaml (renamed from vnfs/DAaaS/minio/templates/post-install-create-bucket-job.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/minio/templates/pvc.yaml (renamed from vnfs/DAaaS/minio/templates/pvc.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/minio/templates/secrets.yaml (renamed from vnfs/DAaaS/minio/templates/secrets.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/minio/templates/service.yaml (renamed from vnfs/DAaaS/minio/templates/service.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/minio/templates/statefulset.yaml (renamed from vnfs/DAaaS/minio/templates/statefulset.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/minio/values.yaml (renamed from vnfs/DAaaS/minio/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/.helmignore (renamed from vnfs/DAaaS/messaging/charts/kafka/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/operator/Chart.yaml (renamed from vnfs/DAaaS/operator/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/.helmignore (renamed from vnfs/DAaaS/operator/charts/etcd-operator/.helmignore)0
-rwxr-xr-xvnfs/DAaaS/deploy/operator/charts/etcd-operator/Chart.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/OWNERS (renamed from vnfs/DAaaS/operator/charts/etcd-operator/OWNERS)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/README.md (renamed from vnfs/DAaaS/operator/charts/etcd-operator/README.md)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/NOTES.txt (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/_helpers.tpl (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-clusterrole-binding.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-clusterrole-binding.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-deployment.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-deployment.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-cluster-role.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-cluster-role.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-clusterrole-binding.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-clusterrole-binding.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-deployment.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-deployment.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-service-account.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-service-account.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-clusterrole-binding.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-clusterrole-binding.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-deployment.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-deployment.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-service.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/etcd-operator/values.yaml (renamed from vnfs/DAaaS/operator/charts/etcd-operator/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/m3db-operator/Chart.yaml (renamed from vnfs/DAaaS/operator/charts/m3db-operator/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/m3db-operator/LICENSE (renamed from vnfs/DAaaS/operator/charts/m3db-operator/LICENSE)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/m3db-operator/NOTES.txt (renamed from vnfs/DAaaS/operator/charts/m3db-operator/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/m3db-operator/README.md (renamed from vnfs/DAaaS/operator/charts/m3db-operator/README.md)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/cluster_role.yaml (renamed from vnfs/DAaaS/operator/charts/m3db-operator/templates/cluster_role.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/cluster_role_binding.yaml (renamed from vnfs/DAaaS/operator/charts/m3db-operator/templates/cluster_role_binding.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/service_account.yaml (renamed from vnfs/DAaaS/operator/charts/m3db-operator/templates/service_account.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/stateful_set.yaml (renamed from vnfs/DAaaS/operator/charts/m3db-operator/templates/stateful_set.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/m3db-operator/values.yaml (renamed from vnfs/DAaaS/operator/charts/m3db-operator/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/.helmignore (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/Chart.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/README.md (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/README.md)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/NOTES.txt (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/_helpers.tpl (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/service.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/service.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/service.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/service.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml (renamed from vnfs/DAaaS/operator/charts/prometheus-operator/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/sparkoperator/.helmignore (renamed from vnfs/DAaaS/operator/charts/sparkoperator/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/sparkoperator/Chart.yaml (renamed from vnfs/DAaaS/operator/charts/sparkoperator/Chart.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/operator/charts/sparkoperator/README.md (renamed from vnfs/DAaaS/operator/charts/sparkoperator/README.md)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/_helpers.tpl (renamed from vnfs/DAaaS/operator/charts/sparkoperator/templates/_helpers.tpl)0
-rwxr-xr-xvnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-deployment.yaml (renamed from vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-deployment.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-rbac.yaml (renamed from vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-rbac.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-serviceaccount.yaml (renamed from vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-serviceaccount.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-rbac.yaml (renamed from vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-rbac.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-serviceaccount.yaml (renamed from vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-serviceaccount.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-cleanup-job.yaml (renamed from vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-cleanup-job.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-init-job.yaml (renamed from vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-init-job.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-service.yaml (renamed from vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-service.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/sparkoperator/values.yaml (renamed from vnfs/DAaaS/operator/charts/sparkoperator/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/operator/resources/m3db.labels (renamed from vnfs/DAaaS/operator/resources/m3db.labels)0
-rw-r--r--vnfs/DAaaS/deploy/operator/values.yaml (renamed from vnfs/DAaaS/applications/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/.helmignore (renamed from vnfs/DAaaS/training-core/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/Chart.yaml (renamed from vnfs/DAaaS/training-core/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/.gitignore (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/.gitignore)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/.travis.yml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/.travis.yml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/LICENSE (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/LICENSE)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/README.md (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/README.md)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/README.md (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/README.md)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/Chart.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/templates/client-deployment.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/templates/client-deployment.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/.helmignore (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/Chart.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/_helpers.tpl (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/configmap.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/configmap.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/Chart.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/templates/datanode-daemonset.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/templates/datanode-daemonset.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/Chart.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/templates/journalnode-statefulset.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/templates/journalnode-statefulset.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.gitignore (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.gitignore)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.helmignore (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/Chart.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/requirements.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/requirements.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/templates/_helpers.tpl (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/.helmignore (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/Chart.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/templates/statefulset.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/templates/statefulset.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/Chart.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/templates/namenode-statefulset.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/templates/namenode-statefulset.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/Chart.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/templates/namenode-statefulset.yaml (renamed from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/templates/namenode-statefulset.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/m3db/.helmignore (renamed from vnfs/DAaaS/operator/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/m3db/Chart.yaml (renamed from vnfs/DAaaS/training-core/charts/m3db/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/m3db/templates/NOTES.txt (renamed from vnfs/DAaaS/training-core/charts/m3db/templates/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/m3db/templates/_helpers.tpl (renamed from vnfs/DAaaS/training-core/charts/m3db/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/m3db/templates/configmap.yaml (renamed from vnfs/DAaaS/training-core/charts/m3db/templates/configmap.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/m3db/templates/etcd-cluster.yaml (renamed from vnfs/DAaaS/training-core/charts/m3db/templates/etcd-cluster.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/m3db/templates/m3dbcluster.yaml (renamed from vnfs/DAaaS/training-core/charts/m3db/templates/m3dbcluster.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/charts/m3db/values.yaml (renamed from vnfs/DAaaS/training-core/charts/m3db/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/README.md (renamed from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/README.md)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/pom.xml (renamed from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/pom.xml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/CreateKafkaConsumer.java (renamed from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/CreateKafkaConsumer.java)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/HdfsWriter.java (renamed from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/HdfsWriter.java)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/Orchestrator.java (renamed from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/Orchestrator.java)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/config/Configuration.java (renamed from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/config/Configuration.java)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/kafka2hdfsApp.java (renamed from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/kafka2hdfsApp.java)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/resources/configs.yaml (renamed from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/resources/configs.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/training-core/values.yaml (renamed from vnfs/DAaaS/operator/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/visualization/.helmignore (renamed from vnfs/DAaaS/training-core/charts/m3db/.helmignore)0
-rw-r--r--vnfs/DAaaS/deploy/visualization/Chart.yaml (renamed from vnfs/DAaaS/visualization/Chart.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/.helmignore (renamed from vnfs/DAaaS/visualization/charts/grafana/.helmignore)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/Chart.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/README.md (renamed from vnfs/DAaaS/visualization/charts/grafana/README.md)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json (renamed from vnfs/DAaaS/visualization/charts/grafana/dashboards/custom-dashboard.json)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/NOTES.txt)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/_helpers.tpl)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/clusterrole.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/clusterrolebinding.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/configmap.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/dashboards-json-configmap.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/dashboards-json-configmap.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/deployment.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/ingress.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/podsecuritypolicy.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/pvc.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/role.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/rolebinding.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/secret.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/service.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/templates/serviceaccount.yaml)0
-rwxr-xr-xvnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml (renamed from vnfs/DAaaS/visualization/charts/grafana/values.yaml)0
-rw-r--r--vnfs/DAaaS/deploy/visualization/templates/NOTES.txt (renamed from vnfs/DAaaS/visualization/templates/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/deploy/visualization/values.yaml (renamed from vnfs/DAaaS/visualization/values.yaml)0
-rw-r--r--vnfs/DAaaS/lib/README.md1
-rw-r--r--vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/.gitignore (renamed from vnfs/DAaaS/GoApps/src/hdfs-writer/.gitignore)0
-rw-r--r--vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/Makefile (renamed from vnfs/DAaaS/GoApps/src/hdfs-writer/Makefile)0
-rw-r--r--vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/README.md (renamed from vnfs/DAaaS/GoApps/src/hdfs-writer/README.md)0
-rw-r--r--vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/cmd/main.go (renamed from vnfs/DAaaS/GoApps/src/hdfs-writer/cmd/main.go)0
-rw-r--r--vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/go.mod (renamed from vnfs/DAaaS/GoApps/src/hdfs-writer/go.mod)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/.gitignore (renamed from vnfs/DAaaS/collectd-operator/.gitignore)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/Makefile (renamed from vnfs/DAaaS/collectd-operator/Makefile)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/build/Dockerfile (renamed from vnfs/DAaaS/collectd-operator/build/Dockerfile)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/cmd/manager/main.go (renamed from vnfs/DAaaS/collectd-operator/cmd/manager/main.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml (renamed from vnfs/DAaaS/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_crd.yaml (renamed from vnfs/DAaaS/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_crd.yaml)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/deploy/operator.yaml (renamed from vnfs/DAaaS/collectd-operator/deploy/operator.yaml)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/deploy/role.yaml (renamed from vnfs/DAaaS/collectd-operator/deploy/role.yaml)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/deploy/role_binding.yaml (renamed from vnfs/DAaaS/collectd-operator/deploy/role_binding.yaml)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/deploy/service_account.yaml (renamed from vnfs/DAaaS/collectd-operator/deploy/service_account.yaml)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/go.mod (renamed from vnfs/DAaaS/collectd-operator/go.mod)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/go.sum (renamed from vnfs/DAaaS/collectd-operator/go.sum)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/pkg/apis/addtoscheme_onap_v1alpha1.go (renamed from vnfs/DAaaS/collectd-operator/pkg/apis/addtoscheme_onap_v1alpha1.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/pkg/apis/apis.go (renamed from vnfs/DAaaS/collectd-operator/pkg/apis/apis.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/collectdplugin_types.go (renamed from vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/collectdplugin_types.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/doc.go (renamed from vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/doc.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/register.go (renamed from vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/register.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.deepcopy.go (renamed from vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.deepcopy.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.openapi.go (renamed from vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.openapi.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/pkg/controller/add_collectdplugin.go (renamed from vnfs/DAaaS/collectd-operator/pkg/controller/add_collectdplugin.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go (renamed from vnfs/DAaaS/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/pkg/controller/controller.go (renamed from vnfs/DAaaS/collectd-operator/pkg/controller/controller.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/tools.go (renamed from vnfs/DAaaS/collectd-operator/tools.go)0
-rw-r--r--vnfs/DAaaS/microservices/collectd-operator/version/version.go (renamed from vnfs/DAaaS/collectd-operator/version/version.go)0
-rw-r--r--vnfs/DAaaS/sample-apps/m3db_promql/promql_api/README.md (renamed from vnfs/DAaaS/applications/m3db_promql/promql_api/README.md)0
-rw-r--r--vnfs/DAaaS/sample-apps/m3db_promql/promql_api/__init__.py (renamed from vnfs/DAaaS/applications/m3db_promql/promql_api/__init__.py)0
-rw-r--r--vnfs/DAaaS/sample-apps/m3db_promql/promql_api/prom_ql_api.py (renamed from vnfs/DAaaS/applications/m3db_promql/promql_api/prom_ql_api.py)0
-rw-r--r--vnfs/DAaaS/sample-apps/m3db_promql/sample_promql_query.py (renamed from vnfs/DAaaS/applications/m3db_promql/sample_promql_query.py)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml (renamed from vnfs/DAaaS/applications/sample-horovod-app/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/Dockerfile (renamed from vnfs/DAaaS/applications/sample-horovod-app/Dockerfile)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/README.md (renamed from vnfs/DAaaS/applications/sample-horovod-app/README.md)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/keras_mnist_advanced_modified.py (renamed from vnfs/DAaaS/applications/sample-horovod-app/keras_mnist_advanced_modified.py)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml (renamed from vnfs/DAaaS/applications/sample-horovod-app/sample_values.yaml)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/NOTES.txt (renamed from vnfs/DAaaS/applications/sample-horovod-app/templates/NOTES.txt)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/_helpers.tpl (renamed from vnfs/DAaaS/applications/sample-horovod-app/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml (renamed from vnfs/DAaaS/applications/sample-horovod-app/templates/config.yaml)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml (renamed from vnfs/DAaaS/applications/sample-horovod-app/templates/job-service.yaml)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml (renamed from vnfs/DAaaS/applications/sample-horovod-app/templates/job.yaml)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/minio-secrets.yaml (renamed from vnfs/DAaaS/applications/sample-horovod-app/templates/minio-secrets.yaml)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml (renamed from vnfs/DAaaS/applications/sample-horovod-app/templates/secrets.yaml)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml (renamed from vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset-service.yaml)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset.yaml (renamed from vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset.yaml)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-spark-app/.helmignore (renamed from vnfs/DAaaS/visualization/.helmignore)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-spark-app/Chart.yaml (renamed from vnfs/DAaaS/applications/sample-spark-app/Chart.yaml)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-spark-app/Dockerfile (renamed from vnfs/DAaaS/applications/sample-spark-app/Dockerfile)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml (renamed from vnfs/DAaaS/applications/sample-spark-app/templates/SampleSparkApp.yaml)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/_helpers.tpl (renamed from vnfs/DAaaS/applications/sample-spark-app/templates/_helpers.tpl)0
-rw-r--r--vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml (renamed from vnfs/DAaaS/applications/sample-spark-app/values.yaml)0
-rw-r--r--vnfs/DAaaS/training-core/values.yaml29
414 files changed, 3 insertions, 35 deletions
diff --git a/vnfs/DAaaS/README.md b/vnfs/DAaaS/README.md
index b0838d54..2b3c0d6a 100644
--- a/vnfs/DAaaS/README.md
+++ b/vnfs/DAaaS/README.md
@@ -10,7 +10,7 @@
#### Download Framework
```bash
git clone https://github.com/onap/demo.git
-DA_WORKING_DIR=$PWD/demo/vnfs/DAaaS
+DA_WORKING_DIR=$PWD/demo/vnfs/DAaaS/deploy
cd $DA_WORKING_DIR
```
diff --git a/vnfs/DAaaS/applications/Chart.yaml b/vnfs/DAaaS/applications/Chart.yaml
deleted file mode 100644
index 803e19aa..00000000
--- a/vnfs/DAaaS/applications/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
- apiVersion: v1
- appVersion: "1.0"
- description: Helm chart for sample applications that use the components that the training-core framework deploys.
- name: sample-applications
- version: 0.1.0
diff --git a/vnfs/DAaaS/build/README.md b/vnfs/DAaaS/build/README.md
new file mode 100644
index 00000000..d1eaa323
--- /dev/null
+++ b/vnfs/DAaaS/build/README.md
@@ -0,0 +1 @@
+This folder consists of Dockerfiles and build scripts.
diff --git a/vnfs/DAaaS/00-init/gloo/.helmignore b/vnfs/DAaaS/deploy/00-init/gloo/.helmignore
index 08c5989a..08c5989a 100755
--- a/vnfs/DAaaS/00-init/gloo/.helmignore
+++ b/vnfs/DAaaS/deploy/00-init/gloo/.helmignore
diff --git a/vnfs/DAaaS/00-init/gloo/Chart.yaml b/vnfs/DAaaS/deploy/00-init/gloo/Chart.yaml
index 4f5e9315..4f5e9315 100755
--- a/vnfs/DAaaS/00-init/gloo/Chart.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/Chart.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/0-namespace.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/0-namespace.yaml
index 92a37f9d..92a37f9d 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/0-namespace.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/0-namespace.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/10-ingress-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/10-ingress-deployment.yaml
index 7314b4e3..7314b4e3 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/10-ingress-deployment.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/10-ingress-deployment.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/100-gloo-crds.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/100-gloo-crds.yaml
index 2c111170..2c111170 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/100-gloo-crds.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/100-gloo-crds.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/101-knative-crds-0.5.1.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/101-knative-crds-0.5.1.yaml
index 3c9987ef..3c9987ef 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/101-knative-crds-0.5.1.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/101-knative-crds-0.5.1.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/11-ingress-proxy-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/11-ingress-proxy-deployment.yaml
index 5dc131e5..5dc131e5 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/11-ingress-proxy-deployment.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/11-ingress-proxy-deployment.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/12-ingress-proxy-configmap.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/12-ingress-proxy-configmap.yaml
index 8938a477..8938a477 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/12-ingress-proxy-configmap.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/12-ingress-proxy-configmap.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/13-ingress-proxy-service.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/13-ingress-proxy-service.yaml
index 583e8bcd..583e8bcd 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/13-ingress-proxy-service.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/13-ingress-proxy-service.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/14-clusteringress-proxy-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/14-clusteringress-proxy-deployment.yaml
index fb7874eb..fb7874eb 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/14-clusteringress-proxy-deployment.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/14-clusteringress-proxy-deployment.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/15-clusteringress-proxy-configmap.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/15-clusteringress-proxy-configmap.yaml
index 85a6421f..85a6421f 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/15-clusteringress-proxy-configmap.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/15-clusteringress-proxy-configmap.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/16-clusteringress-proxy-service.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/16-clusteringress-proxy-service.yaml
index 7e25bee9..7e25bee9 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/16-clusteringress-proxy-service.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/16-clusteringress-proxy-service.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/17-knative-no-istio-0.5.1.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/17-knative-no-istio-0.5.1.yaml
index a73cf1f2..a73cf1f2 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/17-knative-no-istio-0.5.1.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/17-knative-no-istio-0.5.1.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/18-settings.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/18-settings.yaml
index a2eec087..a2eec087 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/18-settings.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/18-settings.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/20-namespace-clusterrole-gateway.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/20-namespace-clusterrole-gateway.yaml
index 35fb5eb0..35fb5eb0 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/20-namespace-clusterrole-gateway.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/20-namespace-clusterrole-gateway.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/21-namespace-clusterrole-ingress.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/21-namespace-clusterrole-ingress.yaml
index 15215b9f..15215b9f 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/21-namespace-clusterrole-ingress.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/21-namespace-clusterrole-ingress.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/22-namespace-clusterrole-knative.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/22-namespace-clusterrole-knative.yaml
index 1bd2b95d..1bd2b95d 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/22-namespace-clusterrole-knative.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/22-namespace-clusterrole-knative.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/23-namespace-clusterrolebinding-gateway.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/23-namespace-clusterrolebinding-gateway.yaml
index 62198913..62198913 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/23-namespace-clusterrolebinding-gateway.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/23-namespace-clusterrolebinding-gateway.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/24-namespace-clusterrolebinding-ingress.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/24-namespace-clusterrolebinding-ingress.yaml
index 7ef5cbae..7ef5cbae 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/24-namespace-clusterrolebinding-ingress.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/24-namespace-clusterrolebinding-ingress.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/25-namespace-clusterrolebinding-knative.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/25-namespace-clusterrolebinding-knative.yaml
index 5f05de96..5f05de96 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/25-namespace-clusterrolebinding-knative.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/25-namespace-clusterrolebinding-knative.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/3-gloo-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/3-gloo-deployment.yaml
index b3d8423f..b3d8423f 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/3-gloo-deployment.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/3-gloo-deployment.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/4-gloo-service.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/4-gloo-service.yaml
index ab49ea3f..ab49ea3f 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/4-gloo-service.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/4-gloo-service.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/5-discovery-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/5-discovery-deployment.yaml
index 1a44e922..1a44e922 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/5-discovery-deployment.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/5-discovery-deployment.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/6-gateway-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/6-gateway-deployment.yaml
index 0a32241e..0a32241e 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/6-gateway-deployment.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/6-gateway-deployment.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/7-gateway-proxy-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/7-gateway-proxy-deployment.yaml
index bb54e8f3..bb54e8f3 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/7-gateway-proxy-deployment.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/7-gateway-proxy-deployment.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/8-gateway-proxy-service.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/8-gateway-proxy-service.yaml
index f0b7d347..f0b7d347 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/8-gateway-proxy-service.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/8-gateway-proxy-service.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/templates/9-gateway-proxy-configmap.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/9-gateway-proxy-configmap.yaml
index 03c5a920..03c5a920 100755
--- a/vnfs/DAaaS/00-init/gloo/templates/9-gateway-proxy-configmap.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/templates/9-gateway-proxy-configmap.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/values-ingress.yaml b/vnfs/DAaaS/deploy/00-init/gloo/values-ingress.yaml
index 98dd42ae..98dd42ae 100755
--- a/vnfs/DAaaS/00-init/gloo/values-ingress.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/values-ingress.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/values-knative.yaml b/vnfs/DAaaS/deploy/00-init/gloo/values-knative.yaml
index c53ca1a9..c53ca1a9 100755
--- a/vnfs/DAaaS/00-init/gloo/values-knative.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/values-knative.yaml
diff --git a/vnfs/DAaaS/00-init/gloo/values.yaml b/vnfs/DAaaS/deploy/00-init/gloo/values.yaml
index daeab0c3..daeab0c3 100755
--- a/vnfs/DAaaS/00-init/gloo/values.yaml
+++ b/vnfs/DAaaS/deploy/00-init/gloo/values.yaml
diff --git a/vnfs/DAaaS/00-init/istio/README.md b/vnfs/DAaaS/deploy/00-init/istio/README.md
index d19bcce0..d19bcce0 100644
--- a/vnfs/DAaaS/00-init/istio/README.md
+++ b/vnfs/DAaaS/deploy/00-init/istio/README.md
diff --git a/vnfs/DAaaS/00-init/rook-ceph/Chart.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/Chart.yaml
index 21e90098..21e90098 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/Chart.yaml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/Chart.yaml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/NOTES.txt b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/NOTES.txt
index 0509b574..0509b574 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/NOTES.txt
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/_helpers.tpl b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/_helpers.tpl
index f0d83d2e..f0d83d2e 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/cluster.yml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/cluster.yml
index 1cd33e8c..1cd33e8c 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/cluster.yml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/cluster.yml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/clusterrole.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/clusterrole.yaml
index 58a24d47..58a24d47 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/clusterrole.yaml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/clusterrole.yaml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/clusterrolebinding.yaml
index 845eb6d7..845eb6d7 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/clusterrolebinding.yaml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/clusterrolebinding.yaml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/dashboard-external-http.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/dashboard-external-http.yaml
index ee521152..ee521152 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/dashboard-external-http.yaml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/dashboard-external-http.yaml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/deployment.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/deployment.yaml
index 13c6a763..13c6a763 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/deployment.yaml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/deployment.yaml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/psp.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/psp.yaml
index 412b2437..412b2437 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/psp.yaml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/psp.yaml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/resources.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/resources.yaml
index e296663f..e296663f 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/resources.yaml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/resources.yaml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/role.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/role.yaml
index 45122d32..45122d32 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/role.yaml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/role.yaml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/rolebinding.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/rolebinding.yaml
index 3ef5897f..3ef5897f 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/rolebinding.yaml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/rolebinding.yaml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/serviceaccount.yaml
index 7b42de17..7b42de17 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/serviceaccount.yaml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/serviceaccount.yaml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/storageclass.yml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/storageclass.yml
index 38ddf5d7..38ddf5d7 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/storageclass.yml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/storageclass.yml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/tool-box.yml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/tool-box.yml
index 98bc3c98..98bc3c98 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/templates/tool-box.yml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/tool-box.yml
diff --git a/vnfs/DAaaS/00-init/rook-ceph/values.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/values.yaml
index 7b4d07bd..7b4d07bd 100644
--- a/vnfs/DAaaS/00-init/rook-ceph/values.yaml
+++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/values.yaml
diff --git a/vnfs/DAaaS/applications/sample-spark-app/.helmignore b/vnfs/DAaaS/deploy/collection/.helmignore
index 50af0317..50af0317 100644
--- a/vnfs/DAaaS/applications/sample-spark-app/.helmignore
+++ b/vnfs/DAaaS/deploy/collection/.helmignore
diff --git a/vnfs/DAaaS/collection/Chart.yaml b/vnfs/DAaaS/deploy/collection/Chart.yaml
index f21cc894..f21cc894 100644
--- a/vnfs/DAaaS/collection/Chart.yaml
+++ b/vnfs/DAaaS/deploy/collection/Chart.yaml
diff --git a/vnfs/DAaaS/collection/.helmignore b/vnfs/DAaaS/deploy/collection/charts/cadvisor/.helmignore
index 50af0317..50af0317 100644
--- a/vnfs/DAaaS/collection/.helmignore
+++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/.helmignore
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml
index aea55a29..aea55a29 100644
--- a/vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/NOTES.txt
index 3eea9994..3eea9994 100644
--- a/vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/NOTES.txt
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/_helpers.tpl
index ea2a3266..ea2a3266 100644
--- a/vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml
index e287c7d8..e287c7d8 100644
--- a/vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml
index a8a932d1..a8a932d1 100644
--- a/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/values.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/values.yaml
index a17c3dd5..a17c3dd5 100644
--- a/vnfs/DAaaS/collection/charts/cadvisor/values.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/values.yaml
diff --git a/vnfs/DAaaS/collection/charts/collectd/.helmignore b/vnfs/DAaaS/deploy/collection/charts/collectd/.helmignore
index f0c13194..f0c13194 100644
--- a/vnfs/DAaaS/collection/charts/collectd/.helmignore
+++ b/vnfs/DAaaS/deploy/collection/charts/collectd/.helmignore
diff --git a/vnfs/DAaaS/collection/charts/collectd/Chart.yaml b/vnfs/DAaaS/deploy/collection/charts/collectd/Chart.yaml
index fcdcfde9..fcdcfde9 100644
--- a/vnfs/DAaaS/collection/charts/collectd/Chart.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/collectd/Chart.yaml
diff --git a/vnfs/DAaaS/collection/charts/collectd/resources/config/collectd.conf b/vnfs/DAaaS/deploy/collection/charts/collectd/resources/config/collectd.conf
index f62adb6a..f62adb6a 100644
--- a/vnfs/DAaaS/collection/charts/collectd/resources/config/collectd.conf
+++ b/vnfs/DAaaS/deploy/collection/charts/collectd/resources/config/collectd.conf
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/NOTES.txt
index 06ca128b..06ca128b 100644
--- a/vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/NOTES.txt
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/_helpers.tpl b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/_helpers.tpl
index b5e98086..b5e98086 100644
--- a/vnfs/DAaaS/collection/charts/collectd/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/configmap.yaml
index 5f5dde01..5f5dde01 100644
--- a/vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/configmap.yaml
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/daemonset.yaml b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/daemonset.yaml
index 29fdded9..29fdded9 100644
--- a/vnfs/DAaaS/collection/charts/collectd/templates/daemonset.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/daemonset.yaml
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/service.yaml b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/service.yaml
index 7571715d..7571715d 100644
--- a/vnfs/DAaaS/collection/charts/collectd/templates/service.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/service.yaml
diff --git a/vnfs/DAaaS/collection/charts/collectd/values.yaml b/vnfs/DAaaS/deploy/collection/charts/collectd/values.yaml
index fdfcae71..fdfcae71 100644
--- a/vnfs/DAaaS/collection/charts/collectd/values.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/collectd/values.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/.helmignore b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/.helmignore
index f0c13194..f0c13194 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/.helmignore
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/.helmignore
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/Chart.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/Chart.yaml
index 2e45b3a3..2e45b3a3 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/Chart.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/Chart.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/OWNERS b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/OWNERS
index fe9b2c3d..fe9b2c3d 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/OWNERS
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/OWNERS
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/README.md b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/README.md
index b9b50101..b9b50101 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/README.md
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/README.md
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/NOTES.txt b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/NOTES.txt
index 4902798f..4902798f 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/NOTES.txt
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/_helpers.tpl b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/_helpers.tpl
index 4f0e2dfe..4f0e2dfe 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/daemonset.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml
index dfb15f1d..dfb15f1d 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/daemonset.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/endpoints.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml
index 4c5c75fa..4c5c75fa 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/endpoints.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/monitor.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/monitor.yaml
index 9c723e69..9c723e69 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/monitor.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/monitor.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml
index 3d0a636a..3d0a636a 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml
index 50f7a149..50f7a149 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp.yaml
index 1fa6f289..1fa6f289 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/service.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/service.yaml
index cffe547b..cffe547b 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/service.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/service.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml
index b70745aa..b70745aa 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/values.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/values.yaml
index 14bcfc53..14bcfc53 100755
--- a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/values.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/values.yaml
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/.helmignore b/vnfs/DAaaS/deploy/collection/charts/prometheus/.helmignore
index 50af0317..50af0317 100644
--- a/vnfs/DAaaS/collection/charts/cadvisor/.helmignore
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/.helmignore
diff --git a/vnfs/DAaaS/collection/charts/prometheus/Chart.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/Chart.yaml
index 6e7ddfbc..6e7ddfbc 100644
--- a/vnfs/DAaaS/collection/charts/prometheus/Chart.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/Chart.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/NOTES.txt b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/NOTES.txt
index f8882883..f8882883 100644
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/NOTES.txt
diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/_helpers.tpl b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/_helpers.tpl
index 1ac77dd8..1ac77dd8 100644
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml
index 9c3d84c2..9c3d84c2 100644
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/service.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/service.yaml
index 0114ed2e..0114ed2e 100644
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/service.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/service.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/servicemonitor.yaml
index ea2b81b6..ea2b81b6 100644
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/servicemonitor.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus/values.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml
index 4398f52f..4398f52f 100644
--- a/vnfs/DAaaS/collection/charts/prometheus/values.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml
diff --git a/vnfs/DAaaS/collection/values.yaml b/vnfs/DAaaS/deploy/collection/values.yaml
index 7fd13869..7fd13869 100644
--- a/vnfs/DAaaS/collection/values.yaml
+++ b/vnfs/DAaaS/deploy/collection/values.yaml
diff --git a/vnfs/DAaaS/day2_configs/collectd/README.txt b/vnfs/DAaaS/deploy/day2_configs/collectd/README.txt
index e1d6e7da..e1d6e7da 100644
--- a/vnfs/DAaaS/day2_configs/collectd/README.txt
+++ b/vnfs/DAaaS/deploy/day2_configs/collectd/README.txt
diff --git a/vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml b/vnfs/DAaaS/deploy/day2_configs/collectd/add_plugins.yaml
index 9e80ce8d..9e80ce8d 100644
--- a/vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml
+++ b/vnfs/DAaaS/deploy/day2_configs/collectd/add_plugins.yaml
diff --git a/vnfs/DAaaS/day2_configs/collectd/replace_image.yaml b/vnfs/DAaaS/deploy/day2_configs/collectd/replace_image.yaml
index 44e66948..44e66948 100644
--- a/vnfs/DAaaS/day2_configs/collectd/replace_image.yaml
+++ b/vnfs/DAaaS/deploy/day2_configs/collectd/replace_image.yaml
diff --git a/vnfs/DAaaS/day2_configs/prometheus/README.txt b/vnfs/DAaaS/deploy/day2_configs/prometheus/README.txt
index 99b63fac..99b63fac 100644
--- a/vnfs/DAaaS/day2_configs/prometheus/README.txt
+++ b/vnfs/DAaaS/deploy/day2_configs/prometheus/README.txt
diff --git a/vnfs/DAaaS/day2_configs/prometheus/add_remote_write.yaml b/vnfs/DAaaS/deploy/day2_configs/prometheus/add_remote_write.yaml
index 48af9017..48af9017 100644
--- a/vnfs/DAaaS/day2_configs/prometheus/add_remote_write.yaml
+++ b/vnfs/DAaaS/deploy/day2_configs/prometheus/add_remote_write.yaml
diff --git a/vnfs/DAaaS/collection/charts/prometheus/.helmignore b/vnfs/DAaaS/deploy/inference-core/.helmignore
index 50af0317..50af0317 100644
--- a/vnfs/DAaaS/collection/charts/prometheus/.helmignore
+++ b/vnfs/DAaaS/deploy/inference-core/.helmignore
diff --git a/vnfs/DAaaS/inference-core/Chart.yaml b/vnfs/DAaaS/deploy/inference-core/Chart.yaml
index 836b1a84..836b1a84 100644
--- a/vnfs/DAaaS/inference-core/Chart.yaml
+++ b/vnfs/DAaaS/deploy/inference-core/Chart.yaml
diff --git a/vnfs/DAaaS/inference-core/.helmignore b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/.helmignore
index 50af0317..50af0317 100644
--- a/vnfs/DAaaS/inference-core/.helmignore
+++ b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/.helmignore
diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/Chart.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/Chart.yaml
index 2db1a483..2db1a483 100644
--- a/vnfs/DAaaS/inference-core/charts/tf-serving/Chart.yaml
+++ b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/Chart.yaml
diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/NOTES.txt b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/NOTES.txt
index 2dcf639e..2dcf639e 100644
--- a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/NOTES.txt
diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/_helpers.tpl b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/_helpers.tpl
index ce3ce917..ce3ce917 100644
--- a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/deployment.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/deployment.yaml
index 0a909e9f..0a909e9f 100644
--- a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/deployment.yaml
+++ b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/deployment.yaml
diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/ingress.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/ingress.yaml
index b02fc8bb..b02fc8bb 100644
--- a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/ingress.yaml
+++ b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/ingress.yaml
diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/secrets.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/secrets.yaml
index f4b8fe89..f4b8fe89 100644
--- a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/secrets.yaml
+++ b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/secrets.yaml
diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/service.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/service.yaml
index 3ddcca66..3ddcca66 100644
--- a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/service.yaml
+++ b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/service.yaml
diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/serviceaccount.yaml
index af4987d8..af4987d8 100644
--- a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/serviceaccount.yaml
+++ b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/serviceaccount.yaml
diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/values.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/values.yaml
index ebf88683..ebf88683 100644
--- a/vnfs/DAaaS/inference-core/charts/tf-serving/values.yaml
+++ b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/values.yaml
diff --git a/vnfs/DAaaS/inference-core/values.yaml b/vnfs/DAaaS/deploy/inference-core/values.yaml
index 10714b88..10714b88 100644
--- a/vnfs/DAaaS/inference-core/values.yaml
+++ b/vnfs/DAaaS/deploy/inference-core/values.yaml
diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/.helmignore b/vnfs/DAaaS/deploy/messaging/.helmignore
index 50af0317..50af0317 100644
--- a/vnfs/DAaaS/inference-core/charts/tf-serving/.helmignore
+++ b/vnfs/DAaaS/deploy/messaging/.helmignore
diff --git a/vnfs/DAaaS/messaging/Chart.yaml b/vnfs/DAaaS/deploy/messaging/Chart.yaml
index a2e468f8..a2e468f8 100644
--- a/vnfs/DAaaS/messaging/Chart.yaml
+++ b/vnfs/DAaaS/deploy/messaging/Chart.yaml
diff --git a/vnfs/DAaaS/messaging/.helmignore b/vnfs/DAaaS/deploy/messaging/charts/kafka/.helmignore
index 50af0317..50af0317 100644
--- a/vnfs/DAaaS/messaging/.helmignore
+++ b/vnfs/DAaaS/deploy/messaging/charts/kafka/.helmignore
diff --git a/vnfs/DAaaS/messaging/charts/kafka/Chart.yaml b/vnfs/DAaaS/deploy/messaging/charts/kafka/Chart.yaml
index b0558bb8..b0558bb8 100644
--- a/vnfs/DAaaS/messaging/charts/kafka/Chart.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/kafka/Chart.yaml
diff --git a/vnfs/DAaaS/messaging/charts/kafka/templates/kafka-cluster.yaml b/vnfs/DAaaS/deploy/messaging/charts/kafka/templates/kafka-cluster.yaml
index cf71fca7..cf71fca7 100644
--- a/vnfs/DAaaS/messaging/charts/kafka/templates/kafka-cluster.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/kafka/templates/kafka-cluster.yaml
diff --git a/vnfs/DAaaS/messaging/charts/kafka/values.yaml b/vnfs/DAaaS/deploy/messaging/charts/kafka/values.yaml
index a5e615c9..a5e615c9 100644
--- a/vnfs/DAaaS/messaging/charts/kafka/values.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/kafka/values.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/.helmignore b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/.helmignore
index f0c13194..f0c13194 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/.helmignore
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/.helmignore
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/Chart.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/Chart.yaml
index 64915c66..64915c66 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/Chart.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/Chart.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/OWNERS b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/OWNERS
index 2aeed6e5..2aeed6e5 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/OWNERS
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/OWNERS
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/README.md b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/README.md
index 35226be0..35226be0 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/README.md
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/README.md
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/010-ServiceAccount-strimzi-cluster-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/010-ServiceAccount-strimzi-cluster-operator.yaml
index 45367ad2..45367ad2 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/010-ServiceAccount-strimzi-cluster-operator.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/010-ServiceAccount-strimzi-cluster-operator.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml
index 12663c74..12663c74 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml
index 647774b5..647774b5 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml
index da7f2cda..da7f2cda 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRoleBinding-strimzi-cluster-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRoleBinding-strimzi-cluster-operator.yaml
index 5e32c34c..5e32c34c 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRoleBinding-strimzi-cluster-operator.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRoleBinding-strimzi-cluster-operator.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRole-strimzi-kafka-broker.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRole-strimzi-kafka-broker.yaml
index 7ef0faf2..7ef0faf2 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRole-strimzi-kafka-broker.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRole-strimzi-kafka-broker.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRoleBinding-strimzi-cluster-operator-kafka-broker-delegation.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRoleBinding-strimzi-cluster-operator-kafka-broker-delegation.yaml
index 744238c9..744238c9 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRoleBinding-strimzi-cluster-operator-kafka-broker-delegation.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRoleBinding-strimzi-cluster-operator-kafka-broker-delegation.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml
index d6d6453a..d6d6453a 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml
index 20b163de..20b163de 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml
index 4d470e40..4d470e40 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml
index 29f3d36b..29f3d36b 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/040-Crd-kafka.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/040-Crd-kafka.yaml
index d2e72949..d2e72949 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/040-Crd-kafka.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/040-Crd-kafka.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/041-Crd-kafkaconnect.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/041-Crd-kafkaconnect.yaml
index b08ac001..b08ac001 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/041-Crd-kafkaconnect.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/041-Crd-kafkaconnect.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/042-Crd-kafkaconnects2i.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/042-Crd-kafkaconnects2i.yaml
index 0b95c7ef..0b95c7ef 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/042-Crd-kafkaconnects2i.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/042-Crd-kafkaconnects2i.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/043-Crd-kafkatopic.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/043-Crd-kafkatopic.yaml
index 69bf8efa..69bf8efa 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/043-Crd-kafkatopic.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/043-Crd-kafkatopic.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/044-Crd-kafkauser.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/044-Crd-kafkauser.yaml
index 2c0bd552..2c0bd552 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/044-Crd-kafkauser.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/044-Crd-kafkauser.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/045-Crd-kafkamirrormaker.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/045-Crd-kafkamirrormaker.yaml
index eeefe116..eeefe116 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/045-Crd-kafkamirrormaker.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/045-Crd-kafkamirrormaker.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml
index 2f9b570d..2f9b570d 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/NOTES.txt b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/NOTES.txt
index b49a9787..b49a9787 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/NOTES.txt
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/_helpers.tpl b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/_helpers.tpl
index c2aac512..c2aac512 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl
index fa22632e..fa22632e 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl
diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/values.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/values.yaml
index 74a7c581..74a7c581 100644
--- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/values.yaml
+++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/values.yaml
diff --git a/vnfs/DAaaS/messaging/values.yaml b/vnfs/DAaaS/deploy/messaging/values.yaml
index 5872bdf9..5872bdf9 100644
--- a/vnfs/DAaaS/messaging/values.yaml
+++ b/vnfs/DAaaS/deploy/messaging/values.yaml
diff --git a/vnfs/DAaaS/minio/.helmignore b/vnfs/DAaaS/deploy/minio/.helmignore
index f0c13194..f0c13194 100644
--- a/vnfs/DAaaS/minio/.helmignore
+++ b/vnfs/DAaaS/deploy/minio/.helmignore
diff --git a/vnfs/DAaaS/minio/Chart.yaml b/vnfs/DAaaS/deploy/minio/Chart.yaml
index aefd5629..aefd5629 100755
--- a/vnfs/DAaaS/minio/Chart.yaml
+++ b/vnfs/DAaaS/deploy/minio/Chart.yaml
diff --git a/vnfs/DAaaS/minio/README.md b/vnfs/DAaaS/deploy/minio/README.md
index 1b101647..1b101647 100755
--- a/vnfs/DAaaS/minio/README.md
+++ b/vnfs/DAaaS/deploy/minio/README.md
diff --git a/vnfs/DAaaS/minio/templates/NOTES.txt b/vnfs/DAaaS/deploy/minio/templates/NOTES.txt
index b690f502..b690f502 100644
--- a/vnfs/DAaaS/minio/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/minio/templates/NOTES.txt
diff --git a/vnfs/DAaaS/minio/templates/_helper_create_bucket.txt b/vnfs/DAaaS/deploy/minio/templates/_helper_create_bucket.txt
index 95528793..95528793 100755
--- a/vnfs/DAaaS/minio/templates/_helper_create_bucket.txt
+++ b/vnfs/DAaaS/deploy/minio/templates/_helper_create_bucket.txt
diff --git a/vnfs/DAaaS/minio/templates/_helpers.tpl b/vnfs/DAaaS/deploy/minio/templates/_helpers.tpl
index c8fe9ba7..c8fe9ba7 100644
--- a/vnfs/DAaaS/minio/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/minio/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/minio/templates/configmap.yaml b/vnfs/DAaaS/deploy/minio/templates/configmap.yaml
index cb11fcd7..cb11fcd7 100644
--- a/vnfs/DAaaS/minio/templates/configmap.yaml
+++ b/vnfs/DAaaS/deploy/minio/templates/configmap.yaml
diff --git a/vnfs/DAaaS/minio/templates/deployment.yaml b/vnfs/DAaaS/deploy/minio/templates/deployment.yaml
index af335b2d..af335b2d 100644
--- a/vnfs/DAaaS/minio/templates/deployment.yaml
+++ b/vnfs/DAaaS/deploy/minio/templates/deployment.yaml
diff --git a/vnfs/DAaaS/minio/templates/ingress.yaml b/vnfs/DAaaS/deploy/minio/templates/ingress.yaml
index 5168b861..5168b861 100644
--- a/vnfs/DAaaS/minio/templates/ingress.yaml
+++ b/vnfs/DAaaS/deploy/minio/templates/ingress.yaml
diff --git a/vnfs/DAaaS/minio/templates/networkpolicy.yaml b/vnfs/DAaaS/deploy/minio/templates/networkpolicy.yaml
index de57f485..de57f485 100644
--- a/vnfs/DAaaS/minio/templates/networkpolicy.yaml
+++ b/vnfs/DAaaS/deploy/minio/templates/networkpolicy.yaml
diff --git a/vnfs/DAaaS/minio/templates/post-install-create-bucket-job.yaml b/vnfs/DAaaS/deploy/minio/templates/post-install-create-bucket-job.yaml
index c581338a..c581338a 100755
--- a/vnfs/DAaaS/minio/templates/post-install-create-bucket-job.yaml
+++ b/vnfs/DAaaS/deploy/minio/templates/post-install-create-bucket-job.yaml
diff --git a/vnfs/DAaaS/minio/templates/pvc.yaml b/vnfs/DAaaS/deploy/minio/templates/pvc.yaml
index 3f4cbb03..3f4cbb03 100644
--- a/vnfs/DAaaS/minio/templates/pvc.yaml
+++ b/vnfs/DAaaS/deploy/minio/templates/pvc.yaml
diff --git a/vnfs/DAaaS/minio/templates/secrets.yaml b/vnfs/DAaaS/deploy/minio/templates/secrets.yaml
index b01e0d3c..b01e0d3c 100644
--- a/vnfs/DAaaS/minio/templates/secrets.yaml
+++ b/vnfs/DAaaS/deploy/minio/templates/secrets.yaml
diff --git a/vnfs/DAaaS/minio/templates/service.yaml b/vnfs/DAaaS/deploy/minio/templates/service.yaml
index 0799b287..0799b287 100644
--- a/vnfs/DAaaS/minio/templates/service.yaml
+++ b/vnfs/DAaaS/deploy/minio/templates/service.yaml
diff --git a/vnfs/DAaaS/minio/templates/statefulset.yaml b/vnfs/DAaaS/deploy/minio/templates/statefulset.yaml
index 447b671d..447b671d 100644
--- a/vnfs/DAaaS/minio/templates/statefulset.yaml
+++ b/vnfs/DAaaS/deploy/minio/templates/statefulset.yaml
diff --git a/vnfs/DAaaS/minio/values.yaml b/vnfs/DAaaS/deploy/minio/values.yaml
index 1b81a8cb..1b81a8cb 100755
--- a/vnfs/DAaaS/minio/values.yaml
+++ b/vnfs/DAaaS/deploy/minio/values.yaml
diff --git a/vnfs/DAaaS/messaging/charts/kafka/.helmignore b/vnfs/DAaaS/deploy/operator/.helmignore
index 50af0317..50af0317 100644
--- a/vnfs/DAaaS/messaging/charts/kafka/.helmignore
+++ b/vnfs/DAaaS/deploy/operator/.helmignore
diff --git a/vnfs/DAaaS/operator/Chart.yaml b/vnfs/DAaaS/deploy/operator/Chart.yaml
index 01c1eb03..01c1eb03 100644
--- a/vnfs/DAaaS/operator/Chart.yaml
+++ b/vnfs/DAaaS/deploy/operator/Chart.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/.helmignore b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/.helmignore
index f0c13194..f0c13194 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/.helmignore
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/.helmignore
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/Chart.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/Chart.yaml
index bdaea5ae..bdaea5ae 100755
--- a/vnfs/DAaaS/operator/charts/etcd-operator/Chart.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/Chart.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/OWNERS b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/OWNERS
index 1385151c..1385151c 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/OWNERS
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/OWNERS
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/README.md b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/README.md
index e8fa9c51..e8fa9c51 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/README.md
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/README.md
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/NOTES.txt b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/NOTES.txt
index c33ee014..c33ee014 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/NOTES.txt
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/_helpers.tpl b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/_helpers.tpl
index 03f9a26b..03f9a26b 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml
index 5528f766..5528f766 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-clusterrole-binding.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-clusterrole-binding.yaml
index 526b2454..526b2454 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-clusterrole-binding.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-clusterrole-binding.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-deployment.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-deployment.yaml
index d5c421c1..d5c421c1 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-deployment.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-deployment.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml
index 06aec3df..06aec3df 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml
index 0d385d8f..0d385d8f 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-cluster-role.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-cluster-role.yaml
index 62085978..62085978 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-cluster-role.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-cluster-role.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-clusterrole-binding.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-clusterrole-binding.yaml
index 09594ccc..09594ccc 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-clusterrole-binding.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-clusterrole-binding.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-deployment.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-deployment.yaml
index bb6b1a75..bb6b1a75 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-deployment.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-deployment.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-service-account.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-service-account.yaml
index 2faba8af..2faba8af 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-service-account.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-service-account.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml
index 73faaab8..73faaab8 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-clusterrole-binding.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-clusterrole-binding.yaml
index 9a6696ef..9a6696ef 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-clusterrole-binding.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-clusterrole-binding.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-deployment.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-deployment.yaml
index 5c4784de..5c4784de 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-deployment.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-deployment.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml
index 595cee92..595cee92 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-service.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service.yaml
index 052be364..052be364 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-service.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service.yaml
diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/values.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/values.yaml
index 1260e077..1260e077 100644
--- a/vnfs/DAaaS/operator/charts/etcd-operator/values.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/values.yaml
diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/Chart.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/Chart.yaml
index ebdc0b40..ebdc0b40 100644
--- a/vnfs/DAaaS/operator/charts/m3db-operator/Chart.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/Chart.yaml
diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/LICENSE b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/LICENSE
index 261eeb9e..261eeb9e 100644
--- a/vnfs/DAaaS/operator/charts/m3db-operator/LICENSE
+++ b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/LICENSE
diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/NOTES.txt b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/NOTES.txt
index ca4143db..ca4143db 100644
--- a/vnfs/DAaaS/operator/charts/m3db-operator/NOTES.txt
+++ b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/NOTES.txt
diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/README.md b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/README.md
index 0a532d31..0a532d31 100644
--- a/vnfs/DAaaS/operator/charts/m3db-operator/README.md
+++ b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/README.md
diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/templates/cluster_role.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/cluster_role.yaml
index 7bf41739..7bf41739 100644
--- a/vnfs/DAaaS/operator/charts/m3db-operator/templates/cluster_role.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/cluster_role.yaml
diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/templates/cluster_role_binding.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/cluster_role_binding.yaml
index 876a6705..876a6705 100644
--- a/vnfs/DAaaS/operator/charts/m3db-operator/templates/cluster_role_binding.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/cluster_role_binding.yaml
diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/templates/service_account.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/service_account.yaml
index a65e90bc..a65e90bc 100644
--- a/vnfs/DAaaS/operator/charts/m3db-operator/templates/service_account.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/service_account.yaml
diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/templates/stateful_set.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/stateful_set.yaml
index d1002378..d1002378 100644
--- a/vnfs/DAaaS/operator/charts/m3db-operator/templates/stateful_set.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/stateful_set.yaml
diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/values.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/values.yaml
index 8411d77e..8411d77e 100644
--- a/vnfs/DAaaS/operator/charts/m3db-operator/values.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/values.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/.helmignore b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/.helmignore
index 9797d317..9797d317 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/.helmignore
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/.helmignore
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/Chart.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/Chart.yaml
index 2198963b..2198963b 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/Chart.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/Chart.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/README.md b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/README.md
index 8966f03a..8966f03a 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/README.md
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/README.md
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/NOTES.txt b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/NOTES.txt
index b5aec761..b5aec761 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/NOTES.txt
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/_helpers.tpl b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/_helpers.tpl
index 6ec1fa2b..6ec1fa2b 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml
index 24f93847..24f93847 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml
index fd657f71..fd657f71 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml
index f240fe76..f240fe76 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml
index e83d8bc7..e83d8bc7 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml
index e1d06ab4..e1d06ab4 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml
index 01eda240..01eda240 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml
index e73c465f..e73c465f 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/service.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/service.yaml
index d10bf745..d10bf745 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/service.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/service.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml
index bbed0287..bbed0287 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml
index 5c8cab90..5c8cab90 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml
index 392b7c93..392b7c93 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml
index 0289154b..0289154b 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml
index 5b8b54c4..5b8b54c4 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml
index 161b1907..161b1907 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml
index 5792140e..5792140e 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml
index b638913e..b638913e 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml
index 19394efe..19394efe 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml
index 2f61ac42..2f61ac42 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml
index fae35be8..fae35be8 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml
index 1678a051..1678a051 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml
index ebc112c0..ebc112c0 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml
index fe32a013..fe32a013 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml
index f2bc6c40..f2bc6c40 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml
index 6195833d..6195833d 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml
index 954a842c..954a842c 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml
index 297e8391..297e8391 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml
index 594a2019..594a2019 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml
index 13f0ca07..13f0ca07 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml
index 1834d02f..1834d02f 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml
index 0debca78..0debca78 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml
index 9839687e..9839687e 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml
index ac0a633b..ac0a633b 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml
index 809d6fa8..809d6fa8 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml
index 748ec293..748ec293 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml
index 77a87a39..77a87a39 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml
index 38491a21..38491a21 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml
index 60913e10..60913e10 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml
index 2cffa7de..2cffa7de 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml
index 9532c1f9..9532c1f9 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml
index 1c54f40b..1c54f40b 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml
index 4475e7bd..4475e7bd 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml
index 0d85c9bd..0d85c9bd 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml
index 9d6bb616..9d6bb616 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml
index 799027d9..799027d9 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml
index b0c0e9e1..b0c0e9e1 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml
index e013e960..e013e960 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml
index a51cda5d..a51cda5d 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml
index c172c0e3..c172c0e3 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml
index a2ab02db..a2ab02db 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml
index 08faa722..08faa722 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp.yaml
index 40d33462..40d33462 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml
index eef28dad..eef28dad 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml
index 9fe3f20e..9fe3f20e 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml
index 89fb9ce7..89fb9ce7 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml
index 64161876..64161876 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml
index c1762fd1..c1762fd1 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml
index a68eeff2..a68eeff2 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml
index 9f8349f9..9f8349f9 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml
index 678df008..678df008 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml
index cbb19cb7..cbb19cb7 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml
index 2df9a096..2df9a096 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml
index 0d2ff510..0d2ff510 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml
index e51b0181..e51b0181 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml
index 19b09491..19b09491 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml
index d3d2c498..d3d2c498 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml
index ed4a83c6..ed4a83c6 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml
index edd8f5fc..edd8f5fc 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml
index 8ccfa5bf..8ccfa5bf 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml
index 35245437..35245437 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml
index 774a540c..774a540c 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml
index 3c9e1490..3c9e1490 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/service.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/service.yaml
index fc94f953..fc94f953 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/service.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/service.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml
index 88df10ad..88df10ad 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml
index 36790450..36790450 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml
index 61f3ca3c..61f3ca3c 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml
diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/values.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml
index fc0bc243..fc0bc243 100644
--- a/vnfs/DAaaS/operator/charts/prometheus-operator/values.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/.helmignore b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/.helmignore
index b7f6f9f1..b7f6f9f1 100644
--- a/vnfs/DAaaS/operator/charts/sparkoperator/.helmignore
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/.helmignore
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/Chart.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/Chart.yaml
index 86d0c3ab..86d0c3ab 100644
--- a/vnfs/DAaaS/operator/charts/sparkoperator/Chart.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/Chart.yaml
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/README.md b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/README.md
index ba0f05bc..ba0f05bc 100755
--- a/vnfs/DAaaS/operator/charts/sparkoperator/README.md
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/README.md
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/_helpers.tpl b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/_helpers.tpl
index 741b500d..741b500d 100644
--- a/vnfs/DAaaS/operator/charts/sparkoperator/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-deployment.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-deployment.yaml
index fdfc51a2..fdfc51a2 100755
--- a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-deployment.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-deployment.yaml
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-rbac.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-rbac.yaml
index bd5fd3fe..bd5fd3fe 100755
--- a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-rbac.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-rbac.yaml
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-serviceaccount.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-serviceaccount.yaml
index 5216f8dd..5216f8dd 100755
--- a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-serviceaccount.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-serviceaccount.yaml
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-rbac.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-rbac.yaml
index fa066053..fa066053 100755
--- a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-rbac.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-rbac.yaml
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-serviceaccount.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-serviceaccount.yaml
index bb0e55ea..bb0e55ea 100755
--- a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-serviceaccount.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-serviceaccount.yaml
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-cleanup-job.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-cleanup-job.yaml
index d6d9df7c..d6d9df7c 100755
--- a/vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-cleanup-job.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-cleanup-job.yaml
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-init-job.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-init-job.yaml
index a42c3097..a42c3097 100755
--- a/vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-init-job.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-init-job.yaml
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-service.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-service.yaml
index 42c5bc62..42c5bc62 100755
--- a/vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-service.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-service.yaml
diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/values.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/values.yaml
index bfb03eab..bfb03eab 100644
--- a/vnfs/DAaaS/operator/charts/sparkoperator/values.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/values.yaml
diff --git a/vnfs/DAaaS/operator/resources/m3db.labels b/vnfs/DAaaS/deploy/operator/resources/m3db.labels
index 4f1ddd53..4f1ddd53 100644
--- a/vnfs/DAaaS/operator/resources/m3db.labels
+++ b/vnfs/DAaaS/deploy/operator/resources/m3db.labels
diff --git a/vnfs/DAaaS/applications/values.yaml b/vnfs/DAaaS/deploy/operator/values.yaml
index fd98eb36..fd98eb36 100644
--- a/vnfs/DAaaS/applications/values.yaml
+++ b/vnfs/DAaaS/deploy/operator/values.yaml
diff --git a/vnfs/DAaaS/training-core/.helmignore b/vnfs/DAaaS/deploy/training-core/.helmignore
index ef839191..ef839191 100644
--- a/vnfs/DAaaS/training-core/.helmignore
+++ b/vnfs/DAaaS/deploy/training-core/.helmignore
diff --git a/vnfs/DAaaS/training-core/Chart.yaml b/vnfs/DAaaS/deploy/training-core/Chart.yaml
index 9057c590..9057c590 100644
--- a/vnfs/DAaaS/training-core/Chart.yaml
+++ b/vnfs/DAaaS/deploy/training-core/Chart.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/.gitignore b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/.gitignore
index fc82fcb5..fc82fcb5 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/.gitignore
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/.gitignore
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/.travis.yml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/.travis.yml
index 1d3351da..1d3351da 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/.travis.yml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/.travis.yml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/LICENSE b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/LICENSE
index 8dada3ed..8dada3ed 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/LICENSE
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/LICENSE
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/README.md b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/README.md
index ca694a19..ca694a19 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/README.md
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/README.md
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/README.md b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/README.md
index 15ee8867..15ee8867 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/README.md
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/README.md
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/Chart.yaml
index 00d6f47d..00d6f47d 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/Chart.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/Chart.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/templates/client-deployment.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/templates/client-deployment.yaml
index afffedfd..afffedfd 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/templates/client-deployment.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/templates/client-deployment.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/.helmignore b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/.helmignore
index f0c13194..f0c13194 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/.helmignore
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/.helmignore
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/Chart.yaml
index 229c4344..229c4344 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/Chart.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/Chart.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/_helpers.tpl b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/_helpers.tpl
index cd2ff083..cd2ff083 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/configmap.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/configmap.yaml
index 379dab8f..379dab8f 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/configmap.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/configmap.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/Chart.yaml
index ec837254..ec837254 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/Chart.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/Chart.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/templates/datanode-daemonset.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/templates/datanode-daemonset.yaml
index 09445ed0..09445ed0 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/templates/datanode-daemonset.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/templates/datanode-daemonset.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/Chart.yaml
index a7ea6c8f..a7ea6c8f 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/Chart.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/Chart.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/templates/journalnode-statefulset.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/templates/journalnode-statefulset.yaml
index 22a4a2b4..22a4a2b4 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/templates/journalnode-statefulset.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/templates/journalnode-statefulset.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.gitignore b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.gitignore
index 28ebd32d..28ebd32d 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.gitignore
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.gitignore
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.helmignore b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.helmignore
index f0c13194..f0c13194 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.helmignore
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.helmignore
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/Chart.yaml
index ec58ffb6..ec58ffb6 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/Chart.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/Chart.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/requirements.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/requirements.yaml
index 7f803fdc..7f803fdc 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/requirements.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/requirements.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/templates/_helpers.tpl b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/templates/_helpers.tpl
index 9d03c4d2..9d03c4d2 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml
index 77ca3fe0..77ca3fe0 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/.helmignore b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/.helmignore
index f0c13194..f0c13194 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/.helmignore
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/.helmignore
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/Chart.yaml
index f8c301f1..f8c301f1 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/Chart.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/Chart.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/templates/statefulset.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/templates/statefulset.yaml
index 15be4b2f..15be4b2f 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/templates/statefulset.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/templates/statefulset.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/Chart.yaml
index f45655f5..f45655f5 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/Chart.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/Chart.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/templates/namenode-statefulset.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/templates/namenode-statefulset.yaml
index 44e8fc60..44e8fc60 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/templates/namenode-statefulset.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/templates/namenode-statefulset.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/Chart.yaml
index bcf6f5b0..bcf6f5b0 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/Chart.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/Chart.yaml
diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/templates/namenode-statefulset.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/templates/namenode-statefulset.yaml
index ab92efa9..ab92efa9 100644
--- a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/templates/namenode-statefulset.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/templates/namenode-statefulset.yaml
diff --git a/vnfs/DAaaS/operator/.helmignore b/vnfs/DAaaS/deploy/training-core/charts/m3db/.helmignore
index 50af0317..50af0317 100644
--- a/vnfs/DAaaS/operator/.helmignore
+++ b/vnfs/DAaaS/deploy/training-core/charts/m3db/.helmignore
diff --git a/vnfs/DAaaS/training-core/charts/m3db/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/m3db/Chart.yaml
index 10d9d542..10d9d542 100644
--- a/vnfs/DAaaS/training-core/charts/m3db/Chart.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/m3db/Chart.yaml
diff --git a/vnfs/DAaaS/training-core/charts/m3db/templates/NOTES.txt b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/NOTES.txt
index ee7ee3d7..ee7ee3d7 100644
--- a/vnfs/DAaaS/training-core/charts/m3db/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/NOTES.txt
diff --git a/vnfs/DAaaS/training-core/charts/m3db/templates/_helpers.tpl b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/_helpers.tpl
index 36544b12..36544b12 100644
--- a/vnfs/DAaaS/training-core/charts/m3db/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/training-core/charts/m3db/templates/configmap.yaml b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/configmap.yaml
index d7197ae9..d7197ae9 100644
--- a/vnfs/DAaaS/training-core/charts/m3db/templates/configmap.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/configmap.yaml
diff --git a/vnfs/DAaaS/training-core/charts/m3db/templates/etcd-cluster.yaml b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/etcd-cluster.yaml
index fcf44256..fcf44256 100644
--- a/vnfs/DAaaS/training-core/charts/m3db/templates/etcd-cluster.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/etcd-cluster.yaml
diff --git a/vnfs/DAaaS/training-core/charts/m3db/templates/m3dbcluster.yaml b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/m3dbcluster.yaml
index 5e804351..5e804351 100644
--- a/vnfs/DAaaS/training-core/charts/m3db/templates/m3dbcluster.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/m3dbcluster.yaml
diff --git a/vnfs/DAaaS/training-core/charts/m3db/values.yaml b/vnfs/DAaaS/deploy/training-core/charts/m3db/values.yaml
index ab365cfa..ab365cfa 100644
--- a/vnfs/DAaaS/training-core/charts/m3db/values.yaml
+++ b/vnfs/DAaaS/deploy/training-core/charts/m3db/values.yaml
diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/README.md b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/README.md
index 4de7d0f9..4de7d0f9 100644
--- a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/README.md
+++ b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/README.md
diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/pom.xml b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/pom.xml
index 20c11fea..20c11fea 100644
--- a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/pom.xml
+++ b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/pom.xml
diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/CreateKafkaConsumer.java b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/CreateKafkaConsumer.java
index 2042a146..2042a146 100644
--- a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/CreateKafkaConsumer.java
+++ b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/CreateKafkaConsumer.java
diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/HdfsWriter.java b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/HdfsWriter.java
index cd5b6635..cd5b6635 100644
--- a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/HdfsWriter.java
+++ b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/HdfsWriter.java
diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/Orchestrator.java b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/Orchestrator.java
index b4daf2d1..b4daf2d1 100644
--- a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/Orchestrator.java
+++ b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/Orchestrator.java
diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/config/Configuration.java b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/config/Configuration.java
index c7de131b..c7de131b 100644
--- a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/config/Configuration.java
+++ b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/config/Configuration.java
diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/kafka2hdfsApp.java b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/kafka2hdfsApp.java
index 5c041134..5c041134 100644
--- a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/kafka2hdfsApp.java
+++ b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/kafka2hdfsApp.java
diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/resources/configs.yaml b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/resources/configs.yaml
index 8955c304..8955c304 100644
--- a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/resources/configs.yaml
+++ b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/resources/configs.yaml
diff --git a/vnfs/DAaaS/operator/values.yaml b/vnfs/DAaaS/deploy/training-core/values.yaml
index fd98eb36..fd98eb36 100644
--- a/vnfs/DAaaS/operator/values.yaml
+++ b/vnfs/DAaaS/deploy/training-core/values.yaml
diff --git a/vnfs/DAaaS/training-core/charts/m3db/.helmignore b/vnfs/DAaaS/deploy/visualization/.helmignore
index 50af0317..50af0317 100644
--- a/vnfs/DAaaS/training-core/charts/m3db/.helmignore
+++ b/vnfs/DAaaS/deploy/visualization/.helmignore
diff --git a/vnfs/DAaaS/visualization/Chart.yaml b/vnfs/DAaaS/deploy/visualization/Chart.yaml
index b85467b4..b85467b4 100644
--- a/vnfs/DAaaS/visualization/Chart.yaml
+++ b/vnfs/DAaaS/deploy/visualization/Chart.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/.helmignore b/vnfs/DAaaS/deploy/visualization/charts/grafana/.helmignore
index 7c04072e..7c04072e 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/.helmignore
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/.helmignore
diff --git a/vnfs/DAaaS/visualization/charts/grafana/Chart.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml
index a0721868..a0721868 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/Chart.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/README.md b/vnfs/DAaaS/deploy/visualization/charts/grafana/README.md
index 44a30601..44a30601 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/README.md
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/README.md
diff --git a/vnfs/DAaaS/visualization/charts/grafana/dashboards/custom-dashboard.json b/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json
index 9e26dfee..9e26dfee 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/dashboards/custom-dashboard.json
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/NOTES.txt b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt
index 80c6d148..80c6d148 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/_helpers.tpl b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl
index 3a3ebd3e..3a3ebd3e 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/clusterrole.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml
index ccfc7237..ccfc7237 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/clusterrole.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml
index 0ffe9ff2..0ffe9ff2 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/clusterrolebinding.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml
index 07717319..07717319 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/configmap.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml
index a2d05075..a2d05075 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/configmap.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/dashboards-json-configmap.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/dashboards-json-configmap.yaml
index bd46addc..bd46addc 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/dashboards-json-configmap.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/dashboards-json-configmap.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/deployment.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml
index 05225e40..05225e40 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/deployment.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/ingress.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml
index 48973454..48973454 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/ingress.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/podsecuritypolicy.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml
index d3ef3644..d3ef3644 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/podsecuritypolicy.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/pvc.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml
index e1cc0329..e1cc0329 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/pvc.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/role.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml
index f6165694..f6165694 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/role.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/rolebinding.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml
index 8b6671b8..8b6671b8 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/rolebinding.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/secret.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml
index a1ea5798..a1ea5798 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/secret.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/service.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml
index 87fac70c..87fac70c 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/service.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml
index 04601d05..04601d05 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/templates/serviceaccount.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml
diff --git a/vnfs/DAaaS/visualization/charts/grafana/values.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml
index 74b511cf..74b511cf 100755
--- a/vnfs/DAaaS/visualization/charts/grafana/values.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml
diff --git a/vnfs/DAaaS/visualization/templates/NOTES.txt b/vnfs/DAaaS/deploy/visualization/templates/NOTES.txt
index edd06657..edd06657 100644
--- a/vnfs/DAaaS/visualization/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/visualization/templates/NOTES.txt
diff --git a/vnfs/DAaaS/visualization/values.yaml b/vnfs/DAaaS/deploy/visualization/values.yaml
index 7e1d7438..7e1d7438 100644
--- a/vnfs/DAaaS/visualization/values.yaml
+++ b/vnfs/DAaaS/deploy/visualization/values.yaml
diff --git a/vnfs/DAaaS/lib/README.md b/vnfs/DAaaS/lib/README.md
new file mode 100644
index 00000000..fac5dc96
--- /dev/null
+++ b/vnfs/DAaaS/lib/README.md
@@ -0,0 +1 @@
+This folder consists of library files. For eg: PromQL client library.
diff --git a/vnfs/DAaaS/GoApps/src/hdfs-writer/.gitignore b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/.gitignore
index ad4781d2..ad4781d2 100644
--- a/vnfs/DAaaS/GoApps/src/hdfs-writer/.gitignore
+++ b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/.gitignore
diff --git a/vnfs/DAaaS/GoApps/src/hdfs-writer/Makefile b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/Makefile
index e3f21405..e3f21405 100644
--- a/vnfs/DAaaS/GoApps/src/hdfs-writer/Makefile
+++ b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/Makefile
diff --git a/vnfs/DAaaS/GoApps/src/hdfs-writer/README.md b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/README.md
index 453b842d..453b842d 100644
--- a/vnfs/DAaaS/GoApps/src/hdfs-writer/README.md
+++ b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/README.md
diff --git a/vnfs/DAaaS/GoApps/src/hdfs-writer/cmd/main.go b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/cmd/main.go
index 11350f0b..11350f0b 100644
--- a/vnfs/DAaaS/GoApps/src/hdfs-writer/cmd/main.go
+++ b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/cmd/main.go
diff --git a/vnfs/DAaaS/GoApps/src/hdfs-writer/go.mod b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/go.mod
index b2855127..b2855127 100644
--- a/vnfs/DAaaS/GoApps/src/hdfs-writer/go.mod
+++ b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/go.mod
diff --git a/vnfs/DAaaS/collectd-operator/.gitignore b/vnfs/DAaaS/microservices/collectd-operator/.gitignore
index 4ff0bf71..4ff0bf71 100644
--- a/vnfs/DAaaS/collectd-operator/.gitignore
+++ b/vnfs/DAaaS/microservices/collectd-operator/.gitignore
diff --git a/vnfs/DAaaS/collectd-operator/Makefile b/vnfs/DAaaS/microservices/collectd-operator/Makefile
index c3c11f5e..c3c11f5e 100644
--- a/vnfs/DAaaS/collectd-operator/Makefile
+++ b/vnfs/DAaaS/microservices/collectd-operator/Makefile
diff --git a/vnfs/DAaaS/collectd-operator/build/Dockerfile b/vnfs/DAaaS/microservices/collectd-operator/build/Dockerfile
index c923e158..c923e158 100644
--- a/vnfs/DAaaS/collectd-operator/build/Dockerfile
+++ b/vnfs/DAaaS/microservices/collectd-operator/build/Dockerfile
diff --git a/vnfs/DAaaS/collectd-operator/cmd/manager/main.go b/vnfs/DAaaS/microservices/collectd-operator/cmd/manager/main.go
index 80013fb5..80013fb5 100644
--- a/vnfs/DAaaS/collectd-operator/cmd/manager/main.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/cmd/manager/main.go
diff --git a/vnfs/DAaaS/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml
index a4684293..a4684293 100644
--- a/vnfs/DAaaS/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml
+++ b/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml
diff --git a/vnfs/DAaaS/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_crd.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_crd.yaml
index 9b944f48..9b944f48 100644
--- a/vnfs/DAaaS/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_crd.yaml
+++ b/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_crd.yaml
diff --git a/vnfs/DAaaS/collectd-operator/deploy/operator.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/operator.yaml
index 108719ab..108719ab 100644
--- a/vnfs/DAaaS/collectd-operator/deploy/operator.yaml
+++ b/vnfs/DAaaS/microservices/collectd-operator/deploy/operator.yaml
diff --git a/vnfs/DAaaS/collectd-operator/deploy/role.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/role.yaml
index d7aba353..d7aba353 100644
--- a/vnfs/DAaaS/collectd-operator/deploy/role.yaml
+++ b/vnfs/DAaaS/microservices/collectd-operator/deploy/role.yaml
diff --git a/vnfs/DAaaS/collectd-operator/deploy/role_binding.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/role_binding.yaml
index 5f425081..5f425081 100644
--- a/vnfs/DAaaS/collectd-operator/deploy/role_binding.yaml
+++ b/vnfs/DAaaS/microservices/collectd-operator/deploy/role_binding.yaml
diff --git a/vnfs/DAaaS/collectd-operator/deploy/service_account.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/service_account.yaml
index 6e6700e4..6e6700e4 100644
--- a/vnfs/DAaaS/collectd-operator/deploy/service_account.yaml
+++ b/vnfs/DAaaS/microservices/collectd-operator/deploy/service_account.yaml
diff --git a/vnfs/DAaaS/collectd-operator/go.mod b/vnfs/DAaaS/microservices/collectd-operator/go.mod
index 3adbdc2b..3adbdc2b 100644
--- a/vnfs/DAaaS/collectd-operator/go.mod
+++ b/vnfs/DAaaS/microservices/collectd-operator/go.mod
diff --git a/vnfs/DAaaS/collectd-operator/go.sum b/vnfs/DAaaS/microservices/collectd-operator/go.sum
index ea13f2aa..ea13f2aa 100644
--- a/vnfs/DAaaS/collectd-operator/go.sum
+++ b/vnfs/DAaaS/microservices/collectd-operator/go.sum
diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/addtoscheme_onap_v1alpha1.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/addtoscheme_onap_v1alpha1.go
index 711a1182..711a1182 100644
--- a/vnfs/DAaaS/collectd-operator/pkg/apis/addtoscheme_onap_v1alpha1.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/addtoscheme_onap_v1alpha1.go
diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/apis.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/apis.go
index 07dc9616..07dc9616 100644
--- a/vnfs/DAaaS/collectd-operator/pkg/apis/apis.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/apis.go
diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/collectdplugin_types.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/collectdplugin_types.go
index d29498e8..d29498e8 100644
--- a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/collectdplugin_types.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/collectdplugin_types.go
diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/doc.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/doc.go
index 29b3493e..29b3493e 100644
--- a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/doc.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/doc.go
diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/register.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/register.go
index c670eea4..c670eea4 100644
--- a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/register.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/register.go
diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.deepcopy.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.deepcopy.go
index 0fe1dcc3..0fe1dcc3 100644
--- a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.deepcopy.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.deepcopy.go
diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.openapi.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.openapi.go
index a1d401b7..a1d401b7 100644
--- a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.openapi.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.openapi.go
diff --git a/vnfs/DAaaS/collectd-operator/pkg/controller/add_collectdplugin.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/add_collectdplugin.go
index da8d1e1d..da8d1e1d 100644
--- a/vnfs/DAaaS/collectd-operator/pkg/controller/add_collectdplugin.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/add_collectdplugin.go
diff --git a/vnfs/DAaaS/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go
index 77d7e157..77d7e157 100644
--- a/vnfs/DAaaS/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go
diff --git a/vnfs/DAaaS/collectd-operator/pkg/controller/controller.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/controller.go
index 7c069f3e..7c069f3e 100644
--- a/vnfs/DAaaS/collectd-operator/pkg/controller/controller.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/controller.go
diff --git a/vnfs/DAaaS/collectd-operator/tools.go b/vnfs/DAaaS/microservices/collectd-operator/tools.go
index 4da112f6..4da112f6 100644
--- a/vnfs/DAaaS/collectd-operator/tools.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/tools.go
diff --git a/vnfs/DAaaS/collectd-operator/version/version.go b/vnfs/DAaaS/microservices/collectd-operator/version/version.go
index e3e130bf..e3e130bf 100644
--- a/vnfs/DAaaS/collectd-operator/version/version.go
+++ b/vnfs/DAaaS/microservices/collectd-operator/version/version.go
diff --git a/vnfs/DAaaS/applications/m3db_promql/promql_api/README.md b/vnfs/DAaaS/sample-apps/m3db_promql/promql_api/README.md
index 4493af22..4493af22 100644
--- a/vnfs/DAaaS/applications/m3db_promql/promql_api/README.md
+++ b/vnfs/DAaaS/sample-apps/m3db_promql/promql_api/README.md
diff --git a/vnfs/DAaaS/applications/m3db_promql/promql_api/__init__.py b/vnfs/DAaaS/sample-apps/m3db_promql/promql_api/__init__.py
index e69de29b..e69de29b 100644
--- a/vnfs/DAaaS/applications/m3db_promql/promql_api/__init__.py
+++ b/vnfs/DAaaS/sample-apps/m3db_promql/promql_api/__init__.py
diff --git a/vnfs/DAaaS/applications/m3db_promql/promql_api/prom_ql_api.py b/vnfs/DAaaS/sample-apps/m3db_promql/promql_api/prom_ql_api.py
index 2bc102c4..2bc102c4 100644
--- a/vnfs/DAaaS/applications/m3db_promql/promql_api/prom_ql_api.py
+++ b/vnfs/DAaaS/sample-apps/m3db_promql/promql_api/prom_ql_api.py
diff --git a/vnfs/DAaaS/applications/m3db_promql/sample_promql_query.py b/vnfs/DAaaS/sample-apps/m3db_promql/sample_promql_query.py
index ef360809..ef360809 100644
--- a/vnfs/DAaaS/applications/m3db_promql/sample_promql_query.py
+++ b/vnfs/DAaaS/sample-apps/m3db_promql/sample_promql_query.py
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/Chart.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml
index 3ce06e28..3ce06e28 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/Chart.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/Dockerfile b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Dockerfile
index 5b8f5636..5b8f5636 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/Dockerfile
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Dockerfile
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/README.md b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/README.md
index 08e7691f..08e7691f 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/README.md
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/README.md
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/keras_mnist_advanced_modified.py b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/keras_mnist_advanced_modified.py
index fa39cb6a..fa39cb6a 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/keras_mnist_advanced_modified.py
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/keras_mnist_advanced_modified.py
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/sample_values.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml
index 7030dd24..7030dd24 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/sample_values.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/NOTES.txt b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/NOTES.txt
index 774555ae..774555ae 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/templates/NOTES.txt
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/NOTES.txt
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/_helpers.tpl b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/_helpers.tpl
index 02071c0f..02071c0f 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/templates/_helpers.tpl
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/config.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml
index ae93c445..ae93c445 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/templates/config.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/job-service.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml
index e7b05c26..e7b05c26 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/templates/job-service.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/job.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml
index da42ded8..da42ded8 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/templates/job.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/minio-secrets.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/minio-secrets.yaml
index c99abe67..c99abe67 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/templates/minio-secrets.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/minio-secrets.yaml
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/secrets.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml
index c9853ed0..c9853ed0 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/templates/secrets.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset-service.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml
index d0216a86..d0216a86 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset-service.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml
diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset.yaml
index 1d3f7577..1d3f7577 100644
--- a/vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset.yaml
diff --git a/vnfs/DAaaS/visualization/.helmignore b/vnfs/DAaaS/sample-apps/training/sample-spark-app/.helmignore
index 50af0317..50af0317 100644
--- a/vnfs/DAaaS/visualization/.helmignore
+++ b/vnfs/DAaaS/sample-apps/training/sample-spark-app/.helmignore
diff --git a/vnfs/DAaaS/applications/sample-spark-app/Chart.yaml b/vnfs/DAaaS/sample-apps/training/sample-spark-app/Chart.yaml
index 42ed0400..42ed0400 100644
--- a/vnfs/DAaaS/applications/sample-spark-app/Chart.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-spark-app/Chart.yaml
diff --git a/vnfs/DAaaS/applications/sample-spark-app/Dockerfile b/vnfs/DAaaS/sample-apps/training/sample-spark-app/Dockerfile
index cd42d4c7..cd42d4c7 100644
--- a/vnfs/DAaaS/applications/sample-spark-app/Dockerfile
+++ b/vnfs/DAaaS/sample-apps/training/sample-spark-app/Dockerfile
diff --git a/vnfs/DAaaS/applications/sample-spark-app/templates/SampleSparkApp.yaml b/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml
index f728f82e..f728f82e 100644
--- a/vnfs/DAaaS/applications/sample-spark-app/templates/SampleSparkApp.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml
diff --git a/vnfs/DAaaS/applications/sample-spark-app/templates/_helpers.tpl b/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/_helpers.tpl
index 6f51811d..6f51811d 100644
--- a/vnfs/DAaaS/applications/sample-spark-app/templates/_helpers.tpl
+++ b/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/applications/sample-spark-app/values.yaml b/vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml
index afb48d67..afb48d67 100644
--- a/vnfs/DAaaS/applications/sample-spark-app/values.yaml
+++ b/vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml
diff --git a/vnfs/DAaaS/training-core/values.yaml b/vnfs/DAaaS/training-core/values.yaml
deleted file mode 100644
index fd98eb36..00000000
--- a/vnfs/DAaaS/training-core/values.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 2019 Intel Corporation
-#
-# 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: 310
- repository: nexus3.onap.org:10001
- readinessRepository: oomk8s
- readinessImage: readiness-check:2.0.0
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
-
-#################################################################
-# k8s Operator Day-0 configuration defaults.
-#################################################################
-