From 2d4426e022588345d2f1eea6aa609f236dd6b595 Mon Sep 17 00:00:00 2001 From: BorislavG Date: Tue, 22 May 2018 11:31:39 +0000 Subject: Fix Incorrect AAI services Change-Id: If4b17c3525a75530aa6b149a6901cb0d8737a8d0 Issue-ID: OOM-1102 Signed-off-by: BorislavG --- kubernetes/aai/charts/aai-modelloader/templates/service.yaml | 10 +++++----- kubernetes/aai/charts/aai-modelloader/values.yaml | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'kubernetes/aai/charts/aai-modelloader') diff --git a/kubernetes/aai/charts/aai-modelloader/templates/service.yaml b/kubernetes/aai/charts/aai-modelloader/templates/service.yaml index bd59edb94f..4bfe7879e7 100644 --- a/kubernetes/aai/charts/aai-modelloader/templates/service.yaml +++ b/kubernetes/aai/charts/aai-modelloader/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" . }} @@ -14,15 +14,15 @@ spec: {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} - port: {{ .Values.service.internalPort2 }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} - name: {{ .Values.service.name }}2 + name: {{ .Values.service.portName2 }} {{- else -}} - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} - port: {{ .Values.service.internalPort2 }} - name: {{ .Values.service.name }}2 + name: {{ .Values.service.portName2 }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/aai/charts/aai-modelloader/values.yaml b/kubernetes/aai/charts/aai-modelloader/values.yaml index a5095ade51..676fc6fdfc 100644 --- a/kubernetes/aai/charts/aai-modelloader/values.yaml +++ b/kubernetes/aai/charts/aai-modelloader/values.yaml @@ -35,10 +35,11 @@ readiness: service: type: NodePort - name: aai-modelloader + portName: aai-modelloader externalPort: 8080 internalPort: 8080 nodePort: 10 + portName2: aai-modelloader-ssl externalPort2: 8443 internalPort2: 8443 nodePort2: 29 -- cgit 1.2.3-korg