Code Review
/
it
/
dep.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Moving dev back to LF Gerrit
[it/dep.git]
/
ric-aux
/
80-Auxiliary-Functions
/
helm
/
mc-stack
/
charts
/
kibana
/
templates
/
service.yaml
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
(file)
new mode 100755
(executable)
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
7f99422
..
915ac91
--- 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 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. #
# #
# 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. #
################################################################################
# limitations under the License. #
################################################################################
+---
apiVersion: v1
kind: Service
metadata:
apiVersion: v1
kind: Service
metadata:
- name: {{ include "ricxapp.servicename.http" . }}
- namespace: {{ include "ricxapp.namespace" . }}
+ name: {{ template "fullname" . }}
labels:
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 }}
heritage: {{ .Release.Service }}
+{{- with .Values.service.annotations }}
+ annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
spec:
spec:
- type:
ClusterIP
+ type:
{{ .Values.service.type }}
ports:
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
protocol: TCP
name: http
+ targetPort: {{ .Values.httpPort }}
selector:
selector:
- app: {{
include "ricxapp.namespace" . }}-{{ include "ricxapp.name" .
}}
- release: {{ .Release.Name }}
+ app: {{
.Chart.Name
}}
+ release: {{ .Release.Name
| quote
}}