From 082459c24ff29be551b43b1a64d81ba09dbfef04 Mon Sep 17 00:00:00 2001 From: Lathish Date: Mon, 26 Apr 2021 12:44:50 +0100 Subject: [PATCH] Kong as Ingress Controller Issue-ID: NONRTRIC-499 Change-Id: I3b1b9bd4fb8f6d35320f77e5ded200514e869452 Signed-off-by: Lathish --- nonrtric/RECIPE_EXAMPLE/example_recipe.yaml | 4 ++- .../helm/enrichmentservice/templates/ingress.yaml | 41 ++++++++++++++++++++++ nonrtric/helm/nonrtric/requirements.yaml | 3 +- .../policymanagementservice/templates/ingress.yaml | 34 ++++++++++++++++++ .../helm/policymanagementservice/templates/pv.yaml | 1 - .../nonrtric-common/templates/_nonrtricgateway.tpl | 4 +++ 6 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 nonrtric/helm/enrichmentservice/templates/ingress.yaml create mode 100644 nonrtric/helm/policymanagementservice/templates/ingress.yaml diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml index 7efd8e1c..07d0689e 100644 --- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml +++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml @@ -23,7 +23,9 @@ common: # Change the namespaces using the following options namespace: nonrtric: nonrtric -# any nonrtric chart can be installed: nonrtric (all components), controlpanel, a1controller, a1simulator, policymanagementservice, enrichmentservice, rappcatalogueservice, nonrtricgateway + 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. diff --git a/nonrtric/helm/enrichmentservice/templates/ingress.yaml b/nonrtric/helm/enrichmentservice/templates/ingress.yaml new file mode 100644 index 00000000..5a1fb33e --- /dev/null +++ b/nonrtric/helm/enrichmentservice/templates/ingress.yaml @@ -0,0 +1,41 @@ +################################################################################ +# Copyright (c) 2021 Nordix Foundation. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you may not use this file except in compliance with the License. # +# You may obtain a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +################################################################################ + +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ include "common.name.enrichmentservice" . }} + namespace: {{ include "common.namespace.nonrtric" . }} + +spec: + ingressClassName: {{ include "common.ingressClassName" . }} + rules: + - http: + paths: + - path: "/ei-producer" + backend: + service: + name: {{ include "common.name.enrichmentservice" . }} + port: + number: {{ .Values.enrichmentservice.service.internalPort1 }} + pathType: Prefix + path: "/data-consumer" + backend: + service: + name: {{ include "common.name.enrichmentservice" . }} + port: + number: {{ .Values.enrichmentservice.service.internalPort1 }} + pathType: Prefix diff --git a/nonrtric/helm/nonrtric/requirements.yaml b/nonrtric/helm/nonrtric/requirements.yaml index 2a9e5129..bc6a3b07 100644 --- a/nonrtric/helm/nonrtric/requirements.yaml +++ b/nonrtric/helm/nonrtric/requirements.yaml @@ -38,5 +38,4 @@ dependencies: repository: "@local" - name: nonrtricgateway version: ~1.0.0 - repository: "@local" - + repository: "@local" \ No newline at end of file diff --git a/nonrtric/helm/policymanagementservice/templates/ingress.yaml b/nonrtric/helm/policymanagementservice/templates/ingress.yaml new file mode 100644 index 00000000..67eac10f --- /dev/null +++ b/nonrtric/helm/policymanagementservice/templates/ingress.yaml @@ -0,0 +1,34 @@ +################################################################################ +# Copyright (c) 2021 Nordix Foundation. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you may not use this file except in compliance with the License. # +# You may obtain a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +################################################################################ + +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ include "common.name.policymanagementservice" . }} + namespace: {{ include "common.namespace.nonrtric" . }} + +spec: + ingressClassName: {{ include "common.ingressClassName" . }} + rules: + - http: + paths: + - backend: + service: + name: {{ include "common.name.policymanagementservice" . }} + port: + number: {{ .Values.policymanagementservice.service.internalPort1 }} + path: "/a1-policy" + pathType: Prefix diff --git a/nonrtric/helm/policymanagementservice/templates/pv.yaml b/nonrtric/helm/policymanagementservice/templates/pv.yaml index f840a788..929c7e5e 100644 --- a/nonrtric/helm/policymanagementservice/templates/pv.yaml +++ b/nonrtric/helm/policymanagementservice/templates/pv.yaml @@ -35,4 +35,3 @@ spec: hostPath: path: {{ .Values.policymanagementservice.persistence.mountPath }}/{{ .Values.policymanagementservice.persistence.mountSubPath }} storageClassName: "{{ .Values.policymanagementservice.persistence.storageClass }}" - diff --git a/ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl b/ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl index 0d1435f2..d14e540b 100644 --- a/ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl +++ b/ric-common/Common-Template/helm/nonrtric-common/templates/_nonrtricgateway.tpl @@ -22,3 +22,7 @@ {{- $name := ( include "common.name.nonrtricgateway" . ) -}} {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{- define "common.ingressClassName" -}} + {{- printf "kong" -}} +{{- end -}} -- 2.16.6