[COMMON] Cleanup charts

- archive charts, which are not maintained anymore
- archive subcharts in SDNC, MSB, DCAEGEN2-SERVICES
- Cleanup environment and override files

Issue-ID: OOM-3309
Issue-ID: ONAPARC-805

Change-Id: If19a807fefa574ceb9b90ac1eb84d9642729323d
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
diff --git a/kubernetes/cli/.helmignore b/archive/cli/.helmignore
similarity index 100%
rename from kubernetes/cli/.helmignore
rename to archive/cli/.helmignore
diff --git a/kubernetes/cli/Chart.yaml b/archive/cli/Chart.yaml
similarity index 100%
rename from kubernetes/cli/Chart.yaml
rename to archive/cli/Chart.yaml
diff --git a/kubernetes/cli/resources/configuration/lighttpd.conf b/archive/cli/resources/configuration/lighttpd.conf
similarity index 100%
rename from kubernetes/cli/resources/configuration/lighttpd.conf
rename to archive/cli/resources/configuration/lighttpd.conf
diff --git a/kubernetes/cli/templates/configmap.yaml b/archive/cli/templates/configmap.yaml
similarity index 100%
rename from kubernetes/cli/templates/configmap.yaml
rename to archive/cli/templates/configmap.yaml
diff --git a/kubernetes/cli/templates/deployment.yaml b/archive/cli/templates/deployment.yaml
similarity index 100%
rename from kubernetes/cli/templates/deployment.yaml
rename to archive/cli/templates/deployment.yaml
diff --git a/kubernetes/cli/templates/ingress.yaml b/archive/cli/templates/ingress.yaml
similarity index 100%
rename from kubernetes/cli/templates/ingress.yaml
rename to archive/cli/templates/ingress.yaml
diff --git a/kubernetes/cli/templates/service.yaml b/archive/cli/templates/service.yaml
similarity index 100%
rename from kubernetes/cli/templates/service.yaml
rename to archive/cli/templates/service.yaml
diff --git a/kubernetes/cli/values.yaml b/archive/cli/values.yaml
similarity index 100%
rename from kubernetes/cli/values.yaml
rename to archive/cli/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/certificates.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/certificates.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/certificates.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/certificates.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/ingress.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/ingress.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/ingress.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/ingress.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/service.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml b/archive/dcaegen2-services/components/dcae-datafile-collector/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
rename to archive/dcaegen2-services/components/dcae-datafile-collector/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/service.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml b/archive/dcaegen2-services/components/dcae-heartbeat/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
rename to archive/dcaegen2-services/components/dcae-heartbeat/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/service.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml b/archive/dcaegen2-services/components/dcae-kpi-ms/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
rename to archive/dcaegen2-services/components/dcae-kpi-ms/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/service.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml b/archive/dcaegen2-services/components/dcae-pm-mapper/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
rename to archive/dcaegen2-services/components/dcae-pm-mapper/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml b/archive/dcaegen2-services/components/dcae-pmsh/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-pmsh/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-pmsh/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-pmsh/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-pmsh/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/templates/service.yaml b/archive/dcaegen2-services/components/dcae-pmsh/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml b/archive/dcaegen2-services/components/dcae-pmsh/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
rename to archive/dcaegen2-services/components/dcae-pmsh/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/ingress.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/ingress.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/ingress.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/ingress.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/service.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml b/archive/dcaegen2-services/components/dcae-restconf-collector/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
rename to archive/dcaegen2-services/components/dcae-restconf-collector/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/service.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml b/archive/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
rename to archive/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/service.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml b/archive/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
rename to archive/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml b/archive/dcaegen2-services/components/dcae-son-handler/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-son-handler/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-son-handler/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-son-handler/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-son-handler/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/templates/service.yaml b/archive/dcaegen2-services/components/dcae-son-handler/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml b/archive/dcaegen2-services/components/dcae-son-handler/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
rename to archive/dcaegen2-services/components/dcae-son-handler/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/service.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml b/archive/dcaegen2-services/components/dcae-tcagen2/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
rename to archive/dcaegen2-services/components/dcae-tcagen2/values.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/authorizationpolicy.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/authorizationpolicy.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/templates/authorizationpolicy.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/configmap.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/configmap.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/templates/configmap.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/deployment.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/deployment.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/secret.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/templates/secret.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/secret.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/templates/secret.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/service.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/templates/service.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/templates/service.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/templates/service.yaml
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml b/archive/dcaegen2-services/components/dcae-ves-mapper/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
rename to archive/dcaegen2-services/components/dcae-ves-mapper/values.yaml
diff --git a/kubernetes/dmaap/.helmignore b/archive/dmaap/.helmignore
similarity index 100%
rename from kubernetes/dmaap/.helmignore
rename to archive/dmaap/.helmignore
diff --git a/kubernetes/dmaap/Chart.yaml b/archive/dmaap/Chart.yaml
similarity index 100%
rename from kubernetes/dmaap/Chart.yaml
rename to archive/dmaap/Chart.yaml
diff --git a/kubernetes/dmaap/Makefile b/archive/dmaap/Makefile
similarity index 100%
rename from kubernetes/dmaap/Makefile
rename to archive/dmaap/Makefile
diff --git a/kubernetes/dmaap/README.md b/archive/dmaap/README.md
similarity index 100%
rename from kubernetes/dmaap/README.md
rename to archive/dmaap/README.md
diff --git a/kubernetes/dmaap/components/Makefile b/archive/dmaap/components/Makefile
similarity index 100%
rename from kubernetes/dmaap/components/Makefile
rename to archive/dmaap/components/Makefile
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/.helmignore b/archive/dmaap/components/dmaap-dr-node/.helmignore
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/.helmignore
rename to archive/dmaap/components/dmaap-dr-node/.helmignore
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml b/archive/dmaap/components/dmaap-dr-node/Chart.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
rename to archive/dmaap/components/dmaap-dr-node/Chart.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/logback.xml b/archive/dmaap/components/dmaap-dr-node/resources/config/logback.xml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/resources/config/logback.xml
rename to archive/dmaap/components/dmaap-dr-node/resources/config/logback.xml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties b/archive/dmaap/components/dmaap-dr-node/resources/config/node.properties
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/resources/config/node.properties
rename to archive/dmaap/components/dmaap-dr-node/resources/config/node.properties
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/configmap.yaml b/archive/dmaap/components/dmaap-dr-node/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/configmap.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/configmap.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/ingress.yaml b/archive/dmaap/components/dmaap-dr-node/templates/ingress.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/ingress.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/ingress.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/pv-event.yaml b/archive/dmaap/components/dmaap-dr-node/templates/pv-event.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/pv-event.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/pv-event.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/pv-spool.yaml b/archive/dmaap/components/dmaap-dr-node/templates/pv-spool.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/pv-spool.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/pv-spool.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml b/archive/dmaap/components/dmaap-dr-node/templates/service.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/service.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml b/archive/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
rename to archive/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/archive/dmaap/components/dmaap-dr-node/values.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-node/values.yaml
rename to archive/dmaap/components/dmaap-dr-node/values.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/.helmignore b/archive/dmaap/components/dmaap-dr-prov/.helmignore
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/.helmignore
rename to archive/dmaap/components/dmaap-dr-prov/.helmignore
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml b/archive/dmaap/components/dmaap-dr-prov/Chart.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
rename to archive/dmaap/components/dmaap-dr-prov/Chart.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/logback.xml b/archive/dmaap/components/dmaap-dr-prov/resources/config/logback.xml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/resources/config/logback.xml
rename to archive/dmaap/components/dmaap-dr-prov/resources/config/logback.xml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties b/archive/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
rename to archive/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/configmap.yaml b/archive/dmaap/components/dmaap-dr-prov/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/templates/configmap.yaml
rename to archive/dmaap/components/dmaap-dr-prov/templates/configmap.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml b/archive/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
rename to archive/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/ingress.yaml b/archive/dmaap/components/dmaap-dr-prov/templates/ingress.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/templates/ingress.yaml
rename to archive/dmaap/components/dmaap-dr-prov/templates/ingress.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/secret.yaml b/archive/dmaap/components/dmaap-dr-prov/templates/secret.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/templates/secret.yaml
rename to archive/dmaap/components/dmaap-dr-prov/templates/secret.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/service.yaml b/archive/dmaap/components/dmaap-dr-prov/templates/service.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/templates/service.yaml
rename to archive/dmaap/components/dmaap-dr-prov/templates/service.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/archive/dmaap/components/dmaap-dr-prov/values.yaml
similarity index 100%
rename from kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
rename to archive/dmaap/components/dmaap-dr-prov/values.yaml
diff --git a/kubernetes/dmaap/components/message-router/.helmignore b/archive/dmaap/components/message-router/.helmignore
similarity index 100%
rename from kubernetes/dmaap/components/message-router/.helmignore
rename to archive/dmaap/components/message-router/.helmignore
diff --git a/kubernetes/dmaap/components/message-router/Chart.yaml b/archive/dmaap/components/message-router/Chart.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/Chart.yaml
rename to archive/dmaap/components/message-router/Chart.yaml
diff --git a/kubernetes/dmaap/components/message-router/Makefile b/archive/dmaap/components/message-router/Makefile
similarity index 100%
rename from kubernetes/dmaap/components/message-router/Makefile
rename to archive/dmaap/components/message-router/Makefile
diff --git a/kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties b/archive/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
similarity index 100%
rename from kubernetes/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
rename to archive/dmaap/components/message-router/resources/config/dmaap/MsgRtrApi.properties
diff --git a/kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml b/archive/dmaap/components/message-router/resources/config/dmaap/logback.xml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/resources/config/dmaap/logback.xml
rename to archive/dmaap/components/message-router/resources/config/dmaap/logback.xml
diff --git a/kubernetes/dmaap/components/message-router/templates/configmap.yaml b/archive/dmaap/components/message-router/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/templates/configmap.yaml
rename to archive/dmaap/components/message-router/templates/configmap.yaml
diff --git a/kubernetes/dmaap/components/message-router/templates/ingress.yaml b/archive/dmaap/components/message-router/templates/ingress.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/templates/ingress.yaml
rename to archive/dmaap/components/message-router/templates/ingress.yaml
diff --git a/kubernetes/dmaap/components/message-router/templates/service.yaml b/archive/dmaap/components/message-router/templates/service.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/templates/service.yaml
rename to archive/dmaap/components/message-router/templates/service.yaml
diff --git a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml b/archive/dmaap/components/message-router/templates/statefulset.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/templates/statefulset.yaml
rename to archive/dmaap/components/message-router/templates/statefulset.yaml
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/archive/dmaap/components/message-router/values.yaml
similarity index 100%
rename from kubernetes/dmaap/components/message-router/values.yaml
rename to archive/dmaap/components/message-router/values.yaml
diff --git a/kubernetes/dmaap/values.yaml b/archive/dmaap/values.yaml
similarity index 100%
rename from kubernetes/dmaap/values.yaml
rename to archive/dmaap/values.yaml
diff --git a/kubernetes/holmes/.helmignore b/archive/holmes/.helmignore
similarity index 100%
rename from kubernetes/holmes/.helmignore
rename to archive/holmes/.helmignore
diff --git a/kubernetes/holmes/Chart.yaml b/archive/holmes/Chart.yaml
similarity index 100%
rename from kubernetes/holmes/Chart.yaml
rename to archive/holmes/Chart.yaml
diff --git a/kubernetes/holmes/Makefile b/archive/holmes/Makefile
similarity index 100%
rename from kubernetes/holmes/Makefile
rename to archive/holmes/Makefile
diff --git a/kubernetes/holmes/components/Makefile b/archive/holmes/components/Makefile
similarity index 100%
rename from kubernetes/holmes/components/Makefile
rename to archive/holmes/components/Makefile
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/.helmignore b/archive/holmes/components/holmes-engine-mgmt/.helmignore
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/.helmignore
rename to archive/holmes/components/holmes-engine-mgmt/.helmignore
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml b/archive/holmes/components/holmes-engine-mgmt/Chart.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
rename to archive/holmes/components/holmes-engine-mgmt/Chart.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/resources/config/application.yaml b/archive/holmes/components/holmes-engine-mgmt/resources/config/application.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/resources/config/application.yaml
rename to archive/holmes/components/holmes-engine-mgmt/resources/config/application.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/resources/config/cfy.json b/archive/holmes/components/holmes-engine-mgmt/resources/config/cfy.json
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/resources/config/cfy.json
rename to archive/holmes/components/holmes-engine-mgmt/resources/config/cfy.json
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/resources/config/engine-d.yml b/archive/holmes/components/holmes-engine-mgmt/resources/config/engine-d.yml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/resources/config/engine-d.yml
rename to archive/holmes/components/holmes-engine-mgmt/resources/config/engine-d.yml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/resources/config/onap-holmes_engine-createobj.sql b/archive/holmes/components/holmes-engine-mgmt/resources/config/onap-holmes_engine-createobj.sql
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/resources/config/onap-holmes_engine-createobj.sql
rename to archive/holmes/components/holmes-engine-mgmt/resources/config/onap-holmes_engine-createobj.sql
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/configmap.yaml b/archive/holmes/components/holmes-engine-mgmt/templates/configmap.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/templates/configmap.yaml
rename to archive/holmes/components/holmes-engine-mgmt/templates/configmap.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml b/archive/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
rename to archive/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/secret.yaml b/archive/holmes/components/holmes-engine-mgmt/templates/secret.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/templates/secret.yaml
rename to archive/holmes/components/holmes-engine-mgmt/templates/secret.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/service.yaml b/archive/holmes/components/holmes-engine-mgmt/templates/service.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/templates/service.yaml
rename to archive/holmes/components/holmes-engine-mgmt/templates/service.yaml
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/archive/holmes/components/holmes-engine-mgmt/values.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
rename to archive/holmes/components/holmes-engine-mgmt/values.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/.helmignore b/archive/holmes/components/holmes-rule-mgmt/.helmignore
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/.helmignore
rename to archive/holmes/components/holmes-rule-mgmt/.helmignore
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml b/archive/holmes/components/holmes-rule-mgmt/Chart.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
rename to archive/holmes/components/holmes-rule-mgmt/Chart.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/config/application.yaml b/archive/holmes/components/holmes-rule-mgmt/resources/config/application.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/resources/config/application.yaml
rename to archive/holmes/components/holmes-rule-mgmt/resources/config/application.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/config/onap-holmes_rulemgt-createobj.sql b/archive/holmes/components/holmes-rule-mgmt/resources/config/onap-holmes_rulemgt-createobj.sql
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/resources/config/onap-holmes_rulemgt-createobj.sql
rename to archive/holmes/components/holmes-rule-mgmt/resources/config/onap-holmes_rulemgt-createobj.sql
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/config/rulemgt.yml b/archive/holmes/components/holmes-rule-mgmt/resources/config/rulemgt.yml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/resources/config/rulemgt.yml
rename to archive/holmes/components/holmes-rule-mgmt/resources/config/rulemgt.yml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl b/archive/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
rename to archive/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/index.json b/archive/holmes/components/holmes-rule-mgmt/resources/rules/index.json
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/index.json
rename to archive/holmes/components/holmes-rule-mgmt/resources/rules/index.json
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/configmap.yaml b/archive/holmes/components/holmes-rule-mgmt/templates/configmap.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/templates/configmap.yaml
rename to archive/holmes/components/holmes-rule-mgmt/templates/configmap.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/archive/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
rename to archive/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/ingress.yaml b/archive/holmes/components/holmes-rule-mgmt/templates/ingress.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/templates/ingress.yaml
rename to archive/holmes/components/holmes-rule-mgmt/templates/ingress.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/secret.yaml b/archive/holmes/components/holmes-rule-mgmt/templates/secret.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/templates/secret.yaml
rename to archive/holmes/components/holmes-rule-mgmt/templates/secret.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/service.yaml b/archive/holmes/components/holmes-rule-mgmt/templates/service.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/templates/service.yaml
rename to archive/holmes/components/holmes-rule-mgmt/templates/service.yaml
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/archive/holmes/components/holmes-rule-mgmt/values.yaml
similarity index 100%
rename from kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
rename to archive/holmes/components/holmes-rule-mgmt/values.yaml
diff --git a/kubernetes/holmes/templates/secrets.yaml b/archive/holmes/templates/secrets.yaml
similarity index 100%
rename from kubernetes/holmes/templates/secrets.yaml
rename to archive/holmes/templates/secrets.yaml
diff --git a/kubernetes/holmes/values.yaml b/archive/holmes/values.yaml
similarity index 100%
rename from kubernetes/holmes/values.yaml
rename to archive/holmes/values.yaml
diff --git a/kubernetes/modeling/.helmignore b/archive/modeling/.helmignore
similarity index 100%
rename from kubernetes/modeling/.helmignore
rename to archive/modeling/.helmignore
diff --git a/kubernetes/modeling/Chart.yaml b/archive/modeling/Chart.yaml
similarity index 100%
rename from kubernetes/modeling/Chart.yaml
rename to archive/modeling/Chart.yaml
diff --git a/kubernetes/modeling/Makefile b/archive/modeling/Makefile
similarity index 100%
rename from kubernetes/modeling/Makefile
rename to archive/modeling/Makefile
diff --git a/kubernetes/modeling/components/Makefile b/archive/modeling/components/Makefile
similarity index 100%
rename from kubernetes/modeling/components/Makefile
rename to archive/modeling/components/Makefile
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/.helmignore b/archive/modeling/components/modeling-etsicatalog/.helmignore
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/.helmignore
rename to archive/modeling/components/modeling-etsicatalog/.helmignore
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml b/archive/modeling/components/modeling-etsicatalog/Chart.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
rename to archive/modeling/components/modeling-etsicatalog/Chart.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/filebeat/filebeat.yml b/archive/modeling/components/modeling-etsicatalog/resources/config/log/filebeat/filebeat.yml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/filebeat/filebeat.yml
rename to archive/modeling/components/modeling-etsicatalog/resources/config/log/filebeat/filebeat.yml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/server/log.yml b/archive/modeling/components/modeling-etsicatalog/resources/config/log/server/log.yml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/resources/config/log/server/log.yml
rename to archive/modeling/components/modeling-etsicatalog/resources/config/log/server/log.yml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/configmap.yaml b/archive/modeling/components/modeling-etsicatalog/templates/configmap.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/configmap.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/configmap.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml b/archive/modeling/components/modeling-etsicatalog/templates/deployment.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/deployment.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/pv.yaml b/archive/modeling/components/modeling-etsicatalog/templates/pv.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/pv.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/pv.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/pvc.yaml b/archive/modeling/components/modeling-etsicatalog/templates/pvc.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/pvc.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/pvc.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/secrets.yaml b/archive/modeling/components/modeling-etsicatalog/templates/secrets.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/secrets.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/secrets.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml b/archive/modeling/components/modeling-etsicatalog/templates/service.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml
rename to archive/modeling/components/modeling-etsicatalog/templates/service.yaml
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/archive/modeling/components/modeling-etsicatalog/values.yaml
similarity index 100%
rename from kubernetes/modeling/components/modeling-etsicatalog/values.yaml
rename to archive/modeling/components/modeling-etsicatalog/values.yaml
diff --git a/kubernetes/modeling/values.yaml b/archive/modeling/values.yaml
similarity index 100%
rename from kubernetes/modeling/values.yaml
rename to archive/modeling/values.yaml
diff --git a/kubernetes/msb/.helmignore b/archive/msb/.helmignore
similarity index 100%
rename from kubernetes/msb/.helmignore
rename to archive/msb/.helmignore
diff --git a/kubernetes/msb/Chart.yaml b/archive/msb/Chart.yaml
similarity index 100%
rename from kubernetes/msb/Chart.yaml
rename to archive/msb/Chart.yaml
diff --git a/kubernetes/msb/Makefile b/archive/msb/Makefile
similarity index 100%
rename from kubernetes/msb/Makefile
rename to archive/msb/Makefile
diff --git a/kubernetes/msb/components/Makefile b/archive/msb/components/Makefile
similarity index 100%
rename from kubernetes/msb/components/Makefile
rename to archive/msb/components/Makefile
diff --git a/kubernetes/msb/components/kube2msb/.helmignore b/archive/msb/components/kube2msb/.helmignore
similarity index 100%
rename from kubernetes/msb/components/kube2msb/.helmignore
rename to archive/msb/components/kube2msb/.helmignore
diff --git a/kubernetes/msb/components/kube2msb/Chart.yaml b/archive/msb/components/kube2msb/Chart.yaml
similarity index 100%
rename from kubernetes/msb/components/kube2msb/Chart.yaml
rename to archive/msb/components/kube2msb/Chart.yaml
diff --git a/kubernetes/msb/components/kube2msb/templates/deployment.yaml b/archive/msb/components/kube2msb/templates/deployment.yaml
similarity index 100%
rename from kubernetes/msb/components/kube2msb/templates/deployment.yaml
rename to archive/msb/components/kube2msb/templates/deployment.yaml
diff --git a/kubernetes/msb/components/kube2msb/values.yaml b/archive/msb/components/kube2msb/values.yaml
similarity index 100%
rename from kubernetes/msb/components/kube2msb/values.yaml
rename to archive/msb/components/kube2msb/values.yaml
diff --git a/kubernetes/msb/components/msb-consul/.helmignore b/archive/msb/components/msb-consul/.helmignore
similarity index 100%
rename from kubernetes/msb/components/msb-consul/.helmignore
rename to archive/msb/components/msb-consul/.helmignore
diff --git a/kubernetes/msb/components/msb-consul/Chart.yaml b/archive/msb/components/msb-consul/Chart.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/Chart.yaml
rename to archive/msb/components/msb-consul/Chart.yaml
diff --git a/kubernetes/msb/components/msb-consul/resources/docker-entrypoint.sh b/archive/msb/components/msb-consul/resources/docker-entrypoint.sh
similarity index 100%
rename from kubernetes/msb/components/msb-consul/resources/docker-entrypoint.sh
rename to archive/msb/components/msb-consul/resources/docker-entrypoint.sh
diff --git a/kubernetes/msb/components/msb-consul/templates/NOTES.txt b/archive/msb/components/msb-consul/templates/NOTES.txt
similarity index 100%
rename from kubernetes/msb/components/msb-consul/templates/NOTES.txt
rename to archive/msb/components/msb-consul/templates/NOTES.txt
diff --git a/kubernetes/msb/components/msb-consul/templates/configmap.yaml b/archive/msb/components/msb-consul/templates/configmap.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/templates/configmap.yaml
rename to archive/msb/components/msb-consul/templates/configmap.yaml
diff --git a/kubernetes/msb/components/msb-consul/templates/deployment.yaml b/archive/msb/components/msb-consul/templates/deployment.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/templates/deployment.yaml
rename to archive/msb/components/msb-consul/templates/deployment.yaml
diff --git a/kubernetes/msb/components/msb-consul/templates/ingress.yaml b/archive/msb/components/msb-consul/templates/ingress.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/templates/ingress.yaml
rename to archive/msb/components/msb-consul/templates/ingress.yaml
diff --git a/kubernetes/msb/components/msb-consul/templates/service.yaml b/archive/msb/components/msb-consul/templates/service.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/templates/service.yaml
rename to archive/msb/components/msb-consul/templates/service.yaml
diff --git a/kubernetes/msb/components/msb-consul/values.yaml b/archive/msb/components/msb-consul/values.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-consul/values.yaml
rename to archive/msb/components/msb-consul/values.yaml
diff --git a/kubernetes/msb/components/msb-discovery/.helmignore b/archive/msb/components/msb-discovery/.helmignore
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/.helmignore
rename to archive/msb/components/msb-discovery/.helmignore
diff --git a/kubernetes/msb/components/msb-discovery/Chart.yaml b/archive/msb/components/msb-discovery/Chart.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/Chart.yaml
rename to archive/msb/components/msb-discovery/Chart.yaml
diff --git a/kubernetes/msb/components/msb-discovery/resources/config/logback.xml b/archive/msb/components/msb-discovery/resources/config/logback.xml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/resources/config/logback.xml
rename to archive/msb/components/msb-discovery/resources/config/logback.xml
diff --git a/kubernetes/msb/components/msb-discovery/templates/NOTES.txt b/archive/msb/components/msb-discovery/templates/NOTES.txt
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/templates/NOTES.txt
rename to archive/msb/components/msb-discovery/templates/NOTES.txt
diff --git a/kubernetes/msb/components/msb-discovery/templates/configmap.yaml b/archive/msb/components/msb-discovery/templates/configmap.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/templates/configmap.yaml
rename to archive/msb/components/msb-discovery/templates/configmap.yaml
diff --git a/kubernetes/msb/components/msb-discovery/templates/deployment.yaml b/archive/msb/components/msb-discovery/templates/deployment.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/templates/deployment.yaml
rename to archive/msb/components/msb-discovery/templates/deployment.yaml
diff --git a/kubernetes/msb/components/msb-discovery/templates/ingress.yaml b/archive/msb/components/msb-discovery/templates/ingress.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/templates/ingress.yaml
rename to archive/msb/components/msb-discovery/templates/ingress.yaml
diff --git a/kubernetes/msb/components/msb-discovery/templates/service.yaml b/archive/msb/components/msb-discovery/templates/service.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/templates/service.yaml
rename to archive/msb/components/msb-discovery/templates/service.yaml
diff --git a/kubernetes/msb/components/msb-discovery/values.yaml b/archive/msb/components/msb-discovery/values.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-discovery/values.yaml
rename to archive/msb/components/msb-discovery/values.yaml
diff --git a/kubernetes/msb/components/msb-eag/.helmignore b/archive/msb/components/msb-eag/.helmignore
similarity index 100%
rename from kubernetes/msb/components/msb-eag/.helmignore
rename to archive/msb/components/msb-eag/.helmignore
diff --git a/kubernetes/msb/components/msb-eag/Chart.yaml b/archive/msb/components/msb-eag/Chart.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/Chart.yaml
rename to archive/msb/components/msb-eag/Chart.yaml
diff --git a/kubernetes/msb/components/msb-eag/resources/config/logback.xml b/archive/msb/components/msb-eag/resources/config/logback.xml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/resources/config/logback.xml
rename to archive/msb/components/msb-eag/resources/config/logback.xml
diff --git a/kubernetes/msb/components/msb-eag/templates/NOTES.txt b/archive/msb/components/msb-eag/templates/NOTES.txt
similarity index 100%
rename from kubernetes/msb/components/msb-eag/templates/NOTES.txt
rename to archive/msb/components/msb-eag/templates/NOTES.txt
diff --git a/kubernetes/msb/components/msb-eag/templates/configmap.yaml b/archive/msb/components/msb-eag/templates/configmap.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/templates/configmap.yaml
rename to archive/msb/components/msb-eag/templates/configmap.yaml
diff --git a/kubernetes/msb/components/msb-eag/templates/deployment.yaml b/archive/msb/components/msb-eag/templates/deployment.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/templates/deployment.yaml
rename to archive/msb/components/msb-eag/templates/deployment.yaml
diff --git a/kubernetes/msb/components/msb-eag/templates/ingress.yaml b/archive/msb/components/msb-eag/templates/ingress.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/templates/ingress.yaml
rename to archive/msb/components/msb-eag/templates/ingress.yaml
diff --git a/kubernetes/msb/components/msb-eag/templates/service.yaml b/archive/msb/components/msb-eag/templates/service.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/templates/service.yaml
rename to archive/msb/components/msb-eag/templates/service.yaml
diff --git a/kubernetes/msb/components/msb-eag/values.yaml b/archive/msb/components/msb-eag/values.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-eag/values.yaml
rename to archive/msb/components/msb-eag/values.yaml
diff --git a/kubernetes/msb/components/msb-iag/.helmignore b/archive/msb/components/msb-iag/.helmignore
similarity index 100%
rename from kubernetes/msb/components/msb-iag/.helmignore
rename to archive/msb/components/msb-iag/.helmignore
diff --git a/kubernetes/msb/components/msb-iag/Chart.yaml b/archive/msb/components/msb-iag/Chart.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/Chart.yaml
rename to archive/msb/components/msb-iag/Chart.yaml
diff --git a/kubernetes/msb/components/msb-iag/resources/config/logback.xml b/archive/msb/components/msb-iag/resources/config/logback.xml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/resources/config/logback.xml
rename to archive/msb/components/msb-iag/resources/config/logback.xml
diff --git a/kubernetes/msb/components/msb-iag/templates/NOTES.txt b/archive/msb/components/msb-iag/templates/NOTES.txt
similarity index 100%
rename from kubernetes/msb/components/msb-iag/templates/NOTES.txt
rename to archive/msb/components/msb-iag/templates/NOTES.txt
diff --git a/kubernetes/msb/components/msb-iag/templates/configmap.yaml b/archive/msb/components/msb-iag/templates/configmap.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/templates/configmap.yaml
rename to archive/msb/components/msb-iag/templates/configmap.yaml
diff --git a/kubernetes/msb/components/msb-iag/templates/deployment.yaml b/archive/msb/components/msb-iag/templates/deployment.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/templates/deployment.yaml
rename to archive/msb/components/msb-iag/templates/deployment.yaml
diff --git a/kubernetes/msb/components/msb-iag/templates/ingress.yaml b/archive/msb/components/msb-iag/templates/ingress.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/templates/ingress.yaml
rename to archive/msb/components/msb-iag/templates/ingress.yaml
diff --git a/kubernetes/msb/components/msb-iag/templates/service.yaml b/archive/msb/components/msb-iag/templates/service.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/templates/service.yaml
rename to archive/msb/components/msb-iag/templates/service.yaml
diff --git a/kubernetes/msb/components/msb-iag/values.yaml b/archive/msb/components/msb-iag/values.yaml
similarity index 100%
rename from kubernetes/msb/components/msb-iag/values.yaml
rename to archive/msb/components/msb-iag/values.yaml
diff --git a/kubernetes/msb/resources/config/log/discovery/logback.xml b/archive/msb/resources/config/log/discovery/logback.xml
similarity index 100%
rename from kubernetes/msb/resources/config/log/discovery/logback.xml
rename to archive/msb/resources/config/log/discovery/logback.xml
diff --git a/kubernetes/msb/resources/config/log/eag/logback.xml b/archive/msb/resources/config/log/eag/logback.xml
similarity index 100%
rename from kubernetes/msb/resources/config/log/eag/logback.xml
rename to archive/msb/resources/config/log/eag/logback.xml
diff --git a/kubernetes/msb/resources/config/log/filebeat/filebeat.yml b/archive/msb/resources/config/log/filebeat/filebeat.yml
similarity index 100%
rename from kubernetes/msb/resources/config/log/filebeat/filebeat.yml
rename to archive/msb/resources/config/log/filebeat/filebeat.yml
diff --git a/kubernetes/msb/resources/config/log/iag/logback.xml b/archive/msb/resources/config/log/iag/logback.xml
similarity index 100%
rename from kubernetes/msb/resources/config/log/iag/logback.xml
rename to archive/msb/resources/config/log/iag/logback.xml
diff --git a/kubernetes/msb/templates/configmap.yaml b/archive/msb/templates/configmap.yaml
similarity index 100%
rename from kubernetes/msb/templates/configmap.yaml
rename to archive/msb/templates/configmap.yaml
diff --git a/kubernetes/msb/templates/serviceaccount.yaml b/archive/msb/templates/serviceaccount.yaml
similarity index 100%
rename from kubernetes/msb/templates/serviceaccount.yaml
rename to archive/msb/templates/serviceaccount.yaml
diff --git a/kubernetes/msb/values.yaml b/archive/msb/values.yaml
similarity index 100%
rename from kubernetes/msb/values.yaml
rename to archive/msb/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/.helmignore b/archive/multicloud/components/multicloud-pike/.helmignore
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/.helmignore
rename to archive/multicloud/components/multicloud-pike/.helmignore
diff --git a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml b/archive/multicloud/components/multicloud-pike/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/Chart.yaml
rename to archive/multicloud/components/multicloud-pike/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml b/archive/multicloud/components/multicloud-pike/resources/config/log/log.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml
rename to archive/multicloud/components/multicloud-pike/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/NOTES.txt b/archive/multicloud/components/multicloud-pike/templates/NOTES.txt
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/templates/NOTES.txt
rename to archive/multicloud/components/multicloud-pike/templates/NOTES.txt
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/configmap.yaml b/archive/multicloud/components/multicloud-pike/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-pike/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml b/archive/multicloud/components/multicloud-pike/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-pike/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/ingress.yaml b/archive/multicloud/components/multicloud-pike/templates/ingress.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/templates/ingress.yaml
rename to archive/multicloud/components/multicloud-pike/templates/ingress.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/service.yaml b/archive/multicloud/components/multicloud-pike/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/templates/service.yaml
rename to archive/multicloud/components/multicloud-pike/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/values.yaml b/archive/multicloud/components/multicloud-pike/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-pike/values.yaml
rename to archive/multicloud/components/multicloud-pike/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml b/archive/multicloud/components/multicloud-prometheus/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
rename to archive/multicloud/components/multicloud-prometheus/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml b/archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
rename to archive/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/resources/config/prometheus.yml b/archive/multicloud/components/multicloud-prometheus/resources/config/prometheus.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/resources/config/prometheus.yml
rename to archive/multicloud/components/multicloud-prometheus/resources/config/prometheus.yml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/templates/configmap.yaml b/archive/multicloud/components/multicloud-prometheus/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-prometheus/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/templates/deployment.yaml b/archive/multicloud/components/multicloud-prometheus/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-prometheus/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/templates/pv.yaml b/archive/multicloud/components/multicloud-prometheus/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/templates/pv.yaml
rename to archive/multicloud/components/multicloud-prometheus/templates/pv.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/templates/pvc.yaml b/archive/multicloud/components/multicloud-prometheus/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/templates/pvc.yaml
rename to archive/multicloud/components/multicloud-prometheus/templates/pvc.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/templates/service.yaml b/archive/multicloud/components/multicloud-prometheus/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/templates/service.yaml
rename to archive/multicloud/components/multicloud-prometheus/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/values.yaml b/archive/multicloud/components/multicloud-prometheus/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/values.yaml
rename to archive/multicloud/components/multicloud-prometheus/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/.helmignore b/archive/multicloud/components/multicloud-starlingx/.helmignore
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/.helmignore
rename to archive/multicloud/components/multicloud-starlingx/.helmignore
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml b/archive/multicloud/components/multicloud-starlingx/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
rename to archive/multicloud/components/multicloud-starlingx/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json b/archive/multicloud/components/multicloud-starlingx/resources/config/log/config.json
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json
rename to archive/multicloud/components/multicloud-starlingx/resources/config/log/config.json
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml b/archive/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
rename to archive/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/NOTES.txt b/archive/multicloud/components/multicloud-starlingx/templates/NOTES.txt
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/templates/NOTES.txt
rename to archive/multicloud/components/multicloud-starlingx/templates/NOTES.txt
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/configmap.yaml b/archive/multicloud/components/multicloud-starlingx/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-starlingx/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml b/archive/multicloud/components/multicloud-starlingx/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-starlingx/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/ingress.yaml b/archive/multicloud/components/multicloud-starlingx/templates/ingress.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/templates/ingress.yaml
rename to archive/multicloud/components/multicloud-starlingx/templates/ingress.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/service.yaml b/archive/multicloud/components/multicloud-starlingx/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/templates/service.yaml
rename to archive/multicloud/components/multicloud-starlingx/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml b/archive/multicloud/components/multicloud-starlingx/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-starlingx/values.yaml
rename to archive/multicloud/components/multicloud-starlingx/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/.helmignore b/archive/multicloud/components/multicloud-vio/.helmignore
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/.helmignore
rename to archive/multicloud/components/multicloud-vio/.helmignore
diff --git a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml b/archive/multicloud/components/multicloud-vio/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/Chart.yaml
rename to archive/multicloud/components/multicloud-vio/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/resources/config/log/log.yml b/archive/multicloud/components/multicloud-vio/resources/config/log/log.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/resources/config/log/log.yml
rename to archive/multicloud/components/multicloud-vio/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/NOTES.txt b/archive/multicloud/components/multicloud-vio/templates/NOTES.txt
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/templates/NOTES.txt
rename to archive/multicloud/components/multicloud-vio/templates/NOTES.txt
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/configmap.yaml b/archive/multicloud/components/multicloud-vio/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-vio/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml b/archive/multicloud/components/multicloud-vio/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-vio/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/ingress.yaml b/archive/multicloud/components/multicloud-vio/templates/ingress.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/templates/ingress.yaml
rename to archive/multicloud/components/multicloud-vio/templates/ingress.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/service.yaml b/archive/multicloud/components/multicloud-vio/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/templates/service.yaml
rename to archive/multicloud/components/multicloud-vio/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/values.yaml b/archive/multicloud/components/multicloud-vio/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-vio/values.yaml
rename to archive/multicloud/components/multicloud-vio/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/.helmignore b/archive/multicloud/components/multicloud-windriver/.helmignore
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/.helmignore
rename to archive/multicloud/components/multicloud-windriver/.helmignore
diff --git a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml b/archive/multicloud/components/multicloud-windriver/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
rename to archive/multicloud/components/multicloud-windriver/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json b/archive/multicloud/components/multicloud-windriver/resources/config/log/config.json
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json
rename to archive/multicloud/components/multicloud-windriver/resources/config/log/config.json
diff --git a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml b/archive/multicloud/components/multicloud-windriver/resources/config/log/log.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml
rename to archive/multicloud/components/multicloud-windriver/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/test.txt b/archive/multicloud/components/multicloud-windriver/resources/config/log/test.txt
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/resources/config/log/test.txt
rename to archive/multicloud/components/multicloud-windriver/resources/config/log/test.txt
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/NOTES.txt b/archive/multicloud/components/multicloud-windriver/templates/NOTES.txt
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/NOTES.txt
rename to archive/multicloud/components/multicloud-windriver/templates/NOTES.txt
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/configmap.yaml b/archive/multicloud/components/multicloud-windriver/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/configmap.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml b/archive/multicloud/components/multicloud-windriver/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/ingress.yaml b/archive/multicloud/components/multicloud-windriver/templates/ingress.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/ingress.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/ingress.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/pv.yaml b/archive/multicloud/components/multicloud-windriver/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/pv.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/pv.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/pvc.yaml b/archive/multicloud/components/multicloud-windriver/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/pvc.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/pvc.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml b/archive/multicloud/components/multicloud-windriver/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml
rename to archive/multicloud/components/multicloud-windriver/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/values.yaml b/archive/multicloud/components/multicloud-windriver/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-windriver/values.yaml
rename to archive/multicloud/components/multicloud-windriver/values.yaml
diff --git a/kubernetes/nbi/.helmignore b/archive/nbi/.helmignore
similarity index 100%
rename from kubernetes/nbi/.helmignore
rename to archive/nbi/.helmignore
diff --git a/kubernetes/nbi/Chart.yaml b/archive/nbi/Chart.yaml
similarity index 100%
rename from kubernetes/nbi/Chart.yaml
rename to archive/nbi/Chart.yaml
diff --git a/kubernetes/nbi/README.md b/archive/nbi/README.md
similarity index 100%
rename from kubernetes/nbi/README.md
rename to archive/nbi/README.md
diff --git a/kubernetes/nbi/templates/deployment.yaml b/archive/nbi/templates/deployment.yaml
similarity index 100%
rename from kubernetes/nbi/templates/deployment.yaml
rename to archive/nbi/templates/deployment.yaml
diff --git a/kubernetes/nbi/templates/ingress.yaml b/archive/nbi/templates/ingress.yaml
similarity index 100%
rename from kubernetes/nbi/templates/ingress.yaml
rename to archive/nbi/templates/ingress.yaml
diff --git a/kubernetes/nbi/templates/secret.yaml b/archive/nbi/templates/secret.yaml
similarity index 100%
rename from kubernetes/nbi/templates/secret.yaml
rename to archive/nbi/templates/secret.yaml
diff --git a/kubernetes/nbi/templates/service.yaml b/archive/nbi/templates/service.yaml
similarity index 100%
rename from kubernetes/nbi/templates/service.yaml
rename to archive/nbi/templates/service.yaml
diff --git a/kubernetes/nbi/tests/deployment_test.yaml b/archive/nbi/tests/deployment_test.yaml
similarity index 100%
rename from kubernetes/nbi/tests/deployment_test.yaml
rename to archive/nbi/tests/deployment_test.yaml
diff --git a/kubernetes/nbi/values.yaml b/archive/nbi/values.yaml
similarity index 100%
rename from kubernetes/nbi/values.yaml
rename to archive/nbi/values.yaml
diff --git a/kubernetes/oof/.helmignore b/archive/oof/.helmignore
similarity index 100%
rename from kubernetes/oof/.helmignore
rename to archive/oof/.helmignore
diff --git a/kubernetes/oof/Chart.yaml b/archive/oof/Chart.yaml
similarity index 100%
rename from kubernetes/oof/Chart.yaml
rename to archive/oof/Chart.yaml
diff --git a/kubernetes/oof/Makefile b/archive/oof/Makefile
similarity index 100%
rename from kubernetes/oof/Makefile
rename to archive/oof/Makefile
diff --git a/kubernetes/oof/components/Makefile b/archive/oof/components/Makefile
similarity index 100%
rename from kubernetes/oof/components/Makefile
rename to archive/oof/components/Makefile
diff --git a/kubernetes/oof/components/oof-has/.helmignore b/archive/oof/components/oof-has/.helmignore
similarity index 100%
rename from kubernetes/oof/components/oof-has/.helmignore
rename to archive/oof/components/oof-has/.helmignore
diff --git a/kubernetes/oof/components/oof-has/Chart.yaml b/archive/oof/components/oof-has/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/Chart.yaml
rename to archive/oof/components/oof-has/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/Makefile b/archive/oof/components/oof-has/Makefile
similarity index 100%
rename from kubernetes/oof/components/oof-has/Makefile
rename to archive/oof/components/oof-has/Makefile
diff --git a/kubernetes/oof/components/oof-has/components/Makefile b/archive/oof/components/oof-has/components/Makefile
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/Makefile
rename to archive/oof/components/oof-has/components/Makefile
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml b/archive/oof/components/oof-has/components/oof-has-api/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/NOTES.txt b/archive/oof/components/oof-has/components/oof-has-api/templates/NOTES.txt
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/templates/NOTES.txt
rename to archive/oof/components/oof-has/components/oof-has-api/templates/NOTES.txt
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml b/archive/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/ingress.yaml b/archive/oof/components/oof-has/components/oof-has-api/templates/ingress.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/templates/ingress.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/templates/ingress.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/secret.yaml b/archive/oof/components/oof-has/components/oof-has-api/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/templates/secret.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/service.yaml b/archive/oof/components/oof-has/components/oof-has-api/templates/service.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/templates/service.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/templates/service.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml b/archive/oof/components/oof-has/components/oof-has-api/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
rename to archive/oof/components/oof-has/components/oof-has-api/values.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml b/archive/oof/components/oof-has/components/oof-has-controller/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
rename to archive/oof/components/oof-has/components/oof-has-controller/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml b/archive/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
rename to archive/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/templates/secret.yaml b/archive/oof/components/oof-has/components/oof-has-controller/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-controller/templates/secret.yaml
rename to archive/oof/components/oof-has/components/oof-has-controller/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml b/archive/oof/components/oof-has/components/oof-has-controller/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml
rename to archive/oof/components/oof-has/components/oof-has-controller/values.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml b/archive/oof/components/oof-has/components/oof-has-data/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
rename to archive/oof/components/oof-has/components/oof-has-data/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml b/archive/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml
rename to archive/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/templates/secret.yaml b/archive/oof/components/oof-has/components/oof-has-data/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-data/templates/secret.yaml
rename to archive/oof/components/oof-has/components/oof-has-data/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml b/archive/oof/components/oof-has/components/oof-has-data/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml
rename to archive/oof/components/oof-has/components/oof-has-data/values.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml b/archive/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
rename to archive/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml b/archive/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml
rename to archive/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/secret.yaml b/archive/oof/components/oof-has/components/oof-has-reservation/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/secret.yaml
rename to archive/oof/components/oof-has/components/oof-has-reservation/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml b/archive/oof/components/oof-has/components/oof-has-reservation/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml
rename to archive/oof/components/oof-has/components/oof-has-reservation/values.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml b/archive/oof/components/oof-has/components/oof-has-solver/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
rename to archive/oof/components/oof-has/components/oof-has-solver/Chart.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml b/archive/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml
rename to archive/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/templates/secret.yaml b/archive/oof/components/oof-has/components/oof-has-solver/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-solver/templates/secret.yaml
rename to archive/oof/components/oof-has/components/oof-has-solver/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml b/archive/oof/components/oof-has/components/oof-has-solver/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml
rename to archive/oof/components/oof-has/components/oof-has-solver/values.yaml
diff --git a/kubernetes/oof/components/oof-has/resources/config/conductor.conf b/archive/oof/components/oof-has/resources/config/conductor.conf
similarity index 100%
rename from kubernetes/oof/components/oof-has/resources/config/conductor.conf
rename to archive/oof/components/oof-has/resources/config/conductor.conf
diff --git a/kubernetes/oof/components/oof-has/resources/config/healthy.sh b/archive/oof/components/oof-has/resources/config/healthy.sh
similarity index 100%
rename from kubernetes/oof/components/oof-has/resources/config/healthy.sh
rename to archive/oof/components/oof-has/resources/config/healthy.sh
diff --git a/kubernetes/oof/components/oof-has/resources/config/log.conf b/archive/oof/components/oof-has/resources/config/log.conf
similarity index 100%
rename from kubernetes/oof/components/oof-has/resources/config/log.conf
rename to archive/oof/components/oof-has/resources/config/log.conf
diff --git a/kubernetes/oof/components/oof-has/resources/config/log/filebeat.yml b/archive/oof/components/oof-has/resources/config/log/filebeat.yml
similarity index 100%
rename from kubernetes/oof/components/oof-has/resources/config/log/filebeat.yml
rename to archive/oof/components/oof-has/resources/config/log/filebeat.yml
diff --git a/kubernetes/oof/components/oof-has/resources/config/nginx.conf b/archive/oof/components/oof-has/resources/config/nginx.conf
similarity index 100%
rename from kubernetes/oof/components/oof-has/resources/config/nginx.conf
rename to archive/oof/components/oof-has/resources/config/nginx.conf
diff --git a/kubernetes/oof/components/oof-has/templates/configmap.yaml b/archive/oof/components/oof-has/templates/configmap.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/templates/configmap.yaml
rename to archive/oof/components/oof-has/templates/configmap.yaml
diff --git a/kubernetes/oof/components/oof-has/templates/secret.yaml b/archive/oof/components/oof-has/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/templates/secret.yaml
rename to archive/oof/components/oof-has/templates/secret.yaml
diff --git a/kubernetes/oof/components/oof-has/values.yaml b/archive/oof/components/oof-has/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-has/values.yaml
rename to archive/oof/components/oof-has/values.yaml
diff --git a/kubernetes/oof/components/oof-templates/Chart.yaml b/archive/oof/components/oof-templates/Chart.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-templates/Chart.yaml
rename to archive/oof/components/oof-templates/Chart.yaml
diff --git a/kubernetes/oof/components/oof-templates/templates/_secret.tpl b/archive/oof/components/oof-templates/templates/_secret.tpl
similarity index 100%
rename from kubernetes/oof/components/oof-templates/templates/_secret.tpl
rename to archive/oof/components/oof-templates/templates/_secret.tpl
diff --git a/kubernetes/oof/components/oof-templates/values.yaml b/archive/oof/components/oof-templates/values.yaml
similarity index 100%
rename from kubernetes/oof/components/oof-templates/values.yaml
rename to archive/oof/components/oof-templates/values.yaml
diff --git a/kubernetes/oof/resources/config/conf/common_config.yaml b/archive/oof/resources/config/conf/common_config.yaml
similarity index 100%
rename from kubernetes/oof/resources/config/conf/common_config.yaml
rename to archive/oof/resources/config/conf/common_config.yaml
diff --git a/kubernetes/oof/resources/config/conf/log.yml b/archive/oof/resources/config/conf/log.yml
similarity index 100%
rename from kubernetes/oof/resources/config/conf/log.yml
rename to archive/oof/resources/config/conf/log.yml
diff --git a/kubernetes/oof/resources/config/conf/osdf_config.yaml b/archive/oof/resources/config/conf/osdf_config.yaml
similarity index 100%
rename from kubernetes/oof/resources/config/conf/osdf_config.yaml
rename to archive/oof/resources/config/conf/osdf_config.yaml
diff --git a/kubernetes/oof/resources/config/conf/slicing_config.yaml b/archive/oof/resources/config/conf/slicing_config.yaml
similarity index 100%
rename from kubernetes/oof/resources/config/conf/slicing_config.yaml
rename to archive/oof/resources/config/conf/slicing_config.yaml
diff --git a/kubernetes/oof/templates/NOTES.txt b/archive/oof/templates/NOTES.txt
similarity index 100%
rename from kubernetes/oof/templates/NOTES.txt
rename to archive/oof/templates/NOTES.txt
diff --git a/kubernetes/oof/templates/configmap.yaml b/archive/oof/templates/configmap.yaml
similarity index 100%
rename from kubernetes/oof/templates/configmap.yaml
rename to archive/oof/templates/configmap.yaml
diff --git a/kubernetes/oof/templates/deployment.yaml b/archive/oof/templates/deployment.yaml
similarity index 100%
rename from kubernetes/oof/templates/deployment.yaml
rename to archive/oof/templates/deployment.yaml
diff --git a/kubernetes/oof/templates/ingress.yaml b/archive/oof/templates/ingress.yaml
similarity index 100%
rename from kubernetes/oof/templates/ingress.yaml
rename to archive/oof/templates/ingress.yaml
diff --git a/kubernetes/oof/templates/secret.yaml b/archive/oof/templates/secret.yaml
similarity index 100%
rename from kubernetes/oof/templates/secret.yaml
rename to archive/oof/templates/secret.yaml
diff --git a/kubernetes/oof/templates/service.yaml b/archive/oof/templates/service.yaml
similarity index 100%
rename from kubernetes/oof/templates/service.yaml
rename to archive/oof/templates/service.yaml
diff --git a/kubernetes/oof/values.yaml b/archive/oof/values.yaml
similarity index 100%
rename from kubernetes/oof/values.yaml
rename to archive/oof/values.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml b/archive/sdnc/components/dmaap-listener/Chart.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/Chart.yaml
rename to archive/sdnc/components/dmaap-listener/Chart.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/aai.properties b/archive/sdnc/components/dmaap-listener/resources/config/aai.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/aai.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/aai.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dblib.properties b/archive/sdnc/components/dmaap-listener/resources/config/dblib.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dblib.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dblib.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dhcpalert.properties b/archive/sdnc/components/dmaap-listener/resources/config/dhcpalert.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dhcpalert.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dhcpalert.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-CMNotify.properties b/archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-CMNotify.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-CMNotify.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-CMNotify.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-RANSlice.properties b/archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-RANSlice.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-RANSlice.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-RANSlice.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-a1Adapter-policy.properties b/archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-a1Adapter-policy.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-a1Adapter-policy.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-a1Adapter-policy.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-oofpcipoc.properties b/archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-oofpcipoc.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-oofpcipoc.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/dmaap-consumer-oofpcipoc.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/resources/config/lcm.properties b/archive/sdnc/components/dmaap-listener/resources/config/lcm.properties
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/resources/config/lcm.properties
rename to archive/sdnc/components/dmaap-listener/resources/config/lcm.properties
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/authorizationpolicy.yaml b/archive/sdnc/components/dmaap-listener/templates/authorizationpolicy.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/templates/authorizationpolicy.yaml
rename to archive/sdnc/components/dmaap-listener/templates/authorizationpolicy.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/configmap.yaml b/archive/sdnc/components/dmaap-listener/templates/configmap.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/templates/configmap.yaml
rename to archive/sdnc/components/dmaap-listener/templates/configmap.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml b/archive/sdnc/components/dmaap-listener/templates/deployment.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
rename to archive/sdnc/components/dmaap-listener/templates/deployment.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/secret.yaml b/archive/sdnc/components/dmaap-listener/templates/secret.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/templates/secret.yaml
rename to archive/sdnc/components/dmaap-listener/templates/secret.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/service.yaml b/archive/sdnc/components/dmaap-listener/templates/service.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/templates/service.yaml
rename to archive/sdnc/components/dmaap-listener/templates/service.yaml
diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/archive/sdnc/components/dmaap-listener/values.yaml
similarity index 100%
rename from kubernetes/sdnc/components/dmaap-listener/values.yaml
rename to archive/sdnc/components/dmaap-listener/values.yaml
diff --git a/kubernetes/vfc/.helmignore b/archive/vfc/.helmignore
similarity index 100%
rename from kubernetes/vfc/.helmignore
rename to archive/vfc/.helmignore
diff --git a/kubernetes/vfc/Chart.yaml b/archive/vfc/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/Chart.yaml
rename to archive/vfc/Chart.yaml
diff --git a/kubernetes/vfc/Makefile b/archive/vfc/Makefile
similarity index 100%
rename from kubernetes/vfc/Makefile
rename to archive/vfc/Makefile
diff --git a/kubernetes/vfc/components/Makefile b/archive/vfc/components/Makefile
similarity index 100%
rename from kubernetes/vfc/components/Makefile
rename to archive/vfc/components/Makefile
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/.helmignore b/archive/vfc/components/vfc-generic-vnfm-driver/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/.helmignore
rename to archive/vfc/components/vfc-generic-vnfm-driver/.helmignore
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml b/archive/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
rename to archive/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/resources/config/logging/log.yml b/archive/vfc/components/vfc-generic-vnfm-driver/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-generic-vnfm-driver/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/configmap.yaml b/archive/vfc/components/vfc-generic-vnfm-driver/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/configmap.yaml
rename to archive/vfc/components/vfc-generic-vnfm-driver/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml b/archive/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
rename to archive/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml b/archive/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml
rename to archive/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml b/archive/vfc/components/vfc-generic-vnfm-driver/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
rename to archive/vfc/components/vfc-generic-vnfm-driver/values.yaml
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/.helmignore b/archive/vfc/components/vfc-huawei-vnfm-driver/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/.helmignore
rename to archive/vfc/components/vfc-huawei-vnfm-driver/.helmignore
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml b/archive/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
rename to archive/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties b/archive/vfc/components/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties
rename to archive/vfc/components/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/configmap.yaml b/archive/vfc/components/vfc-huawei-vnfm-driver/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/configmap.yaml
rename to archive/vfc/components/vfc-huawei-vnfm-driver/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml b/archive/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
rename to archive/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml b/archive/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml
rename to archive/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml b/archive/vfc/components/vfc-huawei-vnfm-driver/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
rename to archive/vfc/components/vfc-huawei-vnfm-driver/values.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/.helmignore b/archive/vfc/components/vfc-nslcm/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/.helmignore
rename to archive/vfc/components/vfc-nslcm/.helmignore
diff --git a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml b/archive/vfc/components/vfc-nslcm/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/Chart.yaml
rename to archive/vfc/components/vfc-nslcm/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/resources/config/logging/log.yml b/archive/vfc/components/vfc-nslcm/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-nslcm/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/configmap.yaml b/archive/vfc/components/vfc-nslcm/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/templates/configmap.yaml
rename to archive/vfc/components/vfc-nslcm/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml b/archive/vfc/components/vfc-nslcm/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
rename to archive/vfc/components/vfc-nslcm/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/secrets.yaml b/archive/vfc/components/vfc-nslcm/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/templates/secrets.yaml
rename to archive/vfc/components/vfc-nslcm/templates/secrets.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/service.yaml b/archive/vfc/components/vfc-nslcm/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/templates/service.yaml
rename to archive/vfc/components/vfc-nslcm/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/values.yaml b/archive/vfc/components/vfc-nslcm/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-nslcm/values.yaml
rename to archive/vfc/components/vfc-nslcm/values.yaml
diff --git a/kubernetes/vfc/components/vfc-redis/.helmignore b/archive/vfc/components/vfc-redis/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-redis/.helmignore
rename to archive/vfc/components/vfc-redis/.helmignore
diff --git a/kubernetes/vfc/components/vfc-redis/Chart.yaml b/archive/vfc/components/vfc-redis/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-redis/Chart.yaml
rename to archive/vfc/components/vfc-redis/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-redis/templates/deployment.yaml b/archive/vfc/components/vfc-redis/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-redis/templates/deployment.yaml
rename to archive/vfc/components/vfc-redis/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-redis/templates/service.yaml b/archive/vfc/components/vfc-redis/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-redis/templates/service.yaml
rename to archive/vfc/components/vfc-redis/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-redis/values.yaml b/archive/vfc/components/vfc-redis/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-redis/values.yaml
rename to archive/vfc/components/vfc-redis/values.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/.helmignore b/archive/vfc/components/vfc-vnflcm/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/.helmignore
rename to archive/vfc/components/vfc-vnflcm/.helmignore
diff --git a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml b/archive/vfc/components/vfc-vnflcm/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
rename to archive/vfc/components/vfc-vnflcm/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/resources/config/logging/log.yml b/archive/vfc/components/vfc-vnflcm/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-vnflcm/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/configmap.yaml b/archive/vfc/components/vfc-vnflcm/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/templates/configmap.yaml
rename to archive/vfc/components/vfc-vnflcm/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml b/archive/vfc/components/vfc-vnflcm/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
rename to archive/vfc/components/vfc-vnflcm/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/secrets.yaml b/archive/vfc/components/vfc-vnflcm/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/templates/secrets.yaml
rename to archive/vfc/components/vfc-vnflcm/templates/secrets.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/service.yaml b/archive/vfc/components/vfc-vnflcm/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/templates/service.yaml
rename to archive/vfc/components/vfc-vnflcm/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/values.yaml b/archive/vfc/components/vfc-vnflcm/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnflcm/values.yaml
rename to archive/vfc/components/vfc-vnflcm/values.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/.helmignore b/archive/vfc/components/vfc-vnfmgr/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/.helmignore
rename to archive/vfc/components/vfc-vnfmgr/.helmignore
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml b/archive/vfc/components/vfc-vnfmgr/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
rename to archive/vfc/components/vfc-vnfmgr/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/resources/config/logging/log.yml b/archive/vfc/components/vfc-vnfmgr/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-vnfmgr/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/configmap.yaml b/archive/vfc/components/vfc-vnfmgr/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/templates/configmap.yaml
rename to archive/vfc/components/vfc-vnfmgr/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml b/archive/vfc/components/vfc-vnfmgr/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
rename to archive/vfc/components/vfc-vnfmgr/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/secrets.yaml b/archive/vfc/components/vfc-vnfmgr/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/templates/secrets.yaml
rename to archive/vfc/components/vfc-vnfmgr/templates/secrets.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml b/archive/vfc/components/vfc-vnfmgr/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml
rename to archive/vfc/components/vfc-vnfmgr/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml b/archive/vfc/components/vfc-vnfmgr/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfmgr/values.yaml
rename to archive/vfc/components/vfc-vnfmgr/values.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/.helmignore b/archive/vfc/components/vfc-vnfres/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/.helmignore
rename to archive/vfc/components/vfc-vnfres/.helmignore
diff --git a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml b/archive/vfc/components/vfc-vnfres/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/Chart.yaml
rename to archive/vfc/components/vfc-vnfres/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/resources/config/logging/log.yml b/archive/vfc/components/vfc-vnfres/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-vnfres/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/configmap.yaml b/archive/vfc/components/vfc-vnfres/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/templates/configmap.yaml
rename to archive/vfc/components/vfc-vnfres/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml b/archive/vfc/components/vfc-vnfres/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
rename to archive/vfc/components/vfc-vnfres/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/secrets.yaml b/archive/vfc/components/vfc-vnfres/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/templates/secrets.yaml
rename to archive/vfc/components/vfc-vnfres/templates/secrets.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/service.yaml b/archive/vfc/components/vfc-vnfres/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/templates/service.yaml
rename to archive/vfc/components/vfc-vnfres/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/values.yaml b/archive/vfc/components/vfc-vnfres/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-vnfres/values.yaml
rename to archive/vfc/components/vfc-vnfres/values.yaml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/.helmignore b/archive/vfc/components/vfc-zte-vnfm-driver/.helmignore
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/.helmignore
rename to archive/vfc/components/vfc-zte-vnfm-driver/.helmignore
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml b/archive/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
rename to archive/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/resources/config/logging/log.yml b/archive/vfc/components/vfc-zte-vnfm-driver/resources/config/logging/log.yml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/resources/config/logging/log.yml
rename to archive/vfc/components/vfc-zte-vnfm-driver/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/configmap.yaml b/archive/vfc/components/vfc-zte-vnfm-driver/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/configmap.yaml
rename to archive/vfc/components/vfc-zte-vnfm-driver/templates/configmap.yaml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml b/archive/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
rename to archive/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml b/archive/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml
rename to archive/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml b/archive/vfc/components/vfc-zte-vnfm-driver/values.yaml
similarity index 100%
rename from kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
rename to archive/vfc/components/vfc-zte-vnfm-driver/values.yaml
diff --git a/kubernetes/vfc/resources/config/log/filebeat/filebeat.yml b/archive/vfc/resources/config/log/filebeat/filebeat.yml
similarity index 100%
rename from kubernetes/vfc/resources/config/log/filebeat/filebeat.yml
rename to archive/vfc/resources/config/log/filebeat/filebeat.yml
diff --git a/kubernetes/vfc/templates/configmap.yaml b/archive/vfc/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vfc/templates/configmap.yaml
rename to archive/vfc/templates/configmap.yaml
diff --git a/kubernetes/vfc/templates/secrets.yaml b/archive/vfc/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vfc/templates/secrets.yaml
rename to archive/vfc/templates/secrets.yaml
diff --git a/kubernetes/vfc/values.yaml b/archive/vfc/values.yaml
similarity index 100%
rename from kubernetes/vfc/values.yaml
rename to archive/vfc/values.yaml
diff --git a/kubernetes/vnfsdk/Chart.yaml b/archive/vnfsdk/Chart.yaml
similarity index 100%
rename from kubernetes/vnfsdk/Chart.yaml
rename to archive/vnfsdk/Chart.yaml
diff --git a/kubernetes/vnfsdk/resources/config/configuration.xml b/archive/vnfsdk/resources/config/configuration.xml
similarity index 100%
rename from kubernetes/vnfsdk/resources/config/configuration.xml
rename to archive/vnfsdk/resources/config/configuration.xml
diff --git a/kubernetes/vnfsdk/resources/config/marketplace_tables_postgres.sql b/archive/vnfsdk/resources/config/marketplace_tables_postgres.sql
similarity index 100%
rename from kubernetes/vnfsdk/resources/config/marketplace_tables_postgres.sql
rename to archive/vnfsdk/resources/config/marketplace_tables_postgres.sql
diff --git a/kubernetes/vnfsdk/resources/nginx/nginx.conf b/archive/vnfsdk/resources/nginx/nginx.conf
similarity index 100%
rename from kubernetes/vnfsdk/resources/nginx/nginx.conf
rename to archive/vnfsdk/resources/nginx/nginx.conf
diff --git a/kubernetes/vnfsdk/templates/NOTES.txt b/archive/vnfsdk/templates/NOTES.txt
similarity index 100%
rename from kubernetes/vnfsdk/templates/NOTES.txt
rename to archive/vnfsdk/templates/NOTES.txt
diff --git a/kubernetes/vnfsdk/templates/configmap.yaml b/archive/vnfsdk/templates/configmap.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/configmap.yaml
rename to archive/vnfsdk/templates/configmap.yaml
diff --git a/kubernetes/vnfsdk/templates/deployment.yaml b/archive/vnfsdk/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/deployment.yaml
rename to archive/vnfsdk/templates/deployment.yaml
diff --git a/kubernetes/vnfsdk/templates/ingress.yaml b/archive/vnfsdk/templates/ingress.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/ingress.yaml
rename to archive/vnfsdk/templates/ingress.yaml
diff --git a/kubernetes/vnfsdk/templates/job.yaml b/archive/vnfsdk/templates/job.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/job.yaml
rename to archive/vnfsdk/templates/job.yaml
diff --git a/kubernetes/vnfsdk/templates/secrets.yaml b/archive/vnfsdk/templates/secrets.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/secrets.yaml
rename to archive/vnfsdk/templates/secrets.yaml
diff --git a/kubernetes/vnfsdk/templates/service.yaml b/archive/vnfsdk/templates/service.yaml
similarity index 100%
rename from kubernetes/vnfsdk/templates/service.yaml
rename to archive/vnfsdk/templates/service.yaml
diff --git a/kubernetes/vnfsdk/values.yaml b/archive/vnfsdk/values.yaml
similarity index 100%
rename from kubernetes/vnfsdk/values.yaml
rename to archive/vnfsdk/values.yaml
diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index ade33b4..83b344b 100644
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -19,19 +19,15 @@
 # ============LICENSE_END=========================================================
 
 apiVersion: v2
-appVersion: "NewDelhi"
+appVersion: "Oslo"
 description: DCAE Microservices
 name: dcaegen2-services
-version: 13.1.0
+version: 15.0.0
 
 dependencies:
   - name: common
     version: ~13.x-0
     repository: '@local'
-  - name: dcae-datafile-collector
-    version: ~13.x-0
-    repository: '@local'
-    condition: dcae-datafile-collector.enabled
   - name: dcae-datalake-admin-ui
     version: ~13.x-0
     repository: '@local'
@@ -44,62 +40,22 @@
     version: ~13.x-0
     repository: '@local'
     condition: dcae-datalake-feeder.enabled
-  - name: dcae-heartbeat
-    version: ~13.x-0
-    repository: '@local'
-    condition: dcae-heartbeat.enabled
   - name: dcae-hv-ves-collector
     version: ~13.x-0
     repository: '@local'
     condition: dcae-hv-ves-collector.enabled
-  - name: dcae-kpi-ms
-    version: ~13.x-0
-    repository: '@local'
-    condition: dcae-kpi-ms.enabled
   - name: dcae-ms-healthcheck
     version: ~13.x-0
     repository: '@local'
     condition: dcae-ms-healthcheck.enabled
-  - name: dcae-pm-mapper
-    version: ~13.x-0
-    repository: '@local'
-    condition: dcae-pm-mapper.enabled
-  - name: dcae-pmsh
-    version: ~13.x-0
-    repository: '@local'
-    condition: dcae-pmsh.enabled
   - name: dcae-prh
     version: ~13.x-0
     repository: '@local'
     condition: dcae-prh.enabled
-  - name: dcae-restconf-collector
-    version: ~13.x-0
-    repository: '@local'
-    condition: dcae-restconf-collector.enabled
-  - name: dcae-slice-analysis-ms
-    version: ~13.x-0
-    repository: '@local'
-    condition: dcae-slice-analysis-ms.enabled
-  - name: dcae-snmptrap-collector
-    version: ~13.x-0
-    repository: '@local'
-    condition: dcae-snmptrap-collector.enabled
-  - name: dcae-son-handler
-    version: ~13.x-0
-    repository: '@local'
-    condition: dcae-son-handler.enabled
-  - name: dcae-tcagen2
-    version: ~13.x-0
-    repository: '@local'
-    condition: dcae-tcagen2.enabled
   - name: dcae-ves-collector
     version: ~13.x-0
     repository: '@local'
     condition: dcae-ves-collector.enabled
-  - name: dcae-ves-mapper
-    version: ~13.x-0
-    repository: '@local'
-    condition: dcae-ves-mapper.enabled
   - name: dcae-ves-openapi-manager
     version: ~13.x-0
     repository: 'file://components/dcae-ves-openapi-manager'
diff --git a/kubernetes/dcaegen2-services/resources/expected-components.json b/kubernetes/dcaegen2-services/resources/expected-components.json
index 7c4c3fb..c91552e 100644
--- a/kubernetes/dcaegen2-services/resources/expected-components.json
+++ b/kubernetes/dcaegen2-services/resources/expected-components.json
@@ -40,7 +40,7 @@
 */}}
 
 {{- $ctx := . -}}
-{{- $components := list "dcae-hv-ves-collector" "dcae-prh" "dcae-tcagen2" "dcae-ves-collector" "dcae-ves-openapi-manager" -}}
+{{- $components := list "dcae-hv-ves-collector" "dcae-prh" "dcae-ves-collector" "dcae-ves-openapi-manager" -}}
 {{- $enabled := dict "enabled" list -}}
 {{- range $components -}}
   {{- if index $ctx.Values . "enabled" -}}
diff --git a/kubernetes/dcaegen2-services/values.yaml b/kubernetes/dcaegen2-services/values.yaml
index ba3607f..6efbf36 100644
--- a/kubernetes/dcaegen2-services/values.yaml
+++ b/kubernetes/dcaegen2-services/values.yaml
@@ -28,9 +28,6 @@
 # Control deployment of DCAE microservices at ONAP installation time
 dcae-ves-openapi-manager:
   enabled: true
-dcae-datafile-collector:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-datalake-admin-ui:
   enabled: false
   logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
@@ -40,45 +37,15 @@
 dcae-datalake-feeder:
   enabled: false
   logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-heartbeat:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-hv-ves-collector:
   enabled: true
   logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-kpi-ms:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-ms-healthcheck:
   enabled: true
   logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-pm-mapper:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-pmsh:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-prh:
   enabled: true
   logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-restconf-collector:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-slice-analysis-ms:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-snmptrap-collector:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-son-handler:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-tcagen2:
-  enabled: true
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-ves-collector:
   enabled: true
   logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
-dcae-ves-mapper:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index 48a3b96..cecef8c 100644
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP multicloud broker
 name: multicloud
-version: 13.1.0
+version: 15.0.0
 
 dependencies:
   - name: common
@@ -35,26 +35,6 @@
     version: ~13.x-0
     repository: 'file://components/multicloud-k8s'
     condition: multicloud-k8s.enabled
-  - name: multicloud-pike
-    version: ~13.x-0
-    repository: 'file://components/multicloud-pike'
-    condition: multicloud-pike.enabled
-  - name: multicloud-prometheus
-    version: ~13.x-0
-    repository: 'file://components/multicloud-prometheus'
-    condition: multicloud-prometheus.enabled
-  - name: multicloud-starlingx
-    version: ~13.x-0
-    repository: 'file://components/multicloud-starlingx'
-    condition: multicloud-starlingx.enabled
-  - name: multicloud-vio
-    version: ~13.x-0
-    repository: 'file://components/multicloud-vio'
-    condition: multicloud-vio.enabled
-  - name: multicloud-windriver
-    version: ~13.x-0
-    repository: 'file://components/multicloud-windriver'
-    condition: multicloud-windriver.enabled
   - name: serviceAccount
     version: ~13.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 033826f..6906390 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -39,27 +39,11 @@
   logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
 multicloud-k8s:
   enabled: true
-multicloud-pike:
-  enabled: true
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
-multicloud-prometheus:
-  enabled: false
-multicloud-starlingx:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
-multicloud-vio:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
-multicloud-windriver:
-  enabled: false
-  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
 
 # application configuration
 config:
-  msbgateway: msb-iag
   logstashServiceName: log-ls
   logstashPort: 5044
-  msbPort: 80
   aai:
     aaiPort: 80
     schemaVersion: v13
@@ -89,28 +73,6 @@
     - name: http
       port: 9001
       nodePort: '91'
-  annotations:
-    msb.onap.org/service-info: |
-      {{ if .Values.global.msbEnabled -}}[
-        {
-          "serviceName": "multicloud",
-          "version": "v0",
-          "url": "/api/multicloud/v0",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "enable_ssl": false,
-          "visualRange": "1"
-        },
-        {
-          "serviceName": "multicloud",
-          "version": "v1",
-          "url": "/api/multicloud/v1",
-          "protocol": "REST",
-          "port": "{{ .Values.service.internalPort }}",
-          "enable_ssl": false,
-          "visualRange": "1"
-        }
-      ]{{ end }}
 
 ingress:
   enabled: false
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 3e19cbd..a035097 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -41,10 +41,6 @@
     version: ~13.x-0
     repository: '@local'
     condition: cds.enabled
-  - name: cli
-    version: ~13.x-0
-    repository: '@local'
-    condition: cli.enabled
   - name: common
     version: ~13.x-0
     repository: '@local'
@@ -53,33 +49,17 @@
     repository: '@local'
     condition: cps.enabled
   - name: dcaegen2-services
-    version: ~13.x-0
+    version: ~15.x-0
     repository: '@local'
     condition: dcaegen2-services.enabled
-  - name: holmes
-    version: ~13.x-0
-    repository: '@local'
-    condition: holmes.enabled
-  - name: dmaap
-    version: ~13.x-0
-    repository: '@local'
-    condition: dmaap.enabled
   - name: mariadb-galera
     version: ~13.x-0
     repository: '@local'
     condition: mariadb-galera.enabled
-  - name: msb
-    version: ~13.x-0
-    repository: '@local'
-    condition: msb.enabled
   - name: multicloud
-    version: ~13.x-0
+    version: ~15.x-0
     repository: '@local'
     condition: multicloud.enabled
-  - name: nbi
-    version: ~13.x-0
-    repository: '@local'
-    condition: nbi.enabled
   - name: policy
     version: ~14.x-0
     repository: '@local'
@@ -92,10 +72,6 @@
     version: ~13.x-0
     repository: '@local'
     condition: postgres.enabled
-  - name: oof
-    version: ~13.x-0
-    repository: '@local'
-    condition: oof.enabled
   - name: repository-wrapper
     version: ~13.x-0
     repository: '@local'
@@ -108,7 +84,7 @@
     repository: '@local'
     condition: sdc.enabled
   - name: sdnc
-    version: ~14.x-0
+    version: ~15.x-0
     repository: '@local'
     condition: sdnc.enabled
   - name: so
@@ -123,18 +99,6 @@
     version: ~13.x-0
     repository: '@local'
     condition: uui.enabled
-  - name: vfc
-    version: ~13.x-0
-    repository: '@local'
-    condition: vfc.enabled
-  - name: vnfsdk
-    version: ~13.x-0
-    repository: '@local'
-    condition: vnfsdk.enabled
-  - name: modeling
-    version: ~13.x-0
-    repository: '@local'
-    condition: modeling.enabled
   - name: platform
     version: ~13.x-0
     repository: '@local'
diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
index 468aab8..554bacd 100644
--- a/kubernetes/onap/resources/overrides/environment.yaml
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -61,37 +61,6 @@
   readiness:
     timeoutSeconds: 30
     periodSeconds: 60
-holmes:
-  holmes-rule-mgmt:
-    liveness:
-      initialDelaySeconds: 120
-    readiness:
-      initialDelaySeconds: 120
-  holmes-engine-mgmt:
-    liveness:
-      initialDelaySeconds: 120
-    readiness:
-      initialDelaySeconds: 120
-dmaap:
-  dmaap-bus-controller:
-    liveness:
-      initialDelaySeconds: 120
-    readiness:
-      initialDelaySeconds: 120
-  dmaap-dr-prov:
-    liveness:
-      initialDelaySeconds: 120
-    readiness:
-      initialDelaySeconds: 120
-    mariadb:
-      liveness:
-        initialDelaySeconds: 180
-        periodSeconds: 60
-  dmaap-dr-node:
-    liveness:
-      initialDelaySeconds: 120
-    readiness:
-      initialDelaySeconds: 120
 mariadb-galera:
   liveness:
     initialDelaySeconds: 30
@@ -101,19 +70,6 @@
       initialDelaySeconds: 120
     readiness:
       initialDelaySeconds: 120
-modeling:
-  mariadb-galera:
-    liveness:
-      initialDelaySeconds: 180
-      periodSeconds: 60
-oof:
-  oof-has:
-    music:
-      music-cassandra:
-        liveness:
-          periodSeconds: 120
-        readiness:
-          periodSeconds: 60
 sdc:
   sdc-fe:
     liveness:
@@ -159,11 +115,6 @@
     initialDelaySeconds: 60
   readiness:
     initialDelaySeconds: 60
-  dmaap-listener:
-    liveness:
-      initialDelaySeconds: 120
-    readiness:
-      initialDelaySeconds: 120
   mariadb-galera:
     liveness:
       initialDelaySeconds: 180
@@ -190,8 +141,3 @@
       initialDelaySeconds: 120
     readiness:
       initialDelaySeconds: 120
-vfc:
-  mariadb-galera:
-    liveness:
-      initialDelaySeconds: 180
-      periodSeconds: 60
diff --git a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
index 4c1a418..159c800 100644
--- a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
+++ b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
@@ -74,36 +74,16 @@
   enabled: true
 cds:
   enabled: true
-cli:
-  enabled: false
 cps:
   enabled: false
 dcaegen2-services:
   enabled: false
-holmes:
-  enabled: false
-dmaap:
-  enabled: true
-  message-router:
-    enabled: true
-  dmaap-dr-prov:
-    enabled: false
-  dmaap-dr-node:
-    enabled: false
-oof:
-  enabled: true
 mariadb-galera:
   enabled: true
 msb:
   enabled: true
 multicloud:
   enabled: false
-nbi:
-  enabled: true
-  config:
-    # openstack configuration
-    openStackRegion: "Yolo"
-    openStackVNFTenantId: "1234"
 policy:
   enabled: true
 portal-ng:
@@ -117,21 +97,16 @@
   enabled: true
 sdnc:
   enabled: false
-
   replicaCount: 1
-
   mysql:
     replicaCount: 1
 so:
   enabled: true
-
   replicaCount: 1
-
   liveness:
     # necessary to disable liveness probe when setting breakpoints
     # in debugger so K8s doesn't restart unresponsive container
     enabled: false
-
   # so server configuration
   config:
     # message router configuration
@@ -149,9 +124,3 @@
     enabled: false
 uui:
   enabled: true
-vfc:
-  enabled: false
-vnfsdk:
-  enabled: false
-modeling:
-  enabled: false
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml
index 7e73456..b4b7741 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml
@@ -68,70 +68,30 @@
   enabled: true
 cds:
   enabled: true
-cli:
-  enabled: false
 cps:
   enabled: true
 dcaegen2-services:
   enabled: true
-  dcae-datafile-collector:
-    enabled: false
   dcae-datalake-admin-ui:
     enabled: true
   dcae-datalake-des:
     enabled: true
   dcae-datalake-feeder:
     enabled: true
-  dcae-heartbeat:
-    enabled: false
   dcae-hv-ves-collector:
     enabled: true
-  dcae-kpi-ms:
-    enabled: false
   dcae-ms-healthcheck:
     enabled: true
-  dcae-pm-mapper:
-    enabled: false
-  dcae-pmsh:
-    enabled: false
   dcae-prh:
     enabled: true
-  dcae-restconf-collector:
-    enabled: false
-  dcae-slice-analysis-ms:
-    enabled: false
-  dcae-snmptrap-collector:
-    enabled: false
-  dcae-son-handler:
-    enabled: false
-  dcae-tcagen2:
-    enabled: false
   dcae-ves-collector:
     enabled: true
     applicationConfig:
       auth.method: "noAuth"
-  dcae-ves-mapper:
-    enabled: false
   dcae-ves-openapi-manager:
     enabled: true
-holmes:
-  enabled: false
-dmaap:
-  enabled: true
-  message-router:
-    enabled: false
-  dmaap-dr-prov:
-    enabled: true
-  dmaap-dr-node:
-    enabled: true
-oof:
-  enabled: false
-msb:
-  enabled: false
 multicloud:
   enabled: true
-nbi:
-  enabled: false
 platform:
   enabled: true
   cmpv2-cert-service:
@@ -150,8 +110,6 @@
     enabled: true
   dgbuilder:
     enabled: true
-  dmaap-listener:
-    enabled: false
   ueb-listener:
     enabled: true
   sdnc-ansible-server:
@@ -166,11 +124,5 @@
     enabled: true
 uui:
   enabled: true
-vfc:
-  enabled: false
-vnfsdk:
-  enabled: false
-modeling:
-  enabled: false
 a1policymanagement:
   enabled: true
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
index f3c3dd2..c4b5e09 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
@@ -69,72 +69,30 @@
   enabled: true
 cds:
   enabled: true
-cli:
-  enabled: false
 cps:
   enabled: true
-dcaegen2:
-  enabled: true
 dcaegen2-services:
   enabled: true
-  dcae-datafile-collector:
-    enabled: false
   dcae-datalake-admin-ui:
     enabled: true
   dcae-datalake-des:
     enabled: true
   dcae-datalake-feeder:
     enabled: true
-  dcae-heartbeat:
-    enabled: false
   dcae-hv-ves-collector:
     enabled: true
-  dcae-kpi-ms:
-    enabled: false
   dcae-ms-healthcheck:
     enabled: true
-  dcae-pm-mapper:
-    enabled: false
-  dcae-pmsh:
-    enabled: false
   dcae-prh:
     enabled: true
-  dcae-restconf-collector:
-    enabled: false
-  dcae-slice-analysis-ms:
-    enabled: false
-  dcae-snmptrap-collector:
-    enabled: false
-  dcae-son-handler:
-    enabled: false
-  dcae-tcagen2:
-    enabled: false
   dcae-ves-collector:
     enabled: true
     applicationConfig:
       auth.method: "noAuth"
-  dcae-ves-mapper:
-    enabled: false
   dcae-ves-openapi-manager:
     enabled: true
-holmes:
-  enabled: true
-dmaap:
-  enabled: true
-  message-router:
-    enabled: false
-  dmaap-dr-prov:
-    enabled: true
-  dmaap-dr-node:
-    enabled: true
-oof:
-  enabled: false
-msb:
-  enabled: false
 multicloud:
   enabled: true
-nbi:
-  enabled: false
 platform:
   enabled: true
   cmpv2-cert-service:
@@ -153,8 +111,6 @@
     enabled: true
   dgbuilder:
     enabled: true
-  dmaap-listener:
-    enabled: false
   ueb-listener:
     enabled: true
   sdnc-ansible-server:
@@ -169,11 +125,5 @@
     enabled: true
 uui:
   enabled: true
-vfc:
-  enabled: false
-vnfsdk:
-  enabled: false
-modeling:
-  enabled: false
 a1policymanagement:
   enabled: true
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
index f14156c..c90614b 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@ -45,72 +45,32 @@
   enabled: true
 cds:
   enabled: true
-cli:
-  enabled: false
 cps:
   enabled: true
-dcaegen2:
-  enabled: true
 dcaegen2-services:
   enabled: true
-  dcae-datafile-collector:
-    enabled: false
   dcae-datalake-admin-ui:
     enabled: true
   dcae-datalake-des:
     enabled: true
   dcae-datalake-feeder:
     enabled: true
-  dcae-heartbeat:
-    enabled: false
   dcae-hv-ves-collector:
     enabled: true
-  dcae-kpi-ms:
-    enabled: false
   dcae-ms-healthcheck:
     enabled: true
-  dcae-pm-mapper:
-    enabled: false
-  dcae-pmsh:
-    enabled: false
   dcae-prh:
     enabled: true
   dcae-restconf-collector:
     enabled: false
-  dcae-slice-analysis-ms:
-    enabled: false
-  dcae-snmptrap-collector:
-    enabled: false
-  dcae-son-handler:
-    enabled: false
-  dcae-tcagen2:
-    enabled: false
   dcae-ves-collector:
     enabled: true
     applicationConfig:
       auth.method: "noAuth"
-  dcae-ves-mapper:
-    enabled: false
   dcae-ves-openapi-manager:
     enabled: true
-holmes:
-  enabled: true
-dmaap:
-  enabled: true
-  message-router:
-    enabled: true
-  dmaap-dr-prov:
-    enabled: true
-  dmaap-dr-node:
-    enabled: true
-oof:
-  enabled: false
-msb:
-  enabled: false
 multicloud:
   enabled: true
-nbi:
-  enabled: false
 platform:
   enabled: true
   cmpv2-cert-service:
@@ -129,8 +89,6 @@
     enabled: true
   dgbuilder:
     enabled: true
-  dmaap-listener:
-    enabled: false
   ueb-listener:
     enabled: true
   sdnc-ansible-server:
@@ -145,12 +103,6 @@
     enabled: true
 uui:
   enabled: true
-vfc:
-  enabled: false
-vnfsdk:
-  enabled: false
-modeling:
-  enabled: false
 a1policymanagement:
   enabled: true
                                                                                                                                                                       55,15         39%
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 5cfb126..444d904 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -31,68 +31,28 @@
   enabled: true
 cds:
   enabled: true
-cli:
-  enabled: false
 cps:
   enabled: true
 dcaegen2-services:
   enabled: true
-  dcae-datafile-collector:
-    enabled: false
   dcae-datalake-admin-ui:
     enabled: true
   dcae-datalake-des:
     enabled: true
   dcae-datalake-feeder:
     enabled: true
-  dcae-heartbeat:
-    enabled: false
   dcae-hv-ves-collector:
     enabled: true
-  dcae-kpi-ms:
-    enabled: false
   dcae-ms-healthcheck:
     enabled: true
-  dcae-pm-mapper:
-    enabled: false
-  dcae-pmsh:
-    enabled: false
   dcae-prh:
     enabled: true
-  dcae-restconf-collector:
-    enabled: false
-  dcae-slice-analysis-ms:
-    enabled: false
-  dcae-snmptrap-collector:
-    enabled: false
-  dcae-son-handler:
-    enabled: false
-  dcae-tcagen2:
-    enabled: false
   dcae-ves-collector:
     enabled: true
-  dcae-ves-mapper:
-    enabled: false
   dcae-ves-openapi-manager:
     enabled: true
-holmes:
-  enabled: false
-dmaap:
-  enabled: true
-  message-router:
-    enabled: false
-  dmaap-dr-prov:
-    enabled: true
-  dmaap-dr-node:
-    enabled: true
-oof:
-  enabled: false
-msb:
-  enabled: false
 multicloud:
   enabled: true
-nbi:
-  enabled: false
 policy:
   enabled: true
 portal-ng:
@@ -107,8 +67,6 @@
     enabled: true
   dgbuilder:
     enabled: true
-  dmaap-listener:
-    enabled: false
   ueb-listener:
     enabled: true
   sdnc-ansible-server:
@@ -123,12 +81,6 @@
     enabled: true
 uui:
   enabled: true
-vfc:
-  enabled: false
-vnfsdk:
-  enabled: false
-modeling:
-  enabled: false
 platform:
   enabled: true
 a1policymanagement:
diff --git a/kubernetes/onap/resources/overrides/onap-vfw.yaml b/kubernetes/onap/resources/overrides/onap-vfw.yaml
index 14748dd..5ce3a97 100644
--- a/kubernetes/onap/resources/overrides/onap-vfw.yaml
+++ b/kubernetes/onap/resources/overrides/onap-vfw.yaml
@@ -25,20 +25,6 @@
   enabled: true
 dcaegen2-services:
   enabled: true
-holmes:
-  enabled: true
-dmaap:
-  enabled: true
-  message-router:
-    enabled: true
-  dmaap-dr-prov:
-    enabled: false
-  dmaap-dr-node:
-    enabled: false
-oof:
-  enabled: true
-msb:
-  enabled: true
 policy:
   enabled: true
 portal-ng:
diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index dc5da35..6877e33 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -63,32 +63,14 @@
 cassandra:
   enabled: true
   replicaCount: 3
-cli:
-  enabled: false
 cps:
   enabled: false
 dcaegen2-services:
   enabled: false
-dmaap:
-  enabled: true
-  message-router:
-    enabled: true
-  dmaap-dr-prov:
-    enabled: true
-  dmaap-dr-node:
-    enabled: true
-holmes:
-  enabled: false
 mariadb-galera:
   enabled: true
-msb:
-  enabled: false
 multicloud:
   enabled: false
-nbi:
-  enabled: false
-oof:
-  enabled: false
 policy:
   enabled: false
 portal-ng:
@@ -130,10 +112,5 @@
     enabled: true
 uui:
   enabled: false
-vfc:
-  enabled: false
-vnfsdk:
-  enabled: false
 cds:
   enabled: true
-
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index e634f18..5916455 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: SDN Controller
 name: sdnc
-version: 14.0.0
+version: 15.0.0
 
 dependencies:
   - name: common
@@ -51,10 +51,6 @@
     repository: '@local'
     condition: sdnc.elasticsearch.enabled,elasticsearch.enabled
   # conditions for sdnc-subcharts
-  - name: dmaap-listener
-    version: ~14.x-0
-    repository: '@local'
-    condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled
   - name: ueb-listener
     version: ~14.x-0
     repository: '@local'
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 09b2c09..3708bd1 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -445,21 +445,6 @@
 cds:
   enabled: false
 
-dmaap-listener:
-  enabled: true
-  nameOverride: sdnc-dmaap-listener
-  mariadb-galera:
-    <<: *mariadbGalera
-    config:
-      <<: *mariadbGaleraConfig
-      mysqlDatabase: *sdncDbName
-  config:
-    sdncChartName: sdnc
-    dmaapPort: 3904
-    sdncPort: 8282
-    configDir: /opt/onap/sdnc/data/properties
-    odlCredsExternalSecret: *odlCredsSecretName
-
 ueb-listener:
   enabled: true
   mariadb-galera: