X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fcomponents%2Faai-resources%2Ftemplates%2Fservice.yaml;h=0613129aac72a23e2d0c955c3dbde28c3fe77555;hb=HEAD;hp=460e0d5b9316b86007ad7ac792363585a46f82fb;hpb=12d6c4037b79a8d1a301d0e7b72b6532224730d0;p=oom.git

diff --git a/kubernetes/aai/components/aai-resources/templates/service.yaml b/kubernetes/aai/components/aai-resources/templates/service.yaml
index 460e0d5b93..308dc052c8 100644
--- a/kubernetes/aai/components/aai-resources/templates/service.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/service.yaml
@@ -21,6 +21,7 @@ metadata:
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
+    app.kubernetes.io/name: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
@@ -28,19 +29,33 @@ spec:
   type: {{ .Values.service.type }}
   ports:
   {{ if eq .Values.service.type "NodePort" -}}
-  - port: {{ .Values.service.internalPort }}
+  - port: {{ .Values.service.resourcesPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-    name: {{ .Values.service.portName }}
-  - port: {{ .Values.service.internalPort2 }}
+    name: {{ .Values.service.resourcesPortName }}
+    targetPort: {{ .Values.service.resourcesPortName }}
+  - port: {{ .Values.service.debugPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-    name: {{ .Values.service.portName2 }}
+    name: {{ .Values.service.debugPortName }}
+    targetPort: {{ .Values.service.debugPortName }}
+  - port: {{ .Values.service.metricsPort }}
+    nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
+    name: {{ .Values.service.metricsPortName }}
+    targetPort: {{ .Values.service.metricsPortName }}
   {{- else -}}
-  - port: {{ .Values.service.internalPort }}
-    name: {{ .Values.service.portName }}
-  - port: {{ .Values.service.internalPort2 }}
-    name: {{ .Values.service.portName2 }}
+  - port: {{ .Values.service.resourcesPort }}
+    name: {{ .Values.service.resourcesPortName }}
+    targetPort: {{ .Values.service.resourcesPortName }}
+  {{- if .Values.config.debug.enabled }}
+  - port: {{ .Values.service.debugPort }}
+    name: {{ .Values.service.debugPortName }}
+    targetPort: {{ .Values.service.debugPortName }}
+  {{- end }}
+  - port: {{ .Values.service.metricsPort }}
+    name: {{ .Values.service.metricsPortName }}
+    targetPort: {{ .Values.service.metricsPortName }}
   {{- end }}
   selector:
     app: {{ include "common.name" . }}
     release: {{ include "common.release" . }}
   clusterIP: None
+  sessionAffinity: {{ .Values.service.sessionAffinity }}