X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-aux%2F80-Auxiliary-Functions%2Fhelm%2Fmc-stack%2Fcharts%2Fkibana%2Ftemplates%2Fingress.yaml;fp=ric-xapps%2F90-xApps%2Fhelm%2Fxapp-std%2Ftemplates%2Fservice-rmr.yaml;h=ea88416c6ac7e27c50e770073eecd45f5f90d553;hb=refs%2Fchanges%2F34%2F1234%2F9;hp=14a75722264c36c8f6a9154a20e06dd446e5279a;hpb=2df61c2fcf64b32ecf7f064ef9cbbe6b54a15bc0;p=it%2Fdep.git

diff --git a/ric-xapps/90-xApps/helm/xapp-std/templates/service-rmr.yaml b/ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/templates/ingress.yaml
old mode 100644
new mode 100755
similarity index 63%
rename from ric-xapps/90-xApps/helm/xapp-std/templates/service-rmr.yaml
rename to ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/templates/ingress.yaml
index 14a75722..ea88416c
--- a/ric-xapps/90-xApps/helm/xapp-std/templates/service-rmr.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/templates/ingress.yaml
@@ -1,6 +1,5 @@
 ################################################################################
 #   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#   Copyright (c) 2019 Nokia.                                                  #
 #                                                                              #
 #   Licensed under the Apache License, Version 2.0 (the "License");            #
 #   you may not use this file except in compliance with the License.           #
@@ -15,27 +14,35 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-apiVersion: v1
-kind: Service
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "fullname" . -}}
+{{- $servicePort := .Values.service.port -}}
+{{- $ingressPath := .Values.ingress.path -}}
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
 metadata:
-  name: {{ include "ricxapp.servicename.rmr" . }}
-  namespace: {{ include "ricxapp.namespace" . }}
+  name: {{ $fullName }}
   labels:
-    app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app: {{ .Chart.Name }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
-  type: ClusterIP
-  ports:
-    - port: {{ .Values.ricxapp.service.rmr.data.port }}
-      targetPort: rmrdata
-      protocol: TCP
-      name: rmrdata
-    - port: {{ .Values.ricxapp.service.rmr.route.port }}
-      targetPort: rmrroute
-      protocol: TCP
-      name: rmrroute
-  selector:
-    app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
-    release: {{ .Release.Name }}
+{{- if .Values.ingress.tls }}
+  tls:
+{{ toYaml .Values.ingress.tls | indent 4 }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: {{ $servicePort }}
+  {{- end }}
+{{- end }}