X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-aux%2F80-Auxiliary-Functions%2Fhelm%2Fves%2Ftemplates%2Fves-service.yaml;h=1701e53e7da9951c6882f8dcc7cd7d3a623afb58;hb=refs%2Fchanges%2F34%2F1234%2F9;hp=718cd412510769a6f8658bdd69f62f89f9c662b8;hpb=f5f0e8d28a18f8b7cb6c934a0a943ed8fc494846;p=it%2Fdep.git

diff --git a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-service.yaml b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-service.yaml
index 718cd412..1701e53e 100644
--- a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-service.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-service.yaml
@@ -1,47 +1,41 @@
-################################################################################
-#   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.           #
-#   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.                                             #
-################################################################################
-
-
-kind: Service
-apiVersion: v1
-metadata:
-  name: xdcae-ves-collector
-  labels:
-    app: dcae-ves-collector
-    cfydeployment: ves
-    cfynode: ves
-    cfynodeinstance: ves_uj48fg
-    k8sdeployment: dep-dcae-ves-collector
-spec:
-  ports:
-  - name: xport-t-8080
-    protocol: TCP
-    port: 8080
-    targetPort: 8080
-    nodePort: 30235
-  - name: xport-t-8443
-    protocol: TCP
-    port: 8443
-    targetPort: 8443
-    nodePort: 30417
-  selector:
-    app: dcae-ves-collector
-  type: NodePort
-  sessionAffinity: None
-  externalTrafficPolicy: Cluster
-status:
-  loadBalancer: {}
+################################################################################
+#   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.           #
+#   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.                                             #
+################################################################################
+
+
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ include "common.servicename.ves.http" . }}
+  labels:
+    app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  ports:
+  - name: http
+    protocol: TCP
+    port: {{ include "common.serviceport.ves.http" . }}
+    targetPort: {{ include "common.serviceport.ves.http" . }}
+  - name: https
+    protocol: TCP
+    port: {{ include "common.serviceport.ves.https" . }}
+    targetPort: {{ include "common.serviceport.ves.https" . }}
+  selector:
+    app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}
+    release: {{ .Release.Name }}
+  type: ClusterIP