Moving dev back to LF Gerrit

[it/dep.git] / ric-aux / 80-Auxiliary-Functions / helm / ves / templates / ves-service.yaml

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 cc66510..1701e53 100644 (file)
--- 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 @@
-################################################################################\r
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #\r
-#   Copyright (c) 2019 Nokia.                                                  #\r
-#                                                                              #\r
-#   Licensed under the Apache License, Version 2.0 (the "License");            #\r
-#   you may not use this file except in compliance with the License.           #\r
-#   You may obtain a copy of the License at                                    #\r
-#                                                                              #\r
-#       http://www.apache.org/licenses/LICENSE-2.0                             #\r
-#                                                                              #\r
-#   Unless required by applicable law or agreed to in writing, software        #\r
-#   distributed under the License is distributed on an "AS IS" BASIS,          #\r
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #\r
-#   See the License for the specific language governing permissions and        #\r
-#   limitations under the License.                                             #\r
-################################################################################\r
-\r
-\r
-kind: Service\r
-apiVersion: v1\r
-metadata:\r
-  name: xdcae-ves-collector\r
-  labels:\r
-    app: dcae-ves-collector\r
-    cfydeployment: ves\r
-    cfynode: ves\r
-    cfynodeinstance: ves_uj48fg\r
-    k8sdeployment: dep-dcae-ves-collector\r
-spec:\r
-  ports:\r
-  - name: xport-t-8080\r
-    protocol: TCP\r
-    port: {{ include "common.serviceport.ves.http.container" . }}\r
-    targetPort: {{ include "common.serviceport.ves.http.container" . }}\r
-    nodePort: {{ include "common.serviceport.ves.http" . }}\r
-  - name: xport-t-8443\r
-    protocol: TCP\r
-    port: {{ include "common.serviceport.ves.https.container" . }}\r
-    targetPort: {{ include "common.serviceport.ves.https.container" . }}\r
-    nodePort: {{ include "common.serviceport.ves.https" . }}\r
-  selector:\r
-    app: dcae-ves-collector\r
-  type: NodePort\r
-  sessionAffinity: None\r
-  externalTrafficPolicy: Cluster\r
-status:\r
-  loadBalancer: {}\r
+################################################################################
+#   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