Merge "[COMMON] Cleanup charts"

9 files changed, 3 insertions, 355 deletions

diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 3e19cbd0d3..a035097004 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -41,10 +41,6 @@ dependencies:
     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 @@ dependencies:
     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 @@ dependencies:
     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 @@ dependencies:
     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 @@ dependencies:
     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 468aab8c18..554bacd51f 100644
--- a/kubernetes/onap/resources/overrides/environment.yaml
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -61,37 +61,6 @@ cassandra:
   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 @@ mariadb-galera:
       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 @@ sdnc:
     initialDelaySeconds: 60
   readiness:
     initialDelaySeconds: 60
-  dmaap-listener:
-    liveness:
-      initialDelaySeconds: 120
-    readiness:
-      initialDelaySeconds: 120
   mariadb-galera:
     liveness:
       initialDelaySeconds: 180
@@ -190,8 +141,3 @@ uui:
       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 4c1a418777..159c800d4f 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 @@ cassandra:
   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 @@ sdc:
   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 @@ strimzi:
     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 7e7345683b..b4b7741be3 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 @@ aai:
   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 @@ sdnc:
     enabled: true
   dgbuilder:
     enabled: true
-  dmaap-listener:
-    enabled: false
   ueb-listener:
     enabled: true
   sdnc-ansible-server:
@@ -166,11 +124,5 @@ strimzi:
     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 f3c3dd2e1f..c4b5e0969f 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 @@ aai:
   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 @@ sdnc:
     enabled: true
   dgbuilder:
     enabled: true
-  dmaap-listener:
-    enabled: false
   ueb-listener:
     enabled: true
   sdnc-ansible-server:
@@ -169,11 +125,5 @@ strimzi:
     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 f14156c246..c90614b650 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 @@ aai:
   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 @@ sdnc:
     enabled: true
   dgbuilder:
     enabled: true
-  dmaap-listener:
-    enabled: false
   ueb-listener:
     enabled: true
   sdnc-ansible-server:
@@ -145,12 +103,6 @@ strimzi:
     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 5cfb126084..444d904453 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -31,68 +31,28 @@ aai:
   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 @@ sdnc:
     enabled: true
   dgbuilder:
     enabled: true
-  dmaap-listener:
-    enabled: false
   ueb-listener:
     enabled: true
   sdnc-ansible-server:
@@ -123,12 +81,6 @@ strimzi:
     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 14748ddb2e..5ce3a97488 100644
--- a/kubernetes/onap/resources/overrides/onap-vfw.yaml
+++ b/kubernetes/onap/resources/overrides/onap-vfw.yaml
@@ -25,20 +25,6 @@ aai:
   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 dc5da35113..6877e33875 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -63,32 +63,14 @@ aai:
 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 @@ strimzi:
     enabled: true
 uui:
   enabled: false
-vfc:
-  enabled: false
-vnfsdk:
-  enabled: false
 cds:
   enabled: true
-