Merge "Kong ingress controller The Nonrtric deployment script will not install Kong...

diff --combined nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index f9595d8,4aa274d..2d3a2c9
--- 1/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
--- 2/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@@ -18,24 -18,15 +18,24 @@@
  # Global common setting
  #-------------------------------------------------------------------------
  
 +
 +# Here you can enable inclusion or exclusion of each component. A not installd component will not be installed.
 +nonrtric:
 +  installPms: true
 +  installA1controller: false
 +  installA1simulator: false
 +  installControlpanel: false
 +  installEnrichmentservice: true
 +  installRappcatalogueservice: false
 +  installNonrtricgateway: false
 +
  common:
    releasePrefix: r2-dev-nonrtric
  # Change the namespaces using the following options
    namespace:
      nonrtric: nonrtric
    ingressClassName: kong
 -# any nonrtric chart can be installed: nonrtric (all components), controlpanel, a1controller, a1simulator, policymanagementservice, 
 -# enrichmentservice, rappcatalogueservice, nonrtricgateway
 -component: nonrtric
 +
  
  # A1 Conttroller may take few more minutes to start. Increase the initialDelaySeconds in liveness to avoid container restart.
  a1controller:
@@@ -146,6 -137,8 +146,8 @@@ policymanagementservice
        size: 2Gi
        mountPath: /dockerdata-nfs
        mountSubPath: nonrtric/policymanagementservice
+     ingress:
+       enabled: false
  
  enrichmentservice:
    enrichmentservice:
@@@ -175,6 -168,8 +177,8 @@@
        size: 2Gi
        mountPath: /dockerdata-nfs
        mountSubPath: nonrtric/enrichmentservice
+     ingress:
+       enabled: false
  
  rappcatalogueservice:
    rappcatalogueservice:

diff --combined nonrtric/helm/enrichmentservice/templates/ingress.yaml
index e679d16,364e000..f752022
--- 1/nonrtric/helm/enrichmentservice/templates/ingress.yaml
--- 2/nonrtric/helm/enrichmentservice/templates/ingress.yaml
+++ b/nonrtric/helm/enrichmentservice/templates/ingress.yaml
@@@ -1,3 -1,4 +1,4 @@@
+ {{/*
  ################################################################################
  #   Copyright (c) 2021 Nordix Foundation.                                      #
  #                                                                              #
@@@ -13,7 -14,9 +14,9 @@@
  #   See the License for the specific language governing permissions and        #
  #   limitations under the License.                                             #
  ################################################################################
+ */}}
  
+ {{- if .Values.enrichmentservice.ingress.enabled -}}
  apiVersion: networking.k8s.io/v1
  kind: Ingress
  metadata:
@@@ -25,17 -28,18 +28,18 @@@ spec
    rules:
      - http:
          paths:
 -          - path: "/ei-producer"
 +          - path: "/data-producer"
              backend:
                service:
                  name: {{ include "common.name.enrichmentservice" . }}
-                 port: 
+                 port:
                    number: {{ .Values.enrichmentservice.service.internalPort1 }}
              pathType: Prefix
              path: "/data-consumer"
              backend:
                service:
                  name: {{ include "common.name.enrichmentservice" . }}
-                 port: 
+                 port:
                    number: {{ .Values.enrichmentservice.service.internalPort1 }}
              pathType: Prefix
+ {{- end -}}