summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/templates/service.yaml
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-05-24 13:11:50 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-24 13:11:50 +0000
commit57326c615966a14f24d7b7a5ac84e51c1b73e0b0 (patch)
treeb571aad2584869bd8c56775bb1b7cea501e58d65 /kubernetes/aai/templates/service.yaml
parente7e1e1787c3cf923e3f0f15469b9db99742d4b8e (diff)
parent2d4426e022588345d2f1eea6aa609f236dd6b595 (diff)
Merge "Fix Incorrect AAI services"
Diffstat (limited to 'kubernetes/aai/templates/service.yaml')
-rw-r--r--kubernetes/aai/templates/service.yaml16
1 files changed, 8 insertions, 8 deletions
diff --git a/kubernetes/aai/templates/service.yaml b/kubernetes/aai/templates/service.yaml
index d21ac7ed87..a2f96a843e 100644
--- a/kubernetes/aai/templates/service.yaml
+++ b/kubernetes/aai/templates/service.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.name" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -11,23 +11,23 @@ metadata:
spec:
ports:
{{if eq .Values.service.type "NodePort" -}}
- - name: {{ .Values.service.name }}
- port: {{ .Values.service.internalPort }}
+ - name: {{ .Values.service.portName }}
+ port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- - name: {{ .Values.service.name }}2
- port: {{ .Values.service.internalPort2 }}
+ - name: {{ .Values.service.portName2 }}
+ port: {{ .Values.service.externalPort2 }}
targetPort: {{ .Values.service.internalPort2 }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
- port: {{ .Values.service.externalPort2 }}
targetPort: {{ .Values.service.internalPort2 }}
- name: {{ .Values.service.name }}2
+ name: {{ .Values.service.portName }}
{{- end}}
type: {{ .Values.service.type }}
selector:
app: {{ include "common.name" . }}
- clusterIP: {{ .Values.config.aaiServiceClusterIp }}
+ clusterIP: {{ .Values.service.aaiServiceClusterIp }}