Merge "[COMMON] Correct Ingress template to create Istio GW/VS"

diff --combined kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
index 9b85bd9,4bd99ad..c78ac8a
--- 1/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
--- 2/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
@@@ -19,6 -19,8 +19,8 @@@
  global:
    ingress:
      enabled: true
+     # enable all component's Ingress interfaces
+     enable_all: true
      # All http requests via ingress will be redirected
      config:
        ssl: "redirect"
@@@ -112,14 -114,6 +114,14 @@@ holmes
    enabled: true
  dmaap:
    enabled: true
 +  message-router:
 +    enabled: true
 +  dmaap-bc:
 +    enabled: true
 +  dmaap-dr-prov:
 +    enabled: true
 +  dmaap-dr-node:
 +    enabled: true
  oof:
    enabled: true
  msb:
@@@ -142,8 -136,6 +144,8 @@@ so
    enabled: true
  strimzi:
    enabled: true
 +  strimzi-kafka-bridge:
 +    enabled: true
  uui:
    enabled: true
  vfc:

diff --combined kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
index 37d6844,b3e0999..9a090c1
--- 1/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
--- 2/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@@ -19,6 -19,7 +19,7 @@@
  global:
    ingress:
      enabled: true
+     enable_all: true
    addTestingComponents: &testing true
    centralizedLoggingEnabled: &centralizedLogging false
  cassandra:
@@@ -61,14 -62,6 +62,14 @@@ holmes
    enabled: true
  dmaap:
    enabled: true
 +  message-router:
 +    enabled: true
 +  dmaap-bc:
 +    enabled: true
 +  dmaap-dr-prov:
 +    enabled: true
 +  dmaap-dr-node:
 +    enabled: true
  oof:
    enabled: true
  msb:
@@@ -91,8 -84,6 +92,8 @@@ so
    enabled: true
  strimzi:
    enabled: true
 +  strimzi-kafka-bridge:
 +    enabled: true
  uui:
    enabled: true
  vfc:

diff --combined kubernetes/onap/values.yaml
index 48f1489,6b597cc..bdbf5ab
--- 1/kubernetes/onap/values.yaml
--- 2/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@@ -146,9 -146,26 +146,26 @@@ global
  
    # Global ingress configuration
    ingress:
+     # generally enable ingress for ONAP components
      enabled: false
+     # enable all component's Ingress interfaces
+     enable_all: false
+     # default Ingress base URL
+     # can be overwritten in component vy setting ingress.baseurlOverride
      virtualhost:
        baseurl: "simpledemo.onap.org"
+     # All http requests via ingress will be redirected on Ingress controller
+     # only valid for Istio Gateway (ServiceMesh enabled)
+     config:
+       ssl: "redirect"
+     # you can set an own Secret containing a certificate
+     # only valid for Istio Gateway (ServiceMesh enabled)
+     #  tls:
+     #    secret: 'my-ingress-cert'
+ 
+     # optional: Namespace of the Istio IngressGateway
+     # only valid for Istio Gateway (ServiceMesh enabled)
+     namespace: istio-ingress
  
    # Global Service Mesh configuration
    # POC Mode, don't use it in production
@@@ -303,17 -320,9 +320,17 @@@ holmes
    enabled: false
  dmaap:
    enabled: false
 +  message-router:
 +    enabled: false
 +  dmaap-bc:
 +    enabled: false
 +  dmaap-dr-prov:
 +    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 than centralizedLoggingEnabled
 +# value as centralizedLoggingEnabled
  log:
    enabled: *centralizedLogging
  sniro-emulator:
@@@ -378,22 -387,8 +395,22 @@@ so
    #   server:
    #     monitoring:
    #       password: demo123456!
 +
  strimzi:
    enabled: false
 +  # Kafka replication & disk storage should be dimensioned
 +  # according to each given system use case.
 +  replicaCount: 3
 +  persistence:
 +    kafka:
 +      size: 10Gi
 +    zookeeper:
 +      size: 1Gi
 +  # Strimzi kafka bridge is an optional http api towards
 +  # kafka provided by https://strimzi.io/docs/bridge/latest/
 +  strimzi-kafka-bridge:
 +    enabled: false
 +
  uui:
    enabled: false
  vfc:
@@@ -408,6 -403,7 +425,6 @@@ platform
    enabled: false
  a1policymanagement:
    enabled: false
 -
  cert-wrapper:
    enabled: true
  repository-wrapper: