X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fonap%2Fvalues.yaml;h=5697477ce4d9e1951cc31225481ca608d27a5705;hb=38677306a64d7aab6154d76972310c3fc38b36d7;hp=a8b44e3773771c2002113cd71942881288d643cd;hpb=5d3c01e7a04a0c67fc90788ce7a7be254542c3c9;p=oom.git

diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index a8b44e3773..5697477ce4 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:
@@ -153,6 +134,19 @@ global:
     # enable all component's Ingress interfaces
     enable_all: false
 
+    # Provider: ingress, istio, gw-api
+    provider: istio
+    # Ingress class (only for provider "ingress"): e.g. nginx, traefik
+    ingressClass:
+    # Ingress Selector (only for provider "istio") to match with the
+    # ingress pod label "istio=ingress"
+    ingressSelector: ingress
+    # optional: common used Gateway (for Istio, GW-API) and listener names
+    commonGateway:
+      name: ""
+      httpListener: ""
+      httpsListener: ""
+
     # default Ingress base URL and preAddr- and postAddr settings
     # Ingress URLs result:
     # <preaddr><component.ingress.service.baseaddr><postaddr>.<baseurl>
@@ -177,12 +171,11 @@ global:
     #  tls:
     #    secret: 'my-ingress-cert'
 
-    # optional: Namespace of the Istio IngressGateway
+    # optional: Namespace of the Istio IngressGateway or Gateway-API
     # only valid for Istio Gateway (ServiceMesh enabled)
     namespace: istio-ingress
 
   # Global Service Mesh configuration
-  # POC Mode, don't use it in production
   serviceMesh:
     enabled: false
     tls: true
@@ -207,7 +200,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 +265,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 +279,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 +303,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 +319,6 @@ nbi:
     openStackVNFTenantId: "1234"
 policy:
   enabled: false
-pomba:
-  enabled: false
-portal:
-  enabled: false
 robot:
   enabled: false
   config: