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%2Fservice.yaml;fp=ric-xapps%2F90-xApps%2Fhelm%2Fxapp-std%2Ftemplates%2Fservice-http.yaml;h=915ac91e68141d05782e9775e38bf6428c56f326;hb=refs%2Fchanges%2F34%2F1234%2F9;hp=7f9942245a50505c03b27e4df83cee433945f404;hpb=2df61c2fcf64b32ecf7f064ef9cbbe6b54a15bc0;p=it%2Fdep.git

diff --git a/ric-xapps/90-xApps/helm/xapp-std/templates/service-http.yaml b/ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/templates/service.yaml
old mode 100644
new mode 100755
similarity index 70%
rename from ric-xapps/90-xApps/helm/xapp-std/templates/service-http.yaml
rename to ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/templates/service.yaml
index 7f994224..915ac91e
--- a/ric-xapps/90-xApps/helm/xapp-std/templates/service-http.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/mc-stack/charts/kibana/templates/service.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,23 +14,29 @@
 #   limitations under the License.                                             #
 ################################################################################
 
+---
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "ricxapp.servicename.http" . }}
-  namespace: {{ include "ricxapp.namespace" . }}
+  name: {{ template "fullname" . }}
   labels:
-    app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    app: {{ .Chart.Name }}
+    release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service }}
+{{- with .Values.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
-  type: ClusterIP
+  type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.ricxapp.service.http.port }}
-      targetPort: http
+    - port: {{ .Values.service.port }}
+{{- if .Values.service.nodePort }}
+      nodePort: {{ .Values.service.nodePort }}
+{{- end }}
       protocol: TCP
       name: http
+      targetPort: {{ .Values.httpPort }}
   selector:
-    app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
-    release: {{ .Release.Name }}
+    app: {{ .Chart.Name }}
+    release: {{ .Release.Name | quote }}