Merge "[COMMON] Remove not supported components"

14 files changed, 0 insertions, 359 deletions

diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 23e2096fe2..22fed8352e 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -25,10 +25,6 @@ icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?
 kubeVersion: ">=1.19.11-0"
 
 dependencies:
-  - name: aaf
-    version: ~12.x-0
-    repository: '@local'
-    condition: aaf.enabled
   - name: aai
     version: ~12.x-0
     repository: '@local'
@@ -48,14 +44,6 @@ dependencies:
   - name: common
     version: ~12.x-0
     repository: '@local'
-  - name: consul
-    version: ~12.x-0
-    repository: '@local'
-    condition: consul.enabled
-  - name: contrib
-    version: ~12.x-0
-    repository: '@local'
-    condition: global.addTestingComponents
   - name: cps
     version: ~12.x-0
     repository: '@local'
@@ -72,14 +60,6 @@ dependencies:
     version: ~12.x-0
     repository: '@local'
     condition: dmaap.enabled
-  - name: log
-    version: ~12.x-0
-    repository: '@local'
-    condition: log.enabled
-  - name: sniro-emulator
-    version: ~12.x-0
-    repository: '@local'
-    condition: sniro-emulator.enabled
   - name: mariadb-galera
     version: ~12.x-0
     repository: '@local'
@@ -100,10 +80,6 @@ dependencies:
     version: ~12.x-0
     repository: '@local'
     condition: policy.enabled
-  - name: portal
-    version: ~12.x-0
-    repository: '@local'
-    condition: portal.enabled
   - name: postgres
     version: ~12.x-0
     repository: '@local'
diff --git a/kubernetes/onap/resources/environments/core-onap.yaml b/kubernetes/onap/resources/environments/core-onap.yaml
index 974e28ad12..87c27f743b 100644
--- a/kubernetes/onap/resources/environments/core-onap.yaml
+++ b/kubernetes/onap/resources/environments/core-onap.yaml
@@ -52,19 +52,11 @@ aai:
       replicas: 1
   aai-cassandra:
     replicaCount: 1
-aaf:
-  enabled: false
 cassandra:
   enabled: true
   replicaCount: 3
-clamp:
-  enabled: false
 cli:
   enabled: false
-consul:
-  enabled: false
-contrib:
-  enabled: false
 cps:
   enabled: false
 dcaegen2-services:
@@ -81,8 +73,6 @@ dmaap:
     enabled: false
   dmaap-dr-node:
     enabled: false
-log:
-  enabled: false
 mariadb-galera:
   enabled: true
 msb:
@@ -95,10 +85,6 @@ oof:
   enabled: false
 policy:
   enabled: false
-pomba:
-  enabled: false
-portal:
-  enabled: false
 robot:
   enabled: false
 sdc:
@@ -121,8 +107,6 @@ sdc:
       heapNewSize: "256M"
 sdnc:
   enabled: true
-sniro-emulator:
-  enabled: false
 so:
   enabled: true
   config:
diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 6d7db14d30..49221bf183 100644
--- a/kubernetes/onap/resources/environments/dev.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -52,8 +52,6 @@ global:
 # Enable/disable and configure helm charts (ie. applications)
 # to customize the ONAP deployment.
 #################################################################
-aaf:
-  enabled: false
 aai:
   enabled: false
   aai-cassandra:
@@ -65,10 +63,6 @@ clamp:
   enabled: false
 cli:
   enabled: false
-consul:
-  enabled: false
-contrib:
-  enabled: false
 cps:
   enabled: false
 dcaegen2-services:
@@ -77,12 +71,6 @@ holmes:
   enabled: false
 dmaap:
   enabled: false
-log:
-  enabled: false
-  log-logstash:
-    replicaCount: 1
-sniro-emulator:
-  enabled: false
 oof:
   enabled: false
 mariadb-galera:
@@ -95,10 +83,6 @@ nbi:
   enabled: false
 policy:
   enabled: false
-pomba:
-  enabled: false
-portal:
-  enabled: false
 robot:
   enabled: true
 sdc:
diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml
index 40490460af..0c925e3993 100644
--- a/kubernetes/onap/resources/environments/disable-allcharts.yaml
+++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml
@@ -25,20 +25,12 @@
 # Enable/disable and configure helm charts (ie. applications)
 # to customize the ONAP deployment.
 #################################################################
-aaf:
-  enabled: false
 aai:
   enabled: false
 cassandra:
   enabled: false
-clamp:
-  enabled: false
 cli:
   enabled: false
-consul:
-  enabled: false
-contrib:
-  enabled: false
 cps:
   enabled: false
 dcaegen2-services:
@@ -47,10 +39,6 @@ holmes:
   enabled: false
 dmaap:
   enabled: false
-log:
-  enabled: false
-sniro-emulator:
-  enabled: false
 mariadb-galera:
   enabled: false
 msb:
@@ -63,10 +51,6 @@ oof:
   enabled: false
 policy:
   enabled: false
-pomba:
-  enabled: false
-portal:
-  enabled: false
 robot:
   enabled: false
 sdc:
diff --git a/kubernetes/onap/resources/environments/minimal-onap.yaml b/kubernetes/onap/resources/environments/minimal-onap.yaml
index 842eb07e00..e581ddc8c4 100644
--- a/kubernetes/onap/resources/environments/minimal-onap.yaml
+++ b/kubernetes/onap/resources/environments/minimal-onap.yaml
@@ -21,7 +21,6 @@
 # Minimal resources are also reviewed for the various containers
 # A&AI: no override => to be fixed
 # DMAAP: no override
-# Portal: new values
 # Robot: new values
 # SO: no override
 # SDC:  new values
@@ -46,19 +45,11 @@ aai:
       replicas: 1
   aai-cassandra:
     replicaCount: 1
-aaf:
-  enabled: false
 cassandra:
   enabled: true
   replicaCount: 1
-clamp:
-  enabled: false
 cli:
   enabled: false
-consul:
-  enabled: false
-contrib:
-  enabled: false
 cps:
   enabled: false
 dcaegen2-services:
@@ -75,8 +66,6 @@ dmaap:
     enabled: false
   dmaap-dr-node:
     enabled: false
-log:
-  enabled: false
 mariadb-galera:
   enabled: true
 msb:
@@ -89,49 +78,6 @@ oof:
   enabled: false
 policy:
   enabled: false
-pomba:
-  enabled: false
-portal:
-  enabled: true
-  portal-cassandra:
-    config:
-      cassandraJvmOpts: "-Xmx512m -Xms256m"
-    resources:
-      small:
-        limits:
-          cpu: 1
-          memory: 2Gi
-        requests:
-          cpu: 100m
-          memory: 1Gi
-  portal-app:
-    resources:
-      small:
-        limits:
-          cpu: 1
-          memory: 2Gi
-        requests:
-          cpu: 100m
-          memory: 1Gi
-          resources:
-  portal-mariaddb:
-    resources:
-      small:
-        limits:
-          cpu: 800m
-          memory: 1Gi
-      requests:
-          cpu: 100m
-          memory: 500Mi
-  portal-widget:
-    resources:
-      small:
-        limits:
-          cpu: 1
-          memory: 2Gi
-        requests:
-          cpu: 100m
-          memory: 500Mi
 robot:
   enabled: true
   config:
@@ -164,8 +110,6 @@ sdc:
       heapNewSize: "256M"
 sdnc:
   enabled: true
-sniro-emulator:
-  enabled: false
 so:
   enabled: true
   config:
diff --git a/kubernetes/onap/resources/environments/public-cloud.yaml b/kubernetes/onap/resources/environments/public-cloud.yaml
index 90714a46d5..74ce637d52 100644
--- a/kubernetes/onap/resources/environments/public-cloud.yaml
+++ b/kubernetes/onap/resources/environments/public-cloud.yaml
@@ -24,27 +24,6 @@
 # deploy ONAP. This increase in timeouts prevents restarting of
 # the pods thereby the components will be deployed without error.
 #################################################################
-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:
   aai-champ:
     liveness:
@@ -56,11 +35,6 @@ cassandra:
     initialDelaySeconds: 120
   readiness:
     initialDelaySeconds: 120
-clamp:
-  liveness:
-    initialDelaySeconds: 60
-  readiness:
-    initialDelaySeconds: 60
 holmes:
   holmes-rule-mgmt:
     liveness:
@@ -93,13 +67,6 @@ dmaap:
       initialDelaySeconds: 120
     readiness:
       initialDelaySeconds: 120
-
-portal:
-  portal-app:
-    liveness:
-      initialDelaySeconds: 60
-    readiness:
-      initialDelaySeconds: 60
 sdc:
   sdc-fe:
     liveness:
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:
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index a8b44e3773..c8459918af 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -27,19 +27,6 @@ global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
 
-
-  # Install test components
-  # test components are out of the scope of ONAP but allow to have a entire
-  # environment to test the different features of ONAP
-  # Current tests environments provided:
-  #  - netbox (needed for CDS IPAM)
-  #  - AWX (needed for XXX)
-  #  - EJBCA Server (needed for CMPv2 tests)
-  # 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
-  addTestingComponents: &testing false
-
   # ONAP Repository
   # Four different repositories are used
   # You can change individually these repositories to ones that will serve the
@@ -51,12 +38,6 @@ global:
   googleK8sRepository: k8s.gcr.io
   githubContainerRegistry: ghcr.io
 
-  #/!\ DEPRECATED /!\
-  # Legacy repositories which will be removed at the end of migration.
-  # Please don't use
-  loggingRepository: *elasticRepository
-  busyboxRepository: *dockerHubRepository
-
   # Default credentials
   # they're optional. If the target repository doesn't need them, comment them
   repositoryCred:
@@ -207,7 +188,6 @@ global:
   # POC Mode, only for use in development environment
   # Keep it enabled in production
   aafEnabled: false
-  aafAgentImage: onap/aaf/aaf_agent:2.1.20
 
   # Disabling MSB
   # POC Mode, only for use in development environment
@@ -273,14 +253,6 @@ global:
   #   storageClass: "-"
 
 # Example of specific for the components which requires RWX:
-# aaf:
-#   persistence:
-#     storageClassOverride: "My_RWX_Storage_Class"
-# contrib:
-#   netbox:
-#     netbox-app:
-#       persistence:
-#         storageClassOverride: "My_RWX_Storage_Class"
 # cds:
 #   cds-blueprints-processor:
 #     persistence:
@@ -295,29 +267,14 @@ global:
 # to customize the ONAP deployment.
 #################################################################
 
-aaf:
-  enabled: false
-  aaf-sms:
-    cps:
-      # you must always set the same values as value set in cps.enabled
-      enabled: false
 aai:
   enabled: false
 cassandra:
   enabled: false
 cds:
   enabled: false
-clamp:
-  enabled: false
 cli:
   enabled: false
-consul:
-  enabled: false
-# 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
 cps:
   enabled: false
 dcaegen2-services:
@@ -334,13 +291,6 @@ dmaap:
     enabled: false
   dmaap-dr-node:
     enabled: false
-# Today, "logging" chart that perform the central part of logging must also be
-# enabled in order to make it work. So `logging.enabled` must have the same
-# value as centralizedLoggingEnabled
-log:
-  enabled: *centralizedLogging
-sniro-emulator:
-  enabled: false
 oof:
   enabled: false
 mariadb-galera:
@@ -357,10 +307,6 @@ nbi:
     openStackVNFTenantId: "1234"
 policy:
   enabled: false
-pomba:
-  enabled: false
-portal:
-  enabled: false
 robot:
   enabled: false
   config: