From 5142c8625abe92afb01c799079d743db5d400f07 Mon Sep 17 00:00:00 2001 From: Lathish Date: Wed, 19 May 2021 13:57:24 +0100 Subject: [PATCH 1/1] 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. Issue-ID: NONRTRIC-519 Change-Id: Ia16da20abe1e3cfa8e40cb9a3d0fae60d5201747 Signed-off-by: Lathish --- nonrtric/RECIPE_EXAMPLE/example_recipe.yaml | 4 ++++ nonrtric/helm/enrichmentservice/templates/ingress.yaml | 8 ++++++-- nonrtric/helm/enrichmentservice/values.yaml | 3 ++- nonrtric/helm/policymanagementservice/templates/ingress.yaml | 4 ++++ nonrtric/helm/policymanagementservice/values.yaml | 2 ++ 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml index 07d0689e..4aa274d6 100644 --- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml +++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml @@ -137,6 +137,8 @@ policymanagementservice: size: 2Gi mountPath: /dockerdata-nfs mountSubPath: nonrtric/policymanagementservice + ingress: + enabled: false enrichmentservice: enrichmentservice: @@ -166,6 +168,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 5a1fb33e..364e0000 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 -- 2.16.6