From: John  Keeney <john.keeney@est.tech>
Date: Fri, 18 Jun 2021 09:21:21 +0000 (+0000)
Subject: Merge "Kong ingress controller The Nonrtric deployment script will not install Kong... 
X-Git-Tag: f-release~46
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=30bf13193742047dcf72c67d8efc46570aa568b5;hp=d056e448f6c258a8298dab80f940eacf4a0938a8;p=it%2Fdep.git

Merge "Kong ingress controller The Nonrtric deployment script will not install Kong Gateway. The flag is set to prevent the ingress deployment if Kong is unavailable."
---

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index f9595d86..2d3a2c99 100644
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -146,6 +146,8 @@ policymanagementservice:
       size: 2Gi
       mountPath: /dockerdata-nfs
       mountSubPath: nonrtric/policymanagementservice
+    ingress:
+      enabled: false
 
 enrichmentservice:
   enrichmentservice:
@@ -175,6 +177,8 @@ enrichmentservice:
       size: 2Gi
       mountPath: /dockerdata-nfs
       mountSubPath: nonrtric/enrichmentservice
+    ingress:
+      enabled: false
 
 rappcatalogueservice:
   rappcatalogueservice:
diff --git a/nonrtric/helm/enrichmentservice/templates/ingress.yaml b/nonrtric/helm/enrichmentservice/templates/ingress.yaml
index e679d164..f7520221 100644
--- a/nonrtric/helm/enrichmentservice/templates/ingress.yaml
+++ b/nonrtric/helm/enrichmentservice/templates/ingress.yaml
@@ -1,3 +1,4 @@
+{{/*
 ################################################################################
 #   Copyright (c) 2021 Nordix Foundation.                                      #
 #                                                                              #
@@ -13,7 +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:
@@ -29,13 +32,14 @@ spec:
             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 -}}
\ No newline at end of file
diff --git a/nonrtric/helm/enrichmentservice/values.yaml b/nonrtric/helm/enrichmentservice/values.yaml
index 2e1e7a4d..e5d997a9 100644
--- a/nonrtric/helm/enrichmentservice/values.yaml
+++ b/nonrtric/helm/enrichmentservice/values.yaml
@@ -44,4 +44,5 @@ enrichmentservice:
     size: 2Gi
     mountPath: /dockerdata-nfs
     mountSubPath: nonrtric/enrichmentservice
-
+  ingress:
+    enabled: false
diff --git a/nonrtric/helm/policymanagementservice/templates/ingress.yaml b/nonrtric/helm/policymanagementservice/templates/ingress.yaml
index 67eac10f..d981da56 100644
--- a/nonrtric/helm/policymanagementservice/templates/ingress.yaml
+++ b/nonrtric/helm/policymanagementservice/templates/ingress.yaml
@@ -1,3 +1,4 @@
+{{/*
 ################################################################################
 #   Copyright (c) 2021 Nordix Foundation.                                      #
 #                                                                              #
@@ -13,7 +14,9 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
+*/}}
 
+{{- if .Values.policymanagementservice.ingress.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -32,3 +35,4 @@ spec:
                   number: {{ .Values.policymanagementservice.service.internalPort1 }}
             path: "/a1-policy"
             pathType: Prefix
+{{- end -}}
\ No newline at end of file
diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml
index 3e67451a..a868bce1 100644
--- a/nonrtric/helm/policymanagementservice/values.yaml
+++ b/nonrtric/helm/policymanagementservice/values.yaml
@@ -47,3 +47,5 @@ policymanagementservice:
     storageClass: "manual"
     enabled: true
     #existingClaim:
+  ingress:
+    enabled: false