Merge "[COMMON] Remove not supported components"

7 files changed, 0 insertions, 144 deletions

diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
index c22a3eee30..468aab8c18 100644
--- a/kubernetes/onap/resources/overrides/environment.yaml
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -32,27 +32,6 @@
 # large value may not fix all installation issues on over subscribed hardware.
 #
 #################################################################
-aaf:
-  aaf-cs:
-    liveness:
-      initialDelaySeconds: 240
-    readiness:
-      initialDelaySeconds: 240
-  aaf-gui:
-    liveness:
-      initialDelaySeconds: 120
-    readiness:
-      initialDelaySeconds: 120
-  aaf-oauth:
-    liveness:
-      initialDelaySeconds: 300
-    readiness:
-      initialDelaySeconds: 300
-  aaf-service:
-    liveness:
-      initialDelaySeconds: 300
-    readiness:
-      initialDelaySeconds: 300
 aai:
   liveness:
     initialDelaySeconds: 120
@@ -82,16 +61,6 @@ cassandra:
   readiness:
     timeoutSeconds: 30
     periodSeconds: 60
-clamp:
-  liveness:
-    initialDelaySeconds: 60
-  readiness:
-    initialDelaySeconds: 60
-  clamp-mariadb:
-    liveness:
-      initialDelaySeconds: 30
-    readiness:
-      initialDelaySeconds: 30
 holmes:
   holmes-rule-mgmt:
     liveness:
@@ -145,17 +114,6 @@ oof:
           periodSeconds: 120
         readiness:
           periodSeconds: 60
-portal:
-  portal-app:
-    liveness:
-      initialDelaySeconds: 60
-    readiness:
-      initialDelaySeconds: 60
-  portal-cassandra:
-    liveness:
-      periodSeconds: 120
-    readiness:
-      periodSeconds: 60
 sdc:
   sdc-fe:
     liveness:
diff --git a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
index c89ffa1467..9cfd3703b8 100644
--- a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
+++ b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
@@ -68,22 +68,14 @@ global:
 # Enable/disable and configure helm charts (ie. applications)
 # to customize the ONAP deployment.
 #################################################################
-aaf:
-  enabled: true
 aai:
   enabled: true
 cassandra:
   enabled: true
 cds:
   enabled: true
-clamp:
-  enabled: false
 cli:
   enabled: false
-consul:
-  enabled: false
-contrib:
-  enabled: false
 cps:
   enabled: false
 dcaegen2-services:
@@ -100,10 +92,6 @@ dmaap:
     enabled: false
   dmaap-dr-node:
     enabled: false
-log:
-  enabled: true
-sniro-emulator:
-  enabled: false
 oof:
   enabled: true
 mariadb-galera:
@@ -120,10 +108,6 @@ nbi:
     openStackVNFTenantId: "1234"
 policy:
   enabled: true
-pomba:
-  enabled: false
-portal:
-  enabled: true
 robot:
   enabled: true
   config:
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
index 46971469a1..c04d397a9a 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
@@ -39,8 +39,6 @@ global:
     #    secret: 'my-ingress-cert'
     # optional: Namespace of the Istio IngressGateway
     namespace: istio-ingress
-  # don't need ejbca server
-  addTestingComponents: &testing false
   centralizedLoggingEnabled: &centralizedLogging false
   # Disabling CMPv2
   cmpv2Enabled: false
@@ -51,25 +49,12 @@ mariadb-galera:
   enabled: true
 postgres:
   enabled: true
-aaf:
-  enabled: false
-  aaf-sms:
-    cps:
-      # you must always set the same values as value set in cps.enabled
-      enabled: true
 aai:
   enabled: true
 cds:
   enabled: true
 cli:
   enabled: true
-# Today, "contrib" chart that hosting these components must also be enabled
-# in order to make it work. So `contrib.enabled` must have the same value than
-# addTestingComponents
-contrib:
-  enabled: *testing
-consul:
-  enabled: true
 cps:
   enabled: true
 dcaegen2:
@@ -146,8 +131,6 @@ platform:
     enabled: true
 policy:
   enabled: true
-portal:
-  enabled: false
 robot:
   enabled: true
 sdc:
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 fd6259e4dc..ac3979ea9d 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@ -20,8 +20,6 @@ global:
   ingress:
     enabled: true
     enable_all: true
-  addTestingComponents: &testing true
-  centralizedLoggingEnabled: &centralizedLogging false
 cassandra:
   enabled: true
 mariadb-galera:
@@ -29,27 +27,12 @@ mariadb-galera:
 postgres:
   enabled: true
 
-aaf:
-  enabled: true
-  aaf-sms:
-    cps:
-      # you must always set the same values as value set in cps.enabled
-      enabled: true
 aai:
   enabled: true
 cds:
   enabled: true
-clamp:
-  enabled: true
 cli:
   enabled: true
-# Today, "contrib" chart that hosting these components must also be enabled
-# in order to make it work. So `contrib.enabled` must have the same value than
-# addTestingComponents
-contrib:
-  enabled: *testing
-consul:
-  enabled: true
 cps:
   enabled: true
 dcaegen2-services:
@@ -76,8 +59,6 @@ nbi:
   enabled: true
 policy:
   enabled: true
-portal:
-  enabled: false
 robot:
   enabled: true
 sdc:
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 76fadf9b1f..4efe514513 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -19,36 +19,18 @@
 ###################################################################
 # This override file enables helm charts for all ONAP applications.
 ###################################################################
-global:
-  addTestingComponents: &testing true
-  centralizedLoggingEnabled: &centralizedLogging false
 cassandra:
   enabled: true
 mariadb-galera:
   enabled: true
 postgres:
   enabled: true
-aaf:
-  enabled: false
-  aaf-sms:
-    cps:
-      # you must always set the same values as value set in cps.enabled
-      enabled: true
 aai:
   enabled: true
 cds:
   enabled: true
-clamp:
-  enabled: true
 cli:
   enabled: true
-# Today, "contrib" chart that hosting these components must also be enabled
-# in order to make it work. So `contrib.enabled` must have the same value than
-# addTestingComponents
-contrib:
-  enabled: *testing
-consul:
-  enabled: true
 cps:
   enabled: true
 dcaegen2-services:
@@ -113,8 +95,6 @@ nbi:
   enabled: true
 policy:
   enabled: true
-portal:
-  enabled: false
 robot:
   enabled: true
 sdc:
diff --git a/kubernetes/onap/resources/overrides/onap-vfw.yaml b/kubernetes/onap/resources/overrides/onap-vfw.yaml
index 3980bd5112..c7eb6f2a99 100644
--- a/kubernetes/onap/resources/overrides/onap-vfw.yaml
+++ b/kubernetes/onap/resources/overrides/onap-vfw.yaml
@@ -21,14 +21,8 @@ cassandra:
 mariadb-galera:
   enabled: true
 
-aaf:
-  enabled: true
 aai:
   enabled: true
-clamp:
-  enabled: true
-consul:
-  enabled: true
 dcaegen2-services:
   enabled: true
 holmes:
@@ -43,16 +37,12 @@ dmaap:
     enabled: false
   dmaap-dr-node:
     enabled: false
-log:
-  enabled: true
 oof:
   enabled: true
 msb:
   enabled: true
 policy:
   enabled: true
-portal:
-  enabled: true
 robot:
   enabled: true
 sdc:
diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index e7a4b2a233..47f141a51b 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -60,23 +60,11 @@ aai:
       replicas: 1
   aai-cassandra:
     replicaCount: 1
-aaf:
-  enabled: false
-  aaf-sms:
-    cps:
-      # you must always set the same values as value set in cps.enabled
-      enabled: false
 cassandra:
   enabled: true
   replicaCount: 3
-clamp:
-  enabled: false
 cli:
   enabled: false
-consul:
-  enabled: false
-contrib:
-  enabled: false
 cps:
   enabled: false
 dcaegen2-services:
@@ -93,8 +81,6 @@ dmaap:
     enabled: true
 holmes:
   enabled: false
-log:
-  enabled: false
 mariadb-galera:
   enabled: true
 msb:
@@ -107,10 +93,6 @@ oof:
   enabled: false
 policy:
   enabled: false
-pomba:
-  enabled: false
-portal:
-  enabled: false
 robot:
   enabled: false
 sdc:
@@ -133,8 +115,6 @@ sdc:
       heapNewSize: "256M"
 sdnc:
   enabled: true
-sniro-emulator:
-  enabled: false
 so:
   enabled: true
   config: